diff options
author | Roland Stigge <stigge@antcom.de> | 2012-06-14 10:16:18 -0400 |
---|---|---|
committer | Roland Stigge <stigge@antcom.de> | 2012-06-14 10:16:18 -0400 |
commit | 2c7fa28622d8c00ca41f0362d11c52d9f404f543 (patch) | |
tree | d3ff9f4841f73e9b6d70b5930fd23e36aaee4135 /arch | |
parent | 291dd71fe48c0b696a9391ed1ba476c8878d6fca (diff) |
ARM: LPC32xx: DTS adjustment for using pl18x primecell
This patch adjusts the dts files to reference the pl18x primecell driver
correctly.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/lpc32xx.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/phy3250.dts | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index e2b50b220a38..a9b2a6a22024 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi | |||
@@ -115,9 +115,10 @@ | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | sd@20098000 { | 117 | sd@20098000 { |
118 | compatible = "arm,pl180", "arm,primecell"; | 118 | compatible = "arm,pl18x", "arm,primecell"; |
119 | reg = <0x20098000 0x1000>; | 119 | reg = <0x20098000 0x1000>; |
120 | interrupts = <0x0f 0>, <0x0d 0>; | 120 | interrupts = <0x0f 0>, <0x0d 0>; |
121 | status = "disabled"; | ||
121 | }; | 122 | }; |
122 | 123 | ||
123 | i2s1: i2s@2009C000 { | 124 | i2s1: i2s@2009C000 { |
diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts index 1dbfea8b7bdf..d5432378f234 100644 --- a/arch/arm/boot/dts/phy3250.dts +++ b/arch/arm/boot/dts/phy3250.dts | |||
@@ -129,6 +129,14 @@ | |||
129 | compatible = "atmel,at25"; | 129 | compatible = "atmel,at25"; |
130 | }; | 130 | }; |
131 | }; | 131 | }; |
132 | |||
133 | sd@20098000 { | ||
134 | wp-gpios = <&gpio 3 0 0>; | ||
135 | cd-gpios = <&gpio 3 1 0>; | ||
136 | cd-inverted; | ||
137 | bus-width = <4>; | ||
138 | status = "okay"; | ||
139 | }; | ||
132 | }; | 140 | }; |
133 | 141 | ||
134 | fab { | 142 | fab { |