Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit effd7862 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Samsung DeviceTree update for v4.8:
1. Add missing async bridge for MFC power domain on Exynos5420.
   This fixes imprecise abort on s5p-mfc re-bind.
2. Define regulator supplies for MMC nodes on Exynos4412 Odroid boards
   and for TMU on Exynos542x Peach boards.
3. Thermal cleanups on Odroid XU3-family (Exynos5422).
4. Enable AX88760 USB hub on Origen board (Exynos4412).
5. Minor cleanups.

* tag 'samsung-dt-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: No need to enable TMU nodes on Odroid XU3 family
  ARM: dts: exynos: Add TMU nodes regulator supply for Peach boards
  ARM: dts: exynos: Use new compatible string for thermistors in Trats2
  ARM: dts: exynos: Remove unneded always-on for regulators on Peach boards
  ARM: dts: exynos: Enable AX88760 USB hub on Origen board
  ARM: dts: exynos: Only Odroid XU3-family boards use DTSI with CPU thermal nodes
  ARM: dts: exynos: Lower SD card interface voltage to 2.8 V on Odroid X/X2/U3
  ARM: dts: exynos: Define vqmmc for eMMC card on Odroid X/X2/U3
  ARM: dts: exynos: Define vqmmc for SD card and allow disabling regulators on Odroid X/X2/U3
  ARM: dts: exynos: Add async-bridge clock to MFC power domain for Exynos5420

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5edb5649 cb0df000

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+19 −9
Original line number Original line Diff line number Diff line
@@ -297,7 +297,6 @@ 
				regulator-name = "VDDQ_MMC2_2.8V";

				regulator-name = "VDDQ_MMC2_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-boot-on;

			};

			};
@@ -390,10 +389,18 @@ 
			};

			};





			ldo21_reg: LDO21 {

			ldo21_reg: LDO21 {

				regulator-name = "LDO21_3.3V";

				regulator-name = "TFLASH_2.8V";

				regulator-min-microvolt = <3300000>;

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3300000>;

				regulator-max-microvolt = <2800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			ldo22_reg: LDO22 {

				/*

				 * Only U3 uses it, so let it define the

				 * constraints

				 */

				regulator-name = "LDO22";

				regulator-boot-on;

				regulator-boot-on;

			};

			};
@@ -460,9 +467,11 @@ 
			};

			};





			buck8_reg: BUCK8 {

			buck8_reg: BUCK8 {

				/*

				 * Constraints set by specific board: X,

				 * X2 and U3.

				 */

				regulator-name = "BUCK8_2.8V";

				regulator-name = "BUCK8_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

			};

			};

		};

		};

	};

	};
@@ -506,7 +515,7 @@ 
&mshc_0 {

&mshc_0 {

	pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

	pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	vmmc-supply = <&ldo20_reg &buck8_reg>;

	vmmc-supply = <&ldo20_reg>;

	mmc-pwrseq = <&emmc_pwrseq>;

	mmc-pwrseq = <&emmc_pwrseq>;

	status = "okay";

	status = "okay";
@@ -530,7 +539,8 @@ 
	bus-width = <4>;

	bus-width = <4>;

	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;

	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	vmmc-supply = <&ldo4_reg &ldo21_reg>;

	vmmc-supply = <&ldo21_reg>;

	vqmmc-supply = <&ldo4_reg>;

	cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-inverted;

	status = "okay";

	status = "okay";

arch/arm/boot/dts/exynos4412-odroidu3.dts

+18 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,24 @@ 
	};

	};

};

};





/* Supply for LAN9730/SMSC95xx */

&buck8_reg {

	regulator-name = "BUCK8_P3V3";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

};



/* VDDQ for MSHC (eMMC card) */

&ldo22_reg {

	regulator-name = "LDO22_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&mshc_0 {

	vqmmc-supply = <&ldo22_reg>;

};



&pwm {

&pwm {

	pinctrl-0 = <&pwm0_out>;

	pinctrl-0 = <&pwm0_out>;

	pinctrl-names = "default";

	pinctrl-names = "default";

arch/arm/boot/dts/exynos4412-odroidx.dts

+11 −0
Original line number Original line Diff line number Diff line
@@ -63,12 +63,23 @@ 
	};

	};

};

};





/* VDDQ for MSHC (eMMC card) */

&buck8_reg {

	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&ehci {

&ehci {

	port@1 {

	port@1 {

		status = "okay";

		status = "okay";

	};

	};

};

};





&mshc_0 {

	vqmmc-supply = <&buck8_reg>;

};



&pinctrl_1 {

&pinctrl_1 {

	gpio_home_key: home_key {

	gpio_home_key: home_key {

		samsung,pins = "gpx2-2";

		samsung,pins = "gpx2-2";

arch/arm/boot/dts/exynos4412-odroidx2.dts

+11 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,17 @@ 
	};

	};

};

};





/* VDDQ for MSHC (eMMC card) */

&buck8_reg {

	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&mshc_0 {

	vqmmc-supply = <&buck8_reg>;

};



&sound {

&sound {

	simple-audio-card,name = "Odroid-X2";

	simple-audio-card,name = "Odroid-X2";

	simple-audio-card,widgets =

	simple-audio-card,widgets =

arch/arm/boot/dts/exynos4412-origen.dts

+16 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,22 @@ 
	cpu0-supply = <&buck2_reg>;

	cpu0-supply = <&buck2_reg>;

};

};





&exynos_usbphy {

	status = "okay";

};



&ehci {

	samsung,vbus-gpio = <&gpx3 5 1>;

	status = "okay";



	port@1{

		status = "okay";

	};

	port@2 {

		status = "okay";

	};

};



&fimd {

&fimd {

	pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>;

	pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>;

	pinctrl-names = "default";

	pinctrl-names = "default";