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

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

Merge tag 'samsung-dt' of... 

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

Merge "Samsung DT updates for v4.1" from Kukjin Kim:

- for exynos3250
  : add assigned clock parents for CMU nodes

- for exynos4412-odroid
  : add eMMC reset line

- for exynos5250
  : fixed typo for interrupt-cells

- for exynos5250-snow
  : define stdout-path property
  : represent bridge and panel connection
  : enable wifi power-on and add cap-sdio-irq to wifi mmc node

- for exynos5250-spring
  : define stdout-path property

- for exynos5420
  : fixed typo for interrupt-cells
  : add async-bridge clocks for gsc and disp1 PDs

- for exynos5420 boards
  : Mux XMMCnDATA[0] pad correctly

- for exynos5420-odroidxu3
  : add eMMC reset line

- for Peach boards
  : add HS400 support and define stdout-path property
  : add mclk entry and add WiFi module support
  : represent bridge and panel connection

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

:
  ARM: dts: Fixed typo interrupt-cells for exynos5420 and exynos5250
  ARM: dts: Add HS400 support for exynos5420 and exynos5800
  ARM: dts: add async-bridge clocks to gsc power domain for exynos5420
  ARM: dts: add async-bridge clocks to disp1 power domain for exynos5420
  dt-bindings: add asynchronous bridge clock for exynos
  ARM: dts: Define stdout-path property for exynos5250-spring
  ARM: dts: Define stdout-path property for exynos5250-snow
  ARM: dts: Define stdout-path property for Peach boards
  ARM: dts: Add assigned clock parents to CMU node for exynos3250
  ARM: dts: Add mclk entry for Peach boards
  ARM: dts: Add WiFi module support for Peach boards
  ARM: dts: Mux XMMCnDATA[0] pad correctly for Exynos5420 boards
  ARM: dts: add eMMC reset line for exynos5422-odroidxu3
  ARM: dts: add eMMC reset line for exynos4412-odroid-common
  ARM: dts: represent bridge and panel connection for exynos5420-peach-pit
  ARM: dts: represent bridge and panel connection for exynos5250-snow
  ARM: dts: Add cap-sdio-irq to wifi mmc node for exynos5250-snow
  ARM: dts: Enable wifi power-on for exynos5250-snow

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4b3be93d f27b9075

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,9 @@ Optional Properties: 
	- pclkN, clkN: Pairs of parent of input clock and input clock to the

	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

		are supported currently.

	- asbN: Clocks required by asynchronous bridges (ASB) present in

		the power domain. These clock should be enabled during power

		domain on/off operations.

- power-domains: phandle pointing to the parent power domain, for more details

- power-domains: phandle pointing to the parent power domain, for more details

		 see Documentation/devicetree/bindings/power/power_domain.txt

		 see Documentation/devicetree/bindings/power/power_domain.txt

arch/arm/boot/dts/exynos3250.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,10 @@ 
			compatible = "samsung,exynos3250-cmu";

			compatible = "samsung,exynos3250-cmu";

			reg = <0x10030000 0x20000>;

			reg = <0x10030000 0x20000>;

			#clock-cells = <1>;

			#clock-cells = <1>;

			assigned-clocks = <&cmu CLK_MOUT_ACLK_400_MCUISP_SUB>,

					  <&cmu CLK_MOUT_ACLK_266_SUB>;

			assigned-clock-parents = <&cmu CLK_FIN_PLL>,

						 <&cmu CLK_FIN_PLL>;

		};

		};





		cmu_dmc: clock-controller@105C0000 {

		cmu_dmc: clock-controller@105C0000 {

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -75,10 +75,18 @@ 
		};

		};

	};

	};





	emmc_pwrseq: pwrseq {

		pinctrl-0 = <&sd1_cd>;

		pinctrl-names = "default";

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpk1 2 1>;

	};



	mmc@12550000 {

	mmc@12550000 {

		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 &buck8_reg>;

		mmc-pwrseq = <&emmc_pwrseq>;

		status = "okay";

		status = "okay";





		num-slots = <1>;

		num-slots = <1>;
@@ -472,6 +480,12 @@ 
	};

	};

};

};





/* RSTN signal for eMMC */

&sd1_cd {

	samsung,pin-pud = <0>;

	samsung,pin-drv = <0>;

};



&pinctrl_1 {

&pinctrl_1 {

	gpio_power_key: power_key {

	gpio_power_key: power_key {

		samsung,pins = "gpx1-3";

		samsung,pins = "gpx1-3";

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

+54 −3
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




	chosen {

	chosen {

		bootargs = "console=tty1";

		bootargs = "console=tty1";

		stdout-path = "serial3:115200n8";

	};

	};





	gpio-keys {

	gpio-keys {
@@ -183,7 +184,20 @@ 
			powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;

			powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;

			reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>;

			reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>;

			edid-emulation = <5>;

			edid-emulation = <5>;

			panel = <&panel>;



			ports {

				port@0 {

					bridge_out: endpoint {

						remote-endpoint = <&panel_in>;

					};

				};



				port@1 {

					bridge_in: endpoint {

						remote-endpoint = <&dp_out>;

					};

				};

			};

		};

		};

	};

	};
@@ -228,6 +242,20 @@ 
		compatible = "auo,b116xw03";

		compatible = "auo,b116xw03";

		power-supply = <&fet6>;

		power-supply = <&fet6>;

		backlight = <&backlight>;

		backlight = <&backlight>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&bridge_out>;

			};

		};

	};



	mmc3_pwrseq: mmc3_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpx0 2 GPIO_ACTIVE_LOW>, /* WIFI_RSTn */

			      <&gpx0 1 GPIO_ACTIVE_LOW>; /* WIFI_EN */

		clocks = <&max77686 MAX77686_CLK_PMIC>;

		clock-names = "ext_clock";

	};

	};

};

};
@@ -242,7 +270,14 @@ 
	samsung,link-rate = <0x0a>;

	samsung,link-rate = <0x0a>;

	samsung,lane-count = <2>;

	samsung,lane-count = <2>;

	samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;

	samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;

	bridge = <&ptn3460>;



	ports {

		port@0 {

			dp_out: endpoint {

				remote-endpoint = <&bridge_in>;

			};

		};

	};

};

};





&ehci {

&ehci {
@@ -531,17 +566,33 @@ 
	status = "okay";

	status = "okay";

	num-slots = <1>;

	num-slots = <1>;

	broken-cd;

	broken-cd;

	cap-sdio-irq;

	card-detect-delay = <200>;

	card-detect-delay = <200>;

	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-sdr-timing = <2 3>;

	samsung,dw-mshc-sdr-timing = <2 3>;

	samsung,dw-mshc-ddr-timing = <1 2>;

	samsung,dw-mshc-ddr-timing = <1 2>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;

	pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4 &wifi_en &wifi_rst>;

	bus-width = <4>;

	bus-width = <4>;

	cap-sd-highspeed;

	cap-sd-highspeed;

	mmc-pwrseq = <&mmc3_pwrseq>;

};

};





&pinctrl_0 {

&pinctrl_0 {

	wifi_en: wifi-en {

		samsung,pins = "gpx0-1";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	wifi_rst: wifi-rst {

		samsung,pins = "gpx0-2";

		samsung,pin-function = <1>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

	};



	power_key_irq: power-key-irq {

	power_key_irq: power-key-irq {

		samsung,pins = "gpx1-3";

		samsung,pins = "gpx1-3";

		samsung,pin-function = <0xf>;

		samsung,pin-function = <0xf>;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 




	chosen {

	chosen {

		bootargs = "console=tty1";

		bootargs = "console=tty1";

		stdout-path = "serial3:115200n8";

	};

	};





	gpio-keys {

	gpio-keys {