diff options
author | Christian Daudt <csd@broadcom.com> | 2013-08-08 01:37:47 -0400 |
---|---|---|
committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 11:44:23 -0400 |
commit | d7358f845645c588aff84ac6b476a17d3eec75fa (patch) | |
tree | 4daea93d81b66857082a392e29581417da753530 | |
parent | e3b62ffd9400d89040abf4baf1f775fc9dac9f24 (diff) |
ARM: dts: align sdio numbers to HW definition
Clean up the sdio numbering to be 1-base as defined in HW spec,
instead of the current 0-base
Signed-off-by: Christian Daudt <csd@broadcom.com>
Reviewed-by: Alex Elder <elder@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/bcm11351-brt.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/bcm11351.dtsi | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts index 67ec524098b5..647a78c6b61e 100644 --- a/arch/arm/boot/dts/bcm11351-brt.dts +++ b/arch/arm/boot/dts/bcm11351-brt.dts | |||
@@ -27,18 +27,18 @@ | |||
27 | status = "okay"; | 27 | status = "okay"; |
28 | }; | 28 | }; |
29 | 29 | ||
30 | sdio0: sdio@0x3f180000 { | 30 | sdio1: sdio@3f180000 { |
31 | max-frequency = <48000000>; | 31 | max-frequency = <48000000>; |
32 | status = "okay"; | 32 | status = "okay"; |
33 | }; | 33 | }; |
34 | 34 | ||
35 | sdio1: sdio@0x3f190000 { | 35 | sdio2: sdio@3f190000 { |
36 | non-removable; | 36 | non-removable; |
37 | max-frequency = <48000000>; | 37 | max-frequency = <48000000>; |
38 | status = "okay"; | 38 | status = "okay"; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | sdio3: sdio@0x3f1b0000 { | 41 | sdio4: sdio@3f1b0000 { |
42 | max-frequency = <48000000>; | 42 | max-frequency = <48000000>; |
43 | status = "okay"; | 43 | status = "okay"; |
44 | }; | 44 | }; |
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index f43558c1f069..2ffd292e815f 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi | |||
@@ -68,28 +68,28 @@ | |||
68 | clock-frequency = <32768>; | 68 | clock-frequency = <32768>; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | sdio0: sdio@0x3f180000 { | 71 | sdio1: sdio@3f180000 { |
72 | compatible = "bcm,kona-sdhci"; | 72 | compatible = "bcm,kona-sdhci"; |
73 | reg = <0x3f180000 0x10000>; | 73 | reg = <0x3f180000 0x10000>; |
74 | interrupts = <0x0 77 0x4>; | 74 | interrupts = <0x0 77 0x4>; |
75 | status = "disabled"; | 75 | status = "disabled"; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | sdio1: sdio@0x3f190000 { | 78 | sdio2: sdio@3f190000 { |
79 | compatible = "bcm,kona-sdhci"; | 79 | compatible = "bcm,kona-sdhci"; |
80 | reg = <0x3f190000 0x10000>; | 80 | reg = <0x3f190000 0x10000>; |
81 | interrupts = <0x0 76 0x4>; | 81 | interrupts = <0x0 76 0x4>; |
82 | status = "disabled"; | 82 | status = "disabled"; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | sdio2: sdio@0x3f1a0000 { | 85 | sdio3: sdio@3f1a0000 { |
86 | compatible = "bcm,kona-sdhci"; | 86 | compatible = "bcm,kona-sdhci"; |
87 | reg = <0x3f1a0000 0x10000>; | 87 | reg = <0x3f1a0000 0x10000>; |
88 | interrupts = <0x0 74 0x4>; | 88 | interrupts = <0x0 74 0x4>; |
89 | status = "disabled"; | 89 | status = "disabled"; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | sdio3: sdio@0x3f1b0000 { | 92 | sdio4: sdio@3f1b0000 { |
93 | compatible = "bcm,kona-sdhci"; | 93 | compatible = "bcm,kona-sdhci"; |
94 | reg = <0x3f1b0000 0x10000>; | 94 | reg = <0x3f1b0000 0x10000>; |
95 | interrupts = <0x0 73 0x4>; | 95 | interrupts = <0x0 73 0x4>; |