From ff7b582a940ed0f11130a64dbf8716a54c48ee26 Mon Sep 17 00:00:00 2001 From: Wenyou Yang Date: Tue, 15 Aug 2017 14:24:20 +0800 Subject: ARM: dts: at91: sama5d2_xplained: Add charger node Add the charger device node as a sub-device of act8945a mfd, move the charger's properties in the node, and replace the "active-semi,irq_gpios" with the "interrupts" property to denote the act8945a charger's irq. Signed-off-by: Wenyou Yang Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index c7e9ccf..848ca1b 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -160,14 +160,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,6 +212,21 @@ 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 = ; + + 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"; + }; }; }; -- cgit v1.1 From 9b50e1abcc0fe57c4ad43cc8d1e5ad8ac477f0be Mon Sep 17 00:00:00 2001 From: Romain Izard Date: Tue, 5 Sep 2017 12:18:05 +0200 Subject: ARM: dts: at91: sama5d2 Xplained: Describe the SD card power supply As the SAMA5D2 SDHCI controller works with an external power supply, describe the power supply for the SD card slot. This makes it possible to use mmc power sequences, in the case of external SDIO modules. Signed-off-by: Romain Izard Acked-by: Ludovic Desroches Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 848ca1b..8e3365d 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 { -- cgit v1.1 From be6d90b132b7c89f4978ff6335dc5c930db58594 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Tue, 10 Oct 2017 13:09:44 +0300 Subject: ARM: dts: at91: sama5d2_xplained: set PB_USER as wakeup source Set the PB_USER button as a wakeup source to resume from ulp0 mode. Signed-off-by: Ludovic Desroches [claudiu.beznea@microchip.com: change subject to match the desired prefix] Signed-off-by: Claudiu Beznea Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 8e3365d..69ca857 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -531,6 +531,7 @@ label = "PB_USER"; gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>; linux,code = <0x104>; + wakeup-source; }; }; -- cgit v1.1 From 0036d85b5bdd67f1f2be8b59bca5044166555b4f Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Tue, 10 Oct 2017 13:09:45 +0300 Subject: ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 Add pin muxing for pwm0 and set it as disabled since it is in conflict with pins for leds. Signed-off-by: Claudiu Beznea Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 69ca857..7d385c8 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -233,7 +233,9 @@ }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwm2_default>; + status = "disabled"; /* conflict with leds */ }; flx0: flexcom@f8034000 { @@ -503,6 +505,11 @@ bias-disable; }; + pinctrl_pwm0_pwm2_default: pwm0_pwm2_default { + pinmux = , + ; + bias-pull-up; + }; }; classd: classd@fc048000 { @@ -539,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"; -- cgit v1.1 From a317e514aec085618905d2ac246ef9ca3263b964 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Tue, 10 Oct 2017 13:09:46 +0300 Subject: ARM: dts: at91: sama5d2_xplained: remove pull-up on SD/MMC lines As the board have the proper pull-ups soldered on the data and CMD lines we don't need them specified in the PADs. So remove the "bias-pull-up" property and set "bias-disable". This will also save some power. Signed-off-by: Nicolas Ferre [claudiu.beznea@microchip.com: change subject to match the desired prefix] Signed-off-by: Claudiu Beznea Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 7d385c8..65dd21f 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -446,7 +446,7 @@ , , ; - bias-pull-up; + bias-disable; }; ck_cd_rstn_vddsel { @@ -465,7 +465,7 @@ , , ; - bias-pull-up; + bias-disable; }; conf-ck_cd { -- cgit v1.1 From 8dccafaa281aa1d240a58bbcdff338aec114a021 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 13 Oct 2017 12:54:51 -0500 Subject: arm: dts: fix unit-address leading 0s Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using the following command: perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm/boot/dts -type -f -name '*.dts*' Dropped changes to ARM, Ltd. boards LED nodes and manually fixed up some occurrences of uppercase hex. Signed-off-by: Rob Herring Signed-off-by: Arnd Bergmann --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts') diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index c7e9ccf..b2b5a85 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -67,14 +67,14 @@ }; ahb { - usb0: gadget@00300000 { + usb0: gadget@300000 { atmel,vbus-gpio = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usba_vbus>; status = "okay"; }; - usb1: ohci@00400000 { + usb1: ohci@400000 { num-ports = <3>; atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */ &pioA PIN_PB10 GPIO_ACTIVE_HIGH @@ -85,7 +85,7 @@ status = "okay"; }; - usb2: ehci@00500000 { + usb2: ehci@500000 { status = "okay"; }; -- cgit v1.1