aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-30 09:10:39 -0400
committerArnd Bergmann <arnd@arndb.de>2017-10-30 09:10:39 -0400
commitb3a87044464d2c6ecdca07c24b844a3b522ad8a1 (patch)
tree3821a9ac064557fc07fbd8f756f8e975e529db70
parentda7920e31de98a149ab4048d7f05913429b84c2f (diff)
parent854106bc625a73b251ef7de2d5b49847d53041c2 (diff)
Merge tag 'at91-ab-4.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
Pull" ARM: at91: DT for 4.15" from Alexandre Belloni: - sama5d2 xplained: add charger and SD card power supply - sama5d27_som1_ek: many adjustments - at91sam9x25ek: add pwm0 and can1 * tag 'at91-ab-4.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: dts: at91: at91sam9x5ek: use DMA for USART0 ARM: dts: at91: at91sam9x25ek: add pwm0 ARM: dts: at91: at91sam9x25ek: add CAN1 interface ARM: dts: at91: sama5d2_xplained: remove pull-up on SD/MMC lines ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 ARM: dts: at91: sama5d2_xplained: set PB_USER as wakeup source ARM: dts: at91: sama5d27_som1_ek: remove pull-up on SD/MMC lines ARM: dts: at91: sama5d27_som1_ek: remove not connected CAN0 ARM: dts: at91: sama5d27_som1_ek: add pinmuxing for pwm0 ARM: dts: at91: sama5d27_som1_ek: add aliases for i2c ARM: dts: at91: sama5d27_som1_ek: set USER button as a wakeup source ARM: dts: at91: sama5d27_som1_ek: update serial aliases ARM: dts: at91: sama5d27_som1_ek: enable i2c2 ARM: dts: at91: sama5d27_som1_ek: add disabled status ARM: dts: at91: usb_a9g20: fix rtc node ARM: dts: at91: sama5d2 Xplained: Describe the SD card power supply ARM: dts: at91: sama5d2_xplained: Add charger node
Diffstat
-rw-r--r--arch/arm/boot/dts/at91-sama5d27_som1_ek.dts46
-rw-r--r--arch/arm/boot/dts/at91-sama5d2_xplained.dts41
-rw-r--r--arch/arm/boot/dts/at91sam9x25ek.dts10
-rw-r--r--arch/arm/boot/dts/at91sam9x5ek.dtsi2
-rw-r--r--arch/arm/boot/dts/usb_a9g20_common.dtsi4
5 files changed, 66 insertions, 37 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index cfb1b6a23824..6d87b4eb6c41 100644
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -53,6 +53,14 @@
53 model = "Atmel SAMA5D27 SOM1 EK"; 53 model = "Atmel SAMA5D27 SOM1 EK";
54 compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; 54 compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5";
55 55
56 aliases {
57 serial0 = &uart1; /* DBGU */
58 serial1 = &uart4; /* mikro BUS 1 */
59 serial2 = &uart2; /* mikro BUS 2 */
60 i2c1 = &i2c1;
61 i2c2 = &i2c2;
62 };
63
56 chosen { 64 chosen {
57 stdout-path = "serial0:115200n8"; 65 stdout-path = "serial0:115200n8";
58 }; 66 };
@@ -128,12 +136,14 @@
128 }; 136 };
129 137
130 pwm0: pwm@f802c000 { 138 pwm0: pwm@f802c000 {
131 status = "okay"; 139 pinctrl-names = "default";
140 pinctrl-0 = <&pinctrl_mikrobus1_pwm &pinctrl_mikrobus2_pwm>;
141 status = "disabled"; /* Conflict with leds. */
132 }; 142 };
133 143
134 flx1: flexcom@f8038000 { 144 flx1: flexcom@f8038000 {
135 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; 145 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
136 status = "disabled"; 146 status = "okay";
137 147
138 i2c2: i2c@600 { 148 i2c2: i2c@600 {
139 compatible = "atmel,sama5d2-i2c"; 149 compatible = "atmel,sama5d2-i2c";
@@ -147,7 +157,7 @@
147 pinctrl-names = "default"; 157 pinctrl-names = "default";
148 pinctrl-0 = <&pinctrl_mikrobus_i2c>; 158 pinctrl-0 = <&pinctrl_mikrobus_i2c>;
149 atmel,fifo-size = <16>; 159 atmel,fifo-size = <16>;
150 status = "disabled"; 160 status = "okay";
151 }; 161 };
152 }; 162 };
153 163
@@ -165,17 +175,12 @@
165 status = "okay"; 175 status = "okay";
166 }; 176 };
167 177
168 can0: can@f8054000 {
169 pinctrl-names = "default";
170 pinctrl-0 = <&pinctrl_can0_default>;
171 };
172
173 uart3: serial@fc008000 { 178 uart3: serial@fc008000 {
174 atmel,use-dma-rx; 179 atmel,use-dma-rx;
175 atmel,use-dma-tx; 180 atmel,use-dma-tx;
176 pinctrl-names = "default"; 181 pinctrl-names = "default";
177 pinctrl-0 = <&pinctrl_uart3_default>; 182 pinctrl-0 = <&pinctrl_uart3_default>;
178 status = "disabled"; 183 status = "disabled"; /* Conflict with isc. */
179 }; 184 };
180 185
181 uart4: serial@fc00c000 { 186 uart4: serial@fc00c000 {
@@ -199,7 +204,7 @@
199 pinctrl-names = "default"; 204 pinctrl-names = "default";
200 pinctrl-0 = <&pinctrl_flx3_default>; 205 pinctrl-0 = <&pinctrl_flx3_default>;
201 atmel,fifo-size = <32>; 206 atmel,fifo-size = <32>;
202 status = "disabled"; 207 status = "disabled"; /* Conflict with isc. */
203 }; 208 };
204 209
205 spi2: spi@400 { 210 spi2: spi@400 {
@@ -211,7 +216,7 @@
211 pinctrl-names = "default"; 216 pinctrl-names = "default";
212 pinctrl-0 = <&pinctrl_flx3_default>; 217 pinctrl-0 = <&pinctrl_flx3_default>;
213 atmel,fifo-size = <16>; 218 atmel,fifo-size = <16>;
214 status = "disabled"; 219 status = "disabled"; /* Conflict with isc. */
215 }; 220 };
216 }; 221 };
217 222
@@ -228,7 +233,7 @@
228 pinctrl-names = "default"; 233 pinctrl-names = "default";
229 pinctrl-0 = <&pinctrl_flx4_default>; 234 pinctrl-0 = <&pinctrl_flx4_default>;
230 atmel,fifo-size = <32>; 235 atmel,fifo-size = <32>;
231 status = "disabled"; 236 status = "disabled"; /* Conflict with spi3 and i2c3. */
232 }; 237 };
233 238
234 spi3: spi@400 { 239 spi3: spi@400 {
@@ -240,7 +245,7 @@
240 pinctrl-names = "default"; 245 pinctrl-names = "default";
241 pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; 246 pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
242 atmel,fifo-size = <16>; 247 atmel,fifo-size = <16>;
243 status = "okay"; 248 status = "okay"; /* Conflict with uart6 and i2c3. */
244 }; 249 };
245 250
246 i2c3: i2c@600 { 251 i2c3: i2c@600 {
@@ -255,7 +260,7 @@
255 pinctrl-names = "default"; 260 pinctrl-names = "default";
256 pinctrl-0 = <&pinctrl_flx4_default>; 261 pinctrl-0 = <&pinctrl_flx4_default>;
257 atmel,fifo-size = <16>; 262 atmel,fifo-size = <16>;
258 status = "disabled"; 263 status = "disabled"; /* Conflict with uart6 and spi3. */
259 }; 264 };
260 }; 265 };
261 266
@@ -268,12 +273,6 @@
268 273
269 pinctrl@fc038000 { 274 pinctrl@fc038000 {
270 275
271 pinctrl_can0_default: can0_default {
272 pinmux = <PIN_PC10__CANTX0>,
273 <PIN_PC11__CANRX0>;
274 bias-disable;
275 };
276
277 pinctrl_can1_default: can1_default { 276 pinctrl_can1_default: can1_default {
278 pinmux = <PIN_PC26__CANTX1>, 277 pinmux = <PIN_PC26__CANTX1>,
279 <PIN_PC27__CANRX1>; 278 <PIN_PC27__CANRX1>;
@@ -350,7 +349,7 @@
350 <PIN_PA7__SDMMC0_DAT5>, 349 <PIN_PA7__SDMMC0_DAT5>,
351 <PIN_PA8__SDMMC0_DAT6>, 350 <PIN_PA8__SDMMC0_DAT6>,
352 <PIN_PA9__SDMMC0_DAT7>; 351 <PIN_PA9__SDMMC0_DAT7>;
353 bias-pull-up; 352 bias-disable;
354 }; 353 };
355 354
356 ck_cd_vddsel { 355 ck_cd_vddsel {
@@ -368,7 +367,7 @@
368 <PIN_PA19__SDMMC1_DAT1>, 367 <PIN_PA19__SDMMC1_DAT1>,
369 <PIN_PA20__SDMMC1_DAT2>, 368 <PIN_PA20__SDMMC1_DAT2>,
370 <PIN_PA21__SDMMC1_DAT3>; 369 <PIN_PA21__SDMMC1_DAT3>;
371 bias-pull-up; 370 bias-disable;
372 }; 371 };
373 372
374 conf-ck_cd { 373 conf-ck_cd {
@@ -512,6 +511,7 @@
512 label = "USER"; 511 label = "USER";
513 gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; 512 gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>;
514 linux,code = <0x104>; 513 linux,code = <0x104>;
514 wakeup-source;
515 }; 515 };
516 }; 516 };
517 517
@@ -519,7 +519,7 @@
519 compatible = "gpio-leds"; 519 compatible = "gpio-leds";
520 pinctrl-names = "default"; 520 pinctrl-names = "default";
521 pinctrl-0 = <&pinctrl_led_gpio_default>; 521 pinctrl-0 = <&pinctrl_led_gpio_default>;
522 status = "okay"; 522 status = "okay"; /* Conflict with pwm0. */
523 523
524 red { 524 red {
525 label = "red"; 525 label = "red";
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index b2b5a8534134..bb3fff4dbd24 100644
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -103,6 +103,8 @@
103 pinctrl-names = "default"; 103 pinctrl-names = "default";
104 pinctrl-0 = <&pinctrl_sdmmc1_default>; 104 pinctrl-0 = <&pinctrl_sdmmc1_default>;
105 status = "okay"; /* conflict with qspi0 */ 105 status = "okay"; /* conflict with qspi0 */
106 vqmmc-supply = <&vdd_3v3_reg>;
107 vmmc-supply = <&vdd_3v3_reg>;
106 }; 108 };
107 109
108 apb { 110 apb {
@@ -160,14 +162,6 @@
160 compatible = "active-semi,act8945a"; 162 compatible = "active-semi,act8945a";
161 reg = <0x5b>; 163 reg = <0x5b>;
162 active-semi,vsel-high; 164 active-semi,vsel-high;
163 active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>;
164 active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>;
165 active-semi,irq_gpios = <&pioA PIN_PB13 GPIO_ACTIVE_LOW>;
166 active-semi,input-voltage-threshold-microvolt = <6600>;
167 active-semi,precondition-timeout = <40>;
168 active-semi,total-timeout = <3>;
169 pinctrl-names = "default";
170 pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
171 status = "okay"; 165 status = "okay";
172 166
173 regulators { 167 regulators {
@@ -220,11 +214,28 @@
220 regulator-always-on; 214 regulator-always-on;
221 }; 215 };
222 }; 216 };
217
218 charger {
219 compatible = "active-semi,act8945a-charger";
220 pinctrl-names = "default";
221 pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
222 interrupt-parent = <&pioA>;
223 interrupts = <PIN_PB13 GPIO_ACTIVE_LOW>;
224
225 active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>;
226 active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>;
227 active-semi,input-voltage-threshold-microvolt = <6600>;
228 active-semi,precondition-timeout = <40>;
229 active-semi,total-timeout = <3>;
230 status = "okay";
231 };
223 }; 232 };
224 }; 233 };
225 234
226 pwm0: pwm@f802c000 { 235 pwm0: pwm@f802c000 {
227 status = "okay"; 236 pinctrl-names = "default";
237 pinctrl-0 = <&pinctrl_pwm0_pwm2_default>;
238 status = "disabled"; /* conflict with leds */
228 }; 239 };
229 240
230 flx0: flexcom@f8034000 { 241 flx0: flexcom@f8034000 {
@@ -435,7 +446,7 @@
435 <PIN_PA7__SDMMC0_DAT5>, 446 <PIN_PA7__SDMMC0_DAT5>,
436 <PIN_PA8__SDMMC0_DAT6>, 447 <PIN_PA8__SDMMC0_DAT6>,
437 <PIN_PA9__SDMMC0_DAT7>; 448 <PIN_PA9__SDMMC0_DAT7>;
438 bias-pull-up; 449 bias-disable;
439 }; 450 };
440 451
441 ck_cd_rstn_vddsel { 452 ck_cd_rstn_vddsel {
@@ -454,7 +465,7 @@
454 <PIN_PA19__SDMMC1_DAT1>, 465 <PIN_PA19__SDMMC1_DAT1>,
455 <PIN_PA20__SDMMC1_DAT2>, 466 <PIN_PA20__SDMMC1_DAT2>,
456 <PIN_PA21__SDMMC1_DAT3>; 467 <PIN_PA21__SDMMC1_DAT3>;
457 bias-pull-up; 468 bias-disable;
458 }; 469 };
459 470
460 conf-ck_cd { 471 conf-ck_cd {
@@ -494,6 +505,11 @@
494 bias-disable; 505 bias-disable;
495 }; 506 };
496 507
508 pinctrl_pwm0_pwm2_default: pwm0_pwm2_default {
509 pinmux = <PIN_PB5__PWMH2>,
510 <PIN_PB6__PWML2>;
511 bias-pull-up;
512 };
497 }; 513 };
498 514
499 classd: classd@fc048000 { 515 classd: classd@fc048000 {
@@ -522,6 +538,7 @@
522 label = "PB_USER"; 538 label = "PB_USER";
523 gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>; 539 gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>;
524 linux,code = <0x104>; 540 linux,code = <0x104>;
541 wakeup-source;
525 }; 542 };
526 }; 543 };
527 544
@@ -529,7 +546,7 @@
529 compatible = "gpio-leds"; 546 compatible = "gpio-leds";
530 pinctrl-names = "default"; 547 pinctrl-names = "default";
531 pinctrl-0 = <&pinctrl_led_gpio_default>; 548 pinctrl-0 = <&pinctrl_led_gpio_default>;
532 status = "okay"; 549 status = "okay"; /* conflict with pwm0 */
533 550
534 red { 551 red {
535 label = "red"; 552 label = "red";
diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts
index 494864836e83..f705a3165656 100644
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@ -16,6 +16,10 @@
16 16
17 ahb { 17 ahb {
18 apb { 18 apb {
19 can1: can@f8004000 {
20 status = "okay";
21 };
22
19 macb0: ethernet@f802c000 { 23 macb0: ethernet@f802c000 {
20 phy-mode = "rmii"; 24 phy-mode = "rmii";
21 status = "okay"; 25 status = "okay";
@@ -25,6 +29,12 @@
25 phy-mode = "rmii"; 29 phy-mode = "rmii";
26 status = "okay"; 30 status = "okay";
27 }; 31 };
32
33 pwm0: pwm@f8034000 {
34 pinctrl-names = "default";
35 pinctrl-0 = <&pinctrl_pwm0_pwm0_1>;
36 status = "okay";
37 };
28 }; 38 };
29 }; 39 };
30}; 40};
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index eb6dcc4c2bc3..4a2e13c8bf00 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -50,6 +50,8 @@
50 }; 50 };
51 51
52 usart0: serial@f801c000 { 52 usart0: serial@f801c000 {
53 atmel,use-dma-rx;
54 atmel,use-dma-tx;
53 status = "okay"; 55 status = "okay";
54 }; 56 };
55 57
diff --git a/arch/arm/boot/dts/usb_a9g20_common.dtsi b/arch/arm/boot/dts/usb_a9g20_common.dtsi
index 088c2c3685ab..81c3fe0465d9 100644
--- a/arch/arm/boot/dts/usb_a9g20_common.dtsi
+++ b/arch/arm/boot/dts/usb_a9g20_common.dtsi
@@ -20,8 +20,8 @@
20 }; 20 };
21 21
22 i2c-gpio-0 { 22 i2c-gpio-0 {
23 rv3029c2@56 { 23 rtc@56 {
24 compatible = "rv3029c2"; 24 compatible = "microcrystal,rv3029";
25 reg = <0x56>; 25 reg = <0x56>;
26 }; 26 };
27 }; 27 };
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-29 02:50:14 -0400