diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:10:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:10:39 +0300 |
| commit | b3a87044464d2c6ecdca07c24b844a3b522ad8a1 (patch) | |
| tree | 3821a9ac064557fc07fbd8f756f8e975e529db70 /arch/arm/boot/dts/at91sam9x25ek.dts | |
| parent | da7920e31de98a149ab4048d7f05913429b84c2f (diff) | |
| parent | 854106bc625a73b251ef7de2d5b49847d53041c2 (diff) | |
| download | linux-b3a87044464d2c6ecdca07c24b844a3b522ad8a1.tar.xz | |
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 (limited to 'arch/arm/boot/dts/at91sam9x25ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x25ek.dts | 10 |
1 files changed, 10 insertions, 0 deletions
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 @@ ahb { apb { + can1: can@f8004000 { + status = "okay"; + }; + macb0: ethernet@f802c000 { phy-mode = "rmii"; status = "okay"; @@ -25,6 +29,12 @@ phy-mode = "rmii"; status = "okay"; }; + + pwm0: pwm@f8034000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwm0_1>; + status = "okay"; + }; }; }; }; |