Commit f3d8876a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt 

Samsung DTS ARM changes for v5.12

1. Use new compatile to properly configure Exynos5420 USB2 PHY, fixing
   it suspend/resume cycle.
2. Correct Samsung PMIC interrupt trigger levels on multiple boards.
3. Correct the voltages of Samsung GT-I9100 charger and add top-off
   charger.

* tag 'samsung-dt-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add top-off charging regulator node for I9100
  ARM: dts: exynos: Fix charging regulator voltage and current for I9100
  ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid XU3 family
  ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa
  ARM: dts: exynos: correct PMIC interrupt trigger level on Spring
  ARM: dts: exynos: correct PMIC interrupt trigger level on Rinato
  ARM: dts: exynos: correct PMIC interrupt trigger level on Monk
  ARM: dts: exynos: correct PMIC interrupt trigger level on Artik 5
  ARM: dts: exynos: use Exynos5420 dedicated USB2 PHY compatible

Link: https://lore.kernel.org/r/20210125191240.11278-3-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fff34210 3803f461

arch/arm/boot/dts/exynos3250-artik5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ &i2c_0 { 
	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx3>;

		interrupts = <5 IRQ_TYPE_NONE>;

		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&s2mps14_irq>;

		reg = <0x66>;

arch/arm/boot/dts/exynos3250-monk.dts

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ &i2c_0 { 
	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 IRQ_TYPE_NONE>;

		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;

		reg = <0x66>;

		wakeup-source;

arch/arm/boot/dts/exynos3250-rinato.dts

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ &i2c_0 { 
	pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 IRQ_TYPE_NONE>;

		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;

		reg = <0x66>;

		wakeup-source;

arch/arm/boot/dts/exynos4210-i9100.dts

+18 −12
Original line number Diff line number Diff line
@@ -560,27 +560,33 @@ safe2_sreg: ESAFEOUT2 { 
				regulator-boot-on;

			};



			charger_reg: CHARGER {

				regulator-name = "CHARGER";

				regulator-min-microamp = <60000>;

				regulator-max-microamp = <2580000>;

			EN32KHZ_AP {

				regulator-name = "EN32KHZ_AP";

				regulator-always-on;

			};



			chargercv_reg: CHARGER_CV {

				regulator-name = "CHARGER_CV";

				regulator-min-microvolt = <3800000>;

				regulator-max-microvolt = <4100000>;

			EN32KHZ_CP {

				regulator-name = "EN32KHZ_CP";

				regulator-always-on;

			};



			EN32KHZ_AP {

				regulator-name = "EN32KHZ_AP";

			charger_reg: CHARGER {

				regulator-name = "CHARGER";

				regulator-min-microamp = <200000>;

				regulator-max-microamp = <950000>;

			};



			chargercv_reg: CHARGER_CV {

				regulator-name = "CHARGER_CV";

				regulator-min-microvolt = <4200000>;

				regulator-max-microvolt = <4200000>;

				regulator-always-on;

			};



			EN32KHZ_CP {

				regulator-name = "EN32KHZ_CP";

			CHARGER_TOPOFF {

				regulator-name = "CHARGER_TOPOFF";

				regulator-min-microamp = <200000>;

				regulator-max-microamp = <200000>;

				regulator-always-on;

			};

		};

arch/arm/boot/dts/exynos5250-spring.dts

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ pmic@66 { 
		compatible = "samsung,s5m8767-pmic";

		reg = <0x66>;

		interrupt-parent = <&gpx3>;

		interrupts = <2 IRQ_TYPE_NONE>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&s5m8767_irq &s5m8767_dvs &s5m8767_ds>;

		wakeup-source;