summaryrefslogtreecommitdiff
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorHaikun.Wang@freescale.com <Haikun.Wang@freescale.com>2015-03-24 21:19:23 +0800
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:17 -0600
commit6db79c4465b8e7c58e6d9b0950514b7ad8f4564d (patch)
treeb1ca0825a124977cb81387fada0ec09e1929bb58 /arch/arm/dts
parentce35fc17f00e3d02fbf5d2156e1ff114c9bcc1dc (diff)
dm: ls1021a: dts: Update DSPI node to support DM SPI
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> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/ls1021a-qds.dts3
-rw-r--r--arch/arm/dts/ls1021a-twr.dts15
-rw-r--r--arch/arm/dts/ls1021a.dtsi4
3 files changed, 4 insertions, 18 deletions
diff --git a/arch/arm/dts/ls1021a-qds.dts b/arch/arm/dts/ls1021a-qds.dts
index 7454ac6ca7..8971c18e2a 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 2f0481d5bc..3d9f23bf11 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 064d10c8b9..8b3c55776d 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";
};