History

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

From Nicolas Ferre: Here are fixes for AT91 that are mainly related to device tree. One RM9200 setup option is the only C code change. Some documentation changes can clarify the pinctrl use. Then, some defconfig modifications are allowing the affected platforms to boot. * tag 'at91-fixes' of git://github.com/at91linux/linux-at91: ARM: at91/dts: correct comment in at91sam9x5.dtsi for mii ARM: at91/at91_dt_defconfig: add at91sam9n12 SoC to DT defconfig ARM: at91/at91_dt_defconfig: remove memory specification to cmdline ARM: at91/dts: add macb mii pinctrl config for kizbox ARM: at91: rm9200: remake the BGA as default version ARM: at91: fix gpios on i2c-gpio for RM9200 DT ARM: at91/at91sam9x5 DTS: add SCK USART pins ARM: at91/at91sam9x5 DTS: correct wrong PIO BANK values on u(s)arts ARM: at91/at91-pinctrl documentation: fix typo and add some details

Olof Johansson committed 13 years ago

Commit 60fd8e32 parents 4ad3041 8461c2f6 files · +51 −25Browse files

Unified · Split

6 files
  1. Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt +3 −2
  2. arch/arm/boot/dts/at91rm9200.dtsi +2 −2
  3. arch/arm/boot/dts/at91sam9x5.dtsi +40 −20
  4. arch/arm/boot/dts/kizbox.dts +2 −0
  5. arch/arm/configs/at91_dt_defconfig +2 −1
  6. arch/arm/mach-at91/setup.c +2 −0
Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt+3−2
@@ -81,7 +81,8 @@ PA31 TXD4 · 80 unmodified lines
81Required properties for pin configuration node:81Required properties for pin configuration node:
82- atmel,pins: 4 integers array, represents a group of pins mux and config82- atmel,pins: 4 integers array, represents a group of pins mux and config
83 setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.83 setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.
84 The PERIPH 0 means gpio.84 The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B...
85 PIN_BANK 0 is pioA, PIN_BANK 1 is pioB...
85 86
86Bits used for CONFIG:87Bits used for CONFIG:
87PULL_UP (1 << 0): indicate this pin need a pull up.88PULL_UP (1 << 0): indicate this pin need a pull up.
@@ -126,7 +127,7 @@ pinctrl@fffff400 { · 38 unmodified lines
126 pinctrl_dbgu: dbgu-0 {127 pinctrl_dbgu: dbgu-0 {
127 atmel,pins =128 atmel,pins =
128 <1 14 0x1 0x0 /* PB14 periph A */129 <1 14 0x1 0x0 /* PB14 periph A */
129 1 15 0x1 0x1>; /* PB15 periph with pullup */130 1 15 0x1 0x1>; /* PB15 periph A with pullup */
130 };131 };
131 };132 };
132};133};
arch/arm/boot/dts/at91rm9200.dtsi+2−2
@@ -336,8 +336,8 @@ · 335 unmodified lines
336 336
337 i2c@0 {337 i2c@0 {
338 compatible = "i2c-gpio";338 compatible = "i2c-gpio";
339 gpios = <&pioA 23 0 /* sda */339 gpios = <&pioA 25 0 /* sda */
340 &pioA 24 0 /* scl */340 &pioA 26 0 /* scl */
341 >;341 >;
342 i2c-gpio,sda-open-drain;342 i2c-gpio,sda-open-drain;
343 i2c-gpio,scl-open-drain;343 i2c-gpio,scl-open-drain;
arch/arm/boot/dts/at91sam9x5.dtsi+40−20
@@ -143,6 +143,11 @@ · 142 unmodified lines
143 atmel,pins =143 atmel,pins =
144 <0 3 0x1 0x0>; /* PA3 periph A */144 <0 3 0x1 0x0>; /* PA3 periph A */
145 };145 };
146
147 pinctrl_usart0_sck: usart0_sck-0 {
148 atmel,pins =
149 <0 4 0x1 0x0>; /* PA4 periph A */
150 };
146 };151 };
147 152
148 usart1 {153 usart1 {
@@ -154,12 +159,17 @@ · 5 unmodified lines
154 159
155 pinctrl_usart1_rts: usart1_rts-0 {160 pinctrl_usart1_rts: usart1_rts-0 {
156 atmel,pins =161 atmel,pins =
157 <3 27 0x3 0x0>; /* PC27 periph C */162 <2 27 0x3 0x0>; /* PC27 periph C */
158 };163 };
159 164
160 pinctrl_usart1_cts: usart1_cts-0 {165 pinctrl_usart1_cts: usart1_cts-0 {
161 atmel,pins =166 atmel,pins =
162 <3 28 0x3 0x0>; /* PC28 periph C */167 <2 28 0x3 0x0>; /* PC28 periph C */
168 };
169
170 pinctrl_usart1_sck: usart1_sck-0 {
171 atmel,pins =
172 <2 28 0x3 0x0>; /* PC29 periph C */
163 };173 };
164 };174 };
165 175
@@ -172,46 +182,56 @@ · 6 unmodified lines
172 182
173 pinctrl_uart2_rts: uart2_rts-0 {183 pinctrl_uart2_rts: uart2_rts-0 {
174 atmel,pins =184 atmel,pins =
175 <0 0 0x2 0x0>; /* PB0 periph B */185 <1 0 0x2 0x0>; /* PB0 periph B */
176 };186 };
177 187
178 pinctrl_uart2_cts: uart2_cts-0 {188 pinctrl_uart2_cts: uart2_cts-0 {
179 atmel,pins =189 atmel,pins =
180 <0 1 0x2 0x0>; /* PB1 periph B */190 <1 1 0x2 0x0>; /* PB1 periph B */
191 };
192
193 pinctrl_usart2_sck: usart2_sck-0 {
194 atmel,pins =
195 <1 2 0x2 0x0>; /* PB2 periph B */
181 };196 };
182 };197 };
183 198
184 usart3 {199 usart3 {
185 pinctrl_uart3: usart3-0 {200 pinctrl_uart3: usart3-0 {
186 atmel,pins =201 atmel,pins =
187 <3 23 0x2 0x1 /* PC22 periph B with pullup */202 <2 23 0x2 0x1 /* PC22 periph B with pullup */
188 3 23 0x2 0x0>; /* PC23 periph B */203 2 23 0x2 0x0>; /* PC23 periph B */
189 };204 };
190 205
191 pinctrl_usart3_rts: usart3_rts-0 {206 pinctrl_usart3_rts: usart3_rts-0 {
192 atmel,pins =207 atmel,pins =
193 <3 24 0x2 0x0>; /* PC24 periph B */208 <2 24 0x2 0x0>; /* PC24 periph B */
194 };209 };
195 210
196 pinctrl_usart3_cts: usart3_cts-0 {211 pinctrl_usart3_cts: usart3_cts-0 {
197 atmel,pins =212 atmel,pins =
198 <3 25 0x2 0x0>; /* PC25 periph B */213 <2 25 0x2 0x0>; /* PC25 periph B */
214 };
215
216 pinctrl_usart3_sck: usart3_sck-0 {
217 atmel,pins =
218 <2 26 0x2 0x0>; /* PC26 periph B */
199 };219 };
200 };220 };
201 221
202 uart0 {222 uart0 {
203 pinctrl_uart0: uart0-0 {223 pinctrl_uart0: uart0-0 {
204 atmel,pins =224 atmel,pins =
205 <3 8 0x3 0x0 /* PC8 periph C */225 <2 8 0x3 0x0 /* PC8 periph C */
206 3 9 0x3 0x1>; /* PC9 periph C with pullup */226 2 9 0x3 0x1>; /* PC9 periph C with pullup */
207 };227 };
208 };228 };
209 229
210 uart1 {230 uart1 {
211 pinctrl_uart1: uart1-0 {231 pinctrl_uart1: uart1-0 {
212 atmel,pins =232 atmel,pins =
213 <3 16 0x3 0x0 /* PC16 periph C */233 <2 16 0x3 0x0 /* PC16 periph C */
214 3 17 0x3 0x1>; /* PC17 periph C with pullup */234 2 17 0x3 0x1>; /* PC17 periph C with pullup */
215 };235 };
216 };236 };
217 237
@@ -240,14 +260,14 @@ · 22 unmodified lines
240 260
241 pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 {261 pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 {
242 atmel,pins =262 atmel,pins =
243 <1 8 0x1 0x0 /* PA8 periph A */263 <1 8 0x1 0x0 /* PB8 periph A */
244 1 11 0x1 0x0 /* PA11 periph A */264 1 11 0x1 0x0 /* PB11 periph A */
245 1 12 0x1 0x0 /* PA12 periph A */265 1 12 0x1 0x0 /* PB12 periph A */
246 1 13 0x1 0x0 /* PA13 periph A */266 1 13 0x1 0x0 /* PB13 periph A */
247 1 14 0x1 0x0 /* PA14 periph A */267 1 14 0x1 0x0 /* PB14 periph A */
248 1 15 0x1 0x0 /* PA15 periph A */268 1 15 0x1 0x0 /* PB15 periph A */
249 1 16 0x1 0x0 /* PA16 periph A */269 1 16 0x1 0x0 /* PB16 periph A */
250 1 17 0x1 0x0>; /* PA17 periph A */270 1 17 0x1 0x0>; /* PB17 periph A */
251 };271 };
252 };272 };
253 273
arch/arm/boot/dts/kizbox.dts+2−0
@@ -48,6 +48,8 @@ · 47 unmodified lines
48 48
49 macb0: ethernet@fffc4000 {49 macb0: ethernet@fffc4000 {
50 phy-mode = "mii";50 phy-mode = "mii";
51 pinctrl-0 = <&pinctrl_macb_rmii
52 &pinctrl_macb_rmii_mii_alt>;
51 status = "okay";53 status = "okay";
52 };54 };
53 55
arch/arm/configs/at91_dt_defconfig+2−1
@@ -19,6 +19,7 @@ CONFIG_SOC_AT91SAM9260=y · 18 unmodified lines
19CONFIG_SOC_AT91SAM9263=y19CONFIG_SOC_AT91SAM9263=y
20CONFIG_SOC_AT91SAM9G45=y20CONFIG_SOC_AT91SAM9G45=y
21CONFIG_SOC_AT91SAM9X5=y21CONFIG_SOC_AT91SAM9X5=y
22CONFIG_SOC_AT91SAM9N12=y
22CONFIG_MACH_AT91SAM_DT=y23CONFIG_MACH_AT91SAM_DT=y
23CONFIG_AT91_PROGRAMMABLE_CLOCKS=y24CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
24CONFIG_AT91_TIMER_HZ=12825CONFIG_AT91_TIMER_HZ=128
@@ -31,7 +32,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 · 6 unmodified lines
31CONFIG_ZBOOT_ROM_BSS=0x032CONFIG_ZBOOT_ROM_BSS=0x0
32CONFIG_ARM_APPENDED_DTB=y33CONFIG_ARM_APPENDED_DTB=y
33CONFIG_ARM_ATAG_DTB_COMPAT=y34CONFIG_ARM_ATAG_DTB_COMPAT=y
34CONFIG_CMDLINE="mem=128M console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"35CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
35CONFIG_KEXEC=y36CONFIG_KEXEC=y
36CONFIG_AUTO_ZRELADDR=y37CONFIG_AUTO_ZRELADDR=y
37# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
arch/arm/mach-at91/setup.c+2−0
@@ -105,6 +105,8 @@ static void __init soc_detect(u32 dbgu_base) · 104 unmodified lines
105 switch (socid) {105 switch (socid) {
106 case ARCH_ID_AT91RM9200:106 case ARCH_ID_AT91RM9200:
107 at91_soc_initdata.type = AT91_SOC_RM9200;107 at91_soc_initdata.type = AT91_SOC_RM9200;
108 if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE)
109 at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
108 at91_boot_soc = at91rm9200_soc;110 at91_boot_soc = at91rm9200_soc;
109 break;111 break;
110 112