diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:10:39 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 14:10:39 +0100 |
commit | b3a87044464d2c6ecdca07c24b844a3b522ad8a1 (patch) | |
tree | 3821a9ac064557fc07fbd8f756f8e975e529db70 /arch/arm/boot/dts/at91-sama5d2_xplained.dts | |
parent | da7920e31de98a149ab4048d7f05913429b84c2f (diff) | |
parent | 854106bc625a73b251ef7de2d5b49847d53041c2 (diff) | |
download | linux-b3a87044464d2c6ecdca07c24b844a3b522ad8a1.tar.bz2 |
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/at91-sama5d2_xplained.dts')
-rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 41 |
1 files changed, 29 insertions, 12 deletions
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 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdmmc1_default>; status = "okay"; /* conflict with qspi0 */ + vqmmc-supply = <&vdd_3v3_reg>; + vmmc-supply = <&vdd_3v3_reg>; }; apb { @@ -160,14 +162,6 @@ compatible = "active-semi,act8945a"; reg = <0x5b>; active-semi,vsel-high; - active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>; - active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>; - active-semi,irq_gpios = <&pioA PIN_PB13 GPIO_ACTIVE_LOW>; - active-semi,input-voltage-threshold-microvolt = <6600>; - active-semi,precondition-timeout = <40>; - active-semi,total-timeout = <3>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>; status = "okay"; regulators { @@ -220,11 +214,28 @@ regulator-always-on; }; }; + + charger { + compatible = "active-semi,act8945a-charger"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>; + interrupt-parent = <&pioA>; + interrupts = <PIN_PB13 GPIO_ACTIVE_LOW>; + + active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>; + active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>; + active-semi,input-voltage-threshold-microvolt = <6600>; + active-semi,precondition-timeout = <40>; + active-semi,total-timeout = <3>; + status = "okay"; + }; }; }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwm2_default>; + status = "disabled"; /* conflict with leds */ }; flx0: flexcom@f8034000 { @@ -435,7 +446,7 @@ <PIN_PA7__SDMMC0_DAT5>, <PIN_PA8__SDMMC0_DAT6>, <PIN_PA9__SDMMC0_DAT7>; - bias-pull-up; + bias-disable; }; ck_cd_rstn_vddsel { @@ -454,7 +465,7 @@ <PIN_PA19__SDMMC1_DAT1>, <PIN_PA20__SDMMC1_DAT2>, <PIN_PA21__SDMMC1_DAT3>; - bias-pull-up; + bias-disable; }; conf-ck_cd { @@ -494,6 +505,11 @@ bias-disable; }; + pinctrl_pwm0_pwm2_default: pwm0_pwm2_default { + pinmux = <PIN_PB5__PWMH2>, + <PIN_PB6__PWML2>; + bias-pull-up; + }; }; classd: classd@fc048000 { @@ -522,6 +538,7 @@ label = "PB_USER"; gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>; linux,code = <0x104>; + wakeup-source; }; }; @@ -529,7 +546,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_led_gpio_default>; - status = "okay"; + status = "okay"; /* conflict with pwm0 */ red { label = "red"; |