diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-27 18:28:52 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-27 18:28:53 +0300 |
| commit | 7fbdc6afd02b284441515beda0cde670fbae58a3 (patch) | |
| tree | 4cc969acbd2feefc74d697bb38663e60e4551ad1 /arch/arm/boot/dts/at91-sam9x60ek.dts | |
| parent | 4a775263fcdad67d2ad72e7abcd6172793ea8a29 (diff) | |
| parent | 7dbf4bbf1c320d82058878bd44805724d171e1e8 (diff) | |
| download | linux-7fbdc6afd02b284441515beda0cde670fbae58a3.tar.xz | |
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>
Diffstat (limited to 'arch/arm/boot/dts/at91-sam9x60ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-sam9x60ek.dts | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts index a5f5718c711a..ca15ff8fea18 100644 --- a/arch/arm/boot/dts/at91-sam9x60ek.dts +++ b/arch/arm/boot/dts/at91-sam9x60ek.dts @@ -309,6 +309,10 @@ }; }; +&gpbr { + status = "okay"; +}; + &i2s { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2s_default>; @@ -470,9 +474,9 @@ pinctrl_classd_default: classd { atmel,pins = <AT91_PIOA 24 AT91_PERIPH_C AT91_PINCTRL_PULL_UP - AT91_PIOA 25 AT91_PERIPH_C AT91_PINCTRL_PULL_UP + AT91_PIOA 25 AT91_PERIPH_C AT91_PINCTRL_PULL_DOWN AT91_PIOA 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP - AT91_PIOA 27 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>; + AT91_PIOA 27 AT91_PERIPH_C AT91_PINCTRL_PULL_DOWN>; }; }; @@ -636,6 +640,11 @@ }; }; +&rtt { + atmel,rtt-rtc-time-reg = <&gpbr 0x0>; + status = "okay"; +}; + &shutdown_controller { atmel,shdwc-debouncer = <976>; status = "okay"; |