| Message ID | 1438029665-9600-1-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
On Monday, July 27, 2015 at 10:41:05 PM, Marek Vasut wrote: > 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> Applied to u-boot-socfpga/master . Best regards, Marek Vasut
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";
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> --- arch/arm/dts/socfpga.dtsi | 3 +++ arch/arm/dts/socfpga_arria5_socdk.dts | 8 ++------ arch/arm/dts/socfpga_cyclone5_socdk.dts | 4 ---- arch/arm/dts/socfpga_cyclone5_socrates.dts | 6 ------ 4 files changed, 5 insertions(+), 16 deletions(-)