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
8181 Required properties for pin configuration node:
8282 - atmel,pins: 4 integers array, represents a group of pins mux and config
8383 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...
8586
8687 Bits used for CONFIG:
8788 PULL_UP (1 << 0): indicate this pin need a pull up.
@@ -126,7 +127,7 @@ pinctrl@fffff400 { · 38 unmodified lines
126127 pinctrl_dbgu: dbgu-0 {
127128 atmel,pins =
128129 <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 */
130131 };
131132 };
132133 };
arch/arm/boot/dts/at91rm9200.dtsi+2−2
@@ -336,8 +336,8 @@ · 335 unmodified lines
336336
337337 i2c@0 {
338338 compatible = "i2c-gpio";
339− gpios = <&pioA 23 0 /* sda */
340− &pioA 24 0 /* scl */
339+ gpios = <&pioA 25 0 /* sda */
340+ &pioA 26 0 /* scl */
341341 >;
342342 i2c-gpio,sda-open-drain;
343343 i2c-gpio,scl-open-drain;
arch/arm/boot/dts/at91sam9x5.dtsi+40−20
@@ -143,6 +143,11 @@ · 142 unmodified lines
143143 atmel,pins =
144144 <0 3 0x1 0x0>; /* PA3 periph A */
145145 };
146+
147+ pinctrl_usart0_sck: usart0_sck-0 {
148+ atmel,pins =
149+ <0 4 0x1 0x0>; /* PA4 periph A */
150+ };
146151 };
147152
148153 usart1 {
@@ -154,12 +159,17 @@ · 5 unmodified lines
154159
155160 pinctrl_usart1_rts: usart1_rts-0 {
156161 atmel,pins =
157− <3 27 0x3 0x0>; /* PC27 periph C */
162+ <2 27 0x3 0x0>; /* PC27 periph C */
158163 };
159164
160165 pinctrl_usart1_cts: usart1_cts-0 {
161166 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 */
163173 };
164174 };
165175
@@ -172,46 +182,56 @@ · 6 unmodified lines
172182
173183 pinctrl_uart2_rts: uart2_rts-0 {
174184 atmel,pins =
175− <0 0 0x2 0x0>; /* PB0 periph B */
185+ <1 0 0x2 0x0>; /* PB0 periph B */
176186 };
177187
178188 pinctrl_uart2_cts: uart2_cts-0 {
179189 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 */
181196 };
182197 };
183198
184199 usart3 {
185200 pinctrl_uart3: usart3-0 {
186201 atmel,pins =
187− <3 23 0x2 0x1 /* PC22 periph B with pullup */
188− 3 23 0x2 0x0>; /* PC23 periph B */
202+ <2 23 0x2 0x1 /* PC22 periph B with pullup */
203+ 2 23 0x2 0x0>; /* PC23 periph B */
189204 };
190205
191206 pinctrl_usart3_rts: usart3_rts-0 {
192207 atmel,pins =
193− <3 24 0x2 0x0>; /* PC24 periph B */
208+ <2 24 0x2 0x0>; /* PC24 periph B */
194209 };
195210
196211 pinctrl_usart3_cts: usart3_cts-0 {
197212 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 */
199219 };
200220 };
201221
202222 uart0 {
203223 pinctrl_uart0: uart0-0 {
204224 atmel,pins =
205− <3 8 0x3 0x0 /* PC8 periph C */
206− 3 9 0x3 0x1>; /* PC9 periph C with pullup */
225+ <2 8 0x3 0x0 /* PC8 periph C */
226+ 2 9 0x3 0x1>; /* PC9 periph C with pullup */
207227 };
208228 };
209229
210230 uart1 {
211231 pinctrl_uart1: uart1-0 {
212232 atmel,pins =
213− <3 16 0x3 0x0 /* PC16 periph C */
214− 3 17 0x3 0x1>; /* PC17 periph C with pullup */
233+ <2 16 0x3 0x0 /* PC16 periph C */
234+ 2 17 0x3 0x1>; /* PC17 periph C with pullup */
215235 };
216236 };
217237
@@ -240,14 +260,14 @@ · 22 unmodified lines
240260
241261 pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 {
242262 atmel,pins =
243− <1 8 0x1 0x0 /* PA8 periph A */
244− 1 11 0x1 0x0 /* PA11 periph A */
245− 1 12 0x1 0x0 /* PA12 periph A */
246− 1 13 0x1 0x0 /* PA13 periph A */
247− 1 14 0x1 0x0 /* PA14 periph A */
248− 1 15 0x1 0x0 /* PA15 periph A */
249− 1 16 0x1 0x0 /* PA16 periph A */
250− 1 17 0x1 0x0>; /* PA17 periph A */
263+ <1 8 0x1 0x0 /* PB8 periph A */
264+ 1 11 0x1 0x0 /* PB11 periph A */
265+ 1 12 0x1 0x0 /* PB12 periph A */
266+ 1 13 0x1 0x0 /* PB13 periph A */
267+ 1 14 0x1 0x0 /* PB14 periph A */
268+ 1 15 0x1 0x0 /* PB15 periph A */
269+ 1 16 0x1 0x0 /* PB16 periph A */
270+ 1 17 0x1 0x0>; /* PB17 periph A */
251271 };
252272 };
253273
arch/arm/boot/dts/kizbox.dts+2−0
@@ -48,6 +48,8 @@ · 47 unmodified lines
4848
4949 macb0: ethernet@fffc4000 {
5050 phy-mode = "mii";
51+ pinctrl-0 = <&pinctrl_macb_rmii
52+ &pinctrl_macb_rmii_mii_alt>;
5153 status = "okay";
5254 };
5355
arch/arm/configs/at91_dt_defconfig+2−1
@@ -19,6 +19,7 @@ CONFIG_SOC_AT91SAM9260=y · 18 unmodified lines
1919 CONFIG_SOC_AT91SAM9263=y
2020 CONFIG_SOC_AT91SAM9G45=y
2121 CONFIG_SOC_AT91SAM9X5=y
22+CONFIG_SOC_AT91SAM9N12=y
2223 CONFIG_MACH_AT91SAM_DT=y
2324 CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
2425 CONFIG_AT91_TIMER_HZ=128
@@ -31,7 +32,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 · 6 unmodified lines
3132 CONFIG_ZBOOT_ROM_BSS=0x0
3233 CONFIG_ARM_APPENDED_DTB=y
3334 CONFIG_ARM_ATAG_DTB_COMPAT=y
34−CONFIG_CMDLINE="mem=128M console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
35+CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
3536 CONFIG_KEXEC=y
3637 CONFIG_AUTO_ZRELADDR=y
3738 # 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
105105 switch (socid) {
106106 case ARCH_ID_AT91RM9200:
107107 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;
108110 at91_boot_soc = at91rm9200_soc;
109111 break;
110112