diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-07-04 05:20:46 -0400 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-10-12 21:09:28 -0400 |
| commit | e4541ff21284e5f2208473b39b535fcd50318c92 (patch) | |
| tree | 60fda37347ded71c8e1c2c40f058fbb20ce739a6 /arch/arm/boot/dts/at91sam9x5.dtsi | |
| parent | c18486e10d5801b832b34708f6d2bd266c704793 (diff) | |
at91: regroup gpio and pinctrl under the same ranges
Fix also the reg size as we have 512 bytes bank not 256 bytes per gpio/mux
controller
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 77 |
1 files changed, 42 insertions, 35 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 03fc136421c5..507a84d2a5d7 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
| @@ -111,44 +111,51 @@ | |||
| 111 | interrupts = <21 4 0>; | 111 | interrupts = <21 4 0>; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | pioA: gpio@fffff400 { | 114 | pinctrl@fffff200 { |
| 115 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 115 | #address-cells = <1>; |
| 116 | reg = <0xfffff400 0x100>; | 116 | #size-cells = <1>; |
| 117 | interrupts = <2 4 1>; | 117 | compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; |
| 118 | #gpio-cells = <2>; | 118 | ranges = <0xfffff400 0xfffff400 0x800>; |
| 119 | gpio-controller; | 119 | |
| 120 | interrupt-controller; | 120 | pioA: gpio@fffff400 { |
| 121 | #interrupt-cells = <2>; | 121 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 122 | }; | 122 | reg = <0xfffff400 0x200>; |
| 123 | interrupts = <2 4 1>; | ||
| 124 | #gpio-cells = <2>; | ||
| 125 | gpio-controller; | ||
| 126 | interrupt-controller; | ||
| 127 | #interrupt-cells = <2>; | ||
| 128 | }; | ||
| 123 | 129 | ||
| 124 | pioB: gpio@fffff600 { | 130 | pioB: gpio@fffff600 { |
| 125 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 131 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 126 | reg = <0xfffff600 0x100>; | 132 | reg = <0xfffff600 0x200>; |
| 127 | interrupts = <2 4 1>; | 133 | interrupts = <2 4 1>; |
| 128 | #gpio-cells = <2>; | 134 | #gpio-cells = <2>; |
| 129 | gpio-controller; | 135 | gpio-controller; |
| 130 | interrupt-controller; | 136 | interrupt-controller; |
| 131 | #interrupt-cells = <2>; | 137 | #interrupt-cells = <2>; |
| 132 | }; | 138 | }; |
| 133 | 139 | ||
| 134 | pioC: gpio@fffff800 { | 140 | pioC: gpio@fffff800 { |
| 135 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 141 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 136 | reg = <0xfffff800 0x100>; | 142 | reg = <0xfffff800 0x200>; |
| 137 | interrupts = <3 4 1>; | 143 | interrupts = <3 4 1>; |
| 138 | #gpio-cells = <2>; | 144 | #gpio-cells = <2>; |
| 139 | gpio-controller; | 145 | gpio-controller; |
| 140 | interrupt-controller; | 146 | interrupt-controller; |
| 141 | #interrupt-cells = <2>; | 147 | #interrupt-cells = <2>; |
| 142 | }; | 148 | }; |
| 143 | 149 | ||
| 144 | pioD: gpio@fffffa00 { | 150 | pioD: gpio@fffffa00 { |
| 145 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 151 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 146 | reg = <0xfffffa00 0x100>; | 152 | reg = <0xfffffa00 0x200>; |
| 147 | interrupts = <3 4 1>; | 153 | interrupts = <3 4 1>; |
| 148 | #gpio-cells = <2>; | 154 | #gpio-cells = <2>; |
| 149 | gpio-controller; | 155 | gpio-controller; |
| 150 | interrupt-controller; | 156 | interrupt-controller; |
| 151 | #interrupt-cells = <2>; | 157 | #interrupt-cells = <2>; |
| 158 | }; | ||
| 152 | }; | 159 | }; |
| 153 | 160 | ||
| 154 | dbgu: serial@fffff200 { | 161 | dbgu: serial@fffff200 { |