Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'at91-dt-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

AT91 DT for 5.9

- ClassD pull down fixes
- Enable RTT as RTC on sam9x60ek
- Fix phy-mode for sama5d3_xplained

* tag 'at91-dt-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: sama5d3_xplained: change phy-mode
ARM: dts: at91: sama5d2_xplained: Remove pdmic node
ARM: dts: sam9x60: add rtt
dt-bindings: rtc: add microchip,sam9x60-rtt
ARM: dts: at91: sam9x60ek: classd: pull-down the L1 and L3 lines
ARM: dts: at91: sama5d2_xplained: classd: pull-down the R1 and R3 lines

Link: https://lore.kernel.org/r/20200726193207.GA182066@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+31 -25
+3 -1
Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt
··· 1 1 Atmel AT91SAM9260 Real Time Timer 2 2 3 3 Required properties: 4 - - compatible: should be: "atmel,at91sam9260-rtt" 4 + - compatible: should be one of the following: 5 + - "atmel,at91sam9260-rtt" 6 + - "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt" 5 7 - reg: should encode the memory region of the RTT controller 6 8 - interrupts: rtt alarm/event interrupt 7 9 - clocks: should contain the 32 KHz slow clk that will drive the RTT block.
+11 -2
arch/arm/boot/dts/at91-sam9x60ek.dts
··· 309 309 }; 310 310 }; 311 311 312 + &gpbr { 313 + status = "okay"; 314 + }; 315 + 312 316 &i2s { 313 317 pinctrl-names = "default"; 314 318 pinctrl-0 = <&pinctrl_i2s_default>; ··· 474 470 pinctrl_classd_default: classd { 475 471 atmel,pins = 476 472 <AT91_PIOA 24 AT91_PERIPH_C AT91_PINCTRL_PULL_UP 477 - AT91_PIOA 25 AT91_PERIPH_C AT91_PINCTRL_PULL_UP 473 + AT91_PIOA 25 AT91_PERIPH_C AT91_PINCTRL_PULL_DOWN 478 474 AT91_PIOA 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP 479 - AT91_PIOA 27 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>; 475 + AT91_PIOA 27 AT91_PERIPH_C AT91_PINCTRL_PULL_DOWN>; 480 476 }; 481 477 }; 482 478 ··· 638 634 reg = <0x200000 0x600000>; 639 635 }; 640 636 }; 637 + }; 638 + 639 + &rtt { 640 + atmel,rtt-rtc-time-reg = <&gpbr 0x0>; 641 + status = "okay"; 641 642 }; 642 643 643 644 &shutdown_controller {
+9 -21
arch/arm/boot/dts/at91-sama5d2_xplained.dts
··· 168 168 }; 169 169 }; 170 170 171 - pdmic@f8018000 { 172 - pinctrl-names = "default"; 173 - pinctrl-0 = <&pinctrl_pdmic_default>; 174 - atmel,model = "PDMIC @ sama5d2_xplained"; 175 - atmel,mic-min-freq = <1000000>; 176 - atmel,mic-max-freq = <3246000>; 177 - atmel,mic-offset = <0x0>; 178 - status = "okay"; 179 - }; 180 - 181 171 uart1: serial@f8020000 { 182 172 pinctrl-names = "default"; 183 173 pinctrl-0 = <&pinctrl_uart1_default>; ··· 480 490 bias-pull-up; 481 491 }; 482 492 483 - pinctrl_classd_default: classd_default { 493 + pinctrl_classd_default_pfets: classd_default_pfets { 484 494 pinmux = <PIN_PB1__CLASSD_R0>, 485 - <PIN_PB2__CLASSD_R1>, 486 - <PIN_PB3__CLASSD_R2>, 487 - <PIN_PB4__CLASSD_R3>; 495 + <PIN_PB3__CLASSD_R2>; 488 496 bias-pull-up; 497 + }; 498 + 499 + pinctrl_classd_default_nfets: classd_default_nfets { 500 + pinmux = <PIN_PB2__CLASSD_R1>, 501 + <PIN_PB4__CLASSD_R3>; 502 + bias-pull-down; 489 503 }; 490 504 491 505 pinctrl_flx0_default: flx0_default { ··· 589 595 bias-disable; 590 596 }; 591 597 592 - pinctrl_pdmic_default: pdmic_default { 593 - pinmux = <PIN_PB26__PDMIC_DAT>, 594 - <PIN_PB27__PDMIC_CLK>; 595 - bias-disable; 596 - }; 597 - 598 598 pinctrl_qspi0_default: qspi0_default { 599 599 sck_cs { 600 600 pinmux = <PIN_PA22__QSPI0_SCK>, ··· 684 696 685 697 classd: classd@fc048000 { 686 698 pinctrl-names = "default"; 687 - pinctrl-0 = <&pinctrl_classd_default>; 699 + pinctrl-0 = <&pinctrl_classd_default_pfets &pinctrl_classd_default_nfets>; 688 700 atmel,pwm-type = "diff"; 689 701 atmel,non-overlap-time = <10>; 690 702 status = "okay";
+1 -1
arch/arm/boot/dts/at91-sama5d3_xplained.dts
··· 128 128 }; 129 129 130 130 macb0: ethernet@f0028000 { 131 - phy-mode = "rgmii"; 131 + phy-mode = "rgmii-rxid"; 132 132 #address-cells = <1>; 133 133 #size-cells = <0>; 134 134 status = "okay";
+7
arch/arm/boot/dts/sam9x60.dtsi
··· 661 661 status = "disabled"; 662 662 }; 663 663 664 + rtt: rtt@fffffe20 { 665 + compatible = "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt"; 666 + reg = <0xfffffe20 0x20>; 667 + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; 668 + clocks = <&clk32k 0>; 669 + }; 670 + 664 671 pit: timer@fffffe40 { 665 672 compatible = "atmel,at91sam9260-pit"; 666 673 reg = <0xfffffe40 0x10>;