| Message ID | 1427203163-27226-1-git-send-email-haikun.wang@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 24 March 2015 at 07:19, Haikun Wang <haikun.wang@freescale.com> wrote: > Update DSPI controller node in ls1021a.dtsi. > Update flash device node in ls1021a-qds.dts. > Ls1021a-twr board doesn't support DSPI, so remove DSPI node > in ls1021a-twr.dts. > > Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com> > --- > arch/arm/dts/ls1021a-qds.dts | 3 ++- > arch/arm/dts/ls1021a-twr.dts | 15 --------------- > arch/arm/dts/ls1021a.dtsi | 4 ++-- > 3 files changed, 4 insertions(+), 18 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 31 March 2015 at 19:41, Simon Glass <sjg@chromium.org> wrote: > On 24 March 2015 at 07:19, Haikun Wang <haikun.wang@freescale.com> wrote: >> Update DSPI controller node in ls1021a.dtsi. >> Update flash device node in ls1021a-qds.dts. >> Ls1021a-twr board doesn't support DSPI, so remove DSPI node >> in ls1021a-twr.dts. >> >> Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com> >> --- >> arch/arm/dts/ls1021a-qds.dts | 3 ++- >> arch/arm/dts/ls1021a-twr.dts | 15 --------------- >> arch/arm/dts/ls1021a.dtsi | 4 ++-- >> 3 files changed, 4 insertions(+), 18 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks!
diff --git a/arch/arm/dts/ls1021a-qds.dts b/arch/arm/dts/ls1021a-qds.dts index 7454ac6..8971c18 100644 --- a/arch/arm/dts/ls1021a-qds.dts +++ b/arch/arm/dts/ls1021a-qds.dts @@ -18,6 +18,7 @@ enet2_rgmii_phy = &rgmii_phy3; enet0_sgmii_phy = &sgmii_phy1c; enet1_sgmii_phy = &sgmii_phy1d; + spi1 = &dspi0; }; }; @@ -28,7 +29,7 @@ dspiflash: at45db021d@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "atmel,at45db021d", "atmel,at45", "atmel,dataflash"; + compatible = "spi-flash"; spi-max-frequency = <16000000>; spi-cpol; spi-cpha; diff --git a/arch/arm/dts/ls1021a-twr.dts b/arch/arm/dts/ls1021a-twr.dts index 2f0481d..3d9f23b 100644 --- a/arch/arm/dts/ls1021a-twr.dts +++ b/arch/arm/dts/ls1021a-twr.dts @@ -19,21 +19,6 @@ }; }; -&dspi1 { - bus-num = <0>; - status = "okay"; - - dspiflash: s25fl064k@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "spansion,s25fl064k"; - spi-max-frequency = <16000000>; - spi-cpol; - spi-cpha; - reg = <0>; - }; -}; - &i2c0 { status = "okay"; }; diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi index 064d10c..8b3c557 100644 --- a/arch/arm/dts/ls1021a.dtsi +++ b/arch/arm/dts/ls1021a.dtsi @@ -152,7 +152,7 @@ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; clock-names = "dspi"; clocks = <&platform_clk 1>; - spi-num-chipselects = <5>; + num-cs = <6>; big-endian; status = "disabled"; }; @@ -165,7 +165,7 @@ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; clock-names = "dspi"; clocks = <&platform_clk 1>; - spi-num-chipselects = <5>; + num-cs = <6>; big-endian; status = "disabled"; };
Update DSPI controller node in ls1021a.dtsi. Update flash device node in ls1021a-qds.dts. Ls1021a-twr board doesn't support DSPI, so remove DSPI node in ls1021a-twr.dts. Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com> --- arch/arm/dts/ls1021a-qds.dts | 3 ++- arch/arm/dts/ls1021a-twr.dts | 15 --------------- arch/arm/dts/ls1021a.dtsi | 4 ++-- 3 files changed, 4 insertions(+), 18 deletions(-)