diff options
| author | Marek Vasut <marex@denx.de> | 2015-07-21 11:25:14 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-08-08 14:14:04 +0200 |
| commit | b09b72d83b17f353bed47df9ddaba8380a06e9f5 (patch) | |
| tree | b48ebbd9d37aaeb5643cd31c7c448baf7c445c68 | |
| parent | bfa89d2ba8f0a278df6de584dcfbd33814753e33 (diff) | |
| download | u-boot-imx-b09b72d83b17f353bed47df9ddaba8380a06e9f5.zip u-boot-imx-b09b72d83b17f353bed47df9ddaba8380a06e9f5.tar.gz u-boot-imx-b09b72d83b17f353bed47df9ddaba8380a06e9f5.tar.bz2 | |
arm: dts: socfpga: Fix SPI aliases
The SPI aliases are completely wrong. First, they point to non-existing
/spi@.* nodes instead of the correct /soc/spi@.* nodes. Second, the use
ad-hoc string instead of a handle. Furthermore, they are copied multiple
times in each board DTS.
So fix it such that we move these into socfpga.dtsi and make them use
the usual handles.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
| -rw-r--r-- | arch/arm/dts/socfpga.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_arria5_socdk.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socdk.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socrates.dts | 6 |
4 files changed, 5 insertions, 16 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 9b12420..3a3fb4a 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -20,6 +20,9 @@ timer1 = &timer1; timer2 = &timer2; timer3 = &timer3; + spi0 = &qspi; + spi1 = &spi0; + spi2 = &spi1; }; cpus { diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts index 1b86897..f2b5963 100644 --- a/arch/arm/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/dts/socfpga_arria5_socdk.dts @@ -22,13 +22,9 @@ aliases { /* this allow the ethaddr uboot environmnet variable contents - * to be added to the gmac1 device tree blob. - */ + * to be added to the gmac1 device tree blob. + */ ethernet0 = &gmac1; - - spi0 = "/spi@ff705000"; /* QSPI */ - spi1 = "/spi@fff00000"; - spi2 = "/spi@fff01000"; }; regulator_3_3v: 3-3-v-regulator { diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index 0b300b9..9650eb0 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -25,10 +25,6 @@ * to be added to the gmac1 device tree blob. */ ethernet0 = &gmac1; - - spi0 = "/spi@ff705000"; /* QSPI */ - spi1 = "/spi@fff00000"; - spi2 = "/spi@fff01000"; }; regulator_3_3v: 3-3-v-regulator { diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index ea30483..00b1830 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -14,12 +14,6 @@ bootargs = "console=ttyS0,115200"; }; - aliases { - spi0 = "/spi@ff705000"; /* QSPI */ - spi1 = "/spi@fff00000"; - spi2 = "/spi@fff01000"; - }; - memory { name = "memory"; device_type = "memory"; |