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/at91sam9n12.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/at91sam9n12.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 83 |
1 files changed, 45 insertions, 38 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index 82508d68aa7e..b061c0626025 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
| @@ -102,44 +102,51 @@ | |||
| 102 | interrupts = <20 4 0>; | 102 | interrupts = <20 4 0>; |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | pioA: gpio@fffff400 { | 105 | pinctrl@fffff400 { |
| 106 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 106 | #address-cells = <1>; |
| 107 | reg = <0xfffff400 0x100>; | 107 | #size-cells = <1>; |
| 108 | interrupts = <2 4 1>; | 108 | compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; |
| 109 | #gpio-cells = <2>; | 109 | ranges = <0xfffff400 0xfffff400 0x800>; |
| 110 | gpio-controller; | 110 | |
| 111 | interrupt-controller; | 111 | pioA: gpio@fffff400 { |
| 112 | #interrupt-cells = <2>; | 112 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 113 | }; | 113 | reg = <0xfffff400 0x200>; |
| 114 | 114 | interrupts = <2 4 1>; | |
| 115 | pioB: gpio@fffff600 { | 115 | #gpio-cells = <2>; |
| 116 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 116 | gpio-controller; |
| 117 | reg = <0xfffff600 0x100>; | 117 | interrupt-controller; |
| 118 | interrupts = <2 4 1>; | 118 | #interrupt-cells = <2>; |
| 119 | #gpio-cells = <2>; | 119 | }; |
| 120 | gpio-controller; | 120 | |
| 121 | interrupt-controller; | 121 | pioB: gpio@fffff600 { |
| 122 | #interrupt-cells = <2>; | 122 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 123 | }; | 123 | reg = <0xfffff600 0x200>; |
| 124 | 124 | interrupts = <2 4 1>; | |
| 125 | pioC: gpio@fffff800 { | 125 | #gpio-cells = <2>; |
| 126 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 126 | gpio-controller; |
| 127 | reg = <0xfffff800 0x100>; | 127 | interrupt-controller; |
| 128 | interrupts = <3 4 1>; | 128 | #interrupt-cells = <2>; |
| 129 | #gpio-cells = <2>; | 129 | }; |
| 130 | gpio-controller; | 130 | |
| 131 | interrupt-controller; | 131 | pioC: gpio@fffff800 { |
| 132 | #interrupt-cells = <2>; | 132 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 133 | }; | 133 | reg = <0xfffff800 0x200>; |
| 134 | 134 | interrupts = <3 4 1>; | |
| 135 | pioD: gpio@fffffa00 { | 135 | #gpio-cells = <2>; |
| 136 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 136 | gpio-controller; |
| 137 | reg = <0xfffffa00 0x100>; | 137 | interrupt-controller; |
| 138 | interrupts = <3 4 1>; | 138 | #interrupt-cells = <2>; |
| 139 | #gpio-cells = <2>; | 139 | }; |
| 140 | gpio-controller; | 140 | |
| 141 | interrupt-controller; | 141 | pioD: gpio@fffffa00 { |
| 142 | #interrupt-cells = <2>; | 142 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
| 143 | reg = <0xfffffa00 0x200>; | ||
| 144 | interrupts = <3 4 1>; | ||
| 145 | #gpio-cells = <2>; | ||
| 146 | gpio-controller; | ||
| 147 | interrupt-controller; | ||
| 148 | #interrupt-cells = <2>; | ||
| 149 | }; | ||
| 143 | }; | 150 | }; |
| 144 | 151 | ||
| 145 | dbgu: serial@fffff200 { | 152 | dbgu: serial@fffff200 { |