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

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

Merge tag 'samsung-dt64-4.11-3' of... 

Merge tag 'samsung-dt64-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/late

Pull "Samsung DeviceTree ARM64 update for v4.11, third round" from Krzysztof Kozłowski:

1. Add necessary initial configuration for clocks of display subsystem.
   Till now it worked mostly thanks to bootloader.
2. Use macro definitions instead of hard-coded values for pinctrl on Exynos7.
3. Enable USB 3.0 (DWC3) on Exynos7.

* tag 'samsung-dt64-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (27 commits)
  arm64: dts: exynos: Add regulators for Vbus and Vbus-Boost
  arm64: dts: exynos: Add USB 3.0 controller node for Exynos7
  arm64: dts: exynos: Use macros for pinctrl configuration on Exynos7
  pinctrl: dt-bindings: samsung: Add Exynos7 specific pinctrl macro definitions
  arm64: dts: exynos: Add initial configuration for DISP clocks for TM2/TM2e
  clk: samsung: exynos5433: Add data for 250MHz and 278MHz PLL rates
  clk: samsung: exynos5433: Add IDs for PHYCLK_MIPIDPHY0_* clocks
  arm64: dts: exynos: Add clocks to Exynos5433 LPASS module
  arm64: dts: exynos: set LDO7 regulator as always on
  arm64: dts: exynos: configure TV path clocks for Ultra HD modes
  arm64: dts: exynos: Fix drive strength of sd0_xxx pin definitions
  arm64: dts: exynos: Disable pull down for audio pins in Exynos5433 SoCs
  arm64: dts: exynos: Add TM2 touchkey node
  arm64: dts: exynos: Remove unneeded unit names in Exynos5433 nodes
  arm64: dts: exynos: Enable HDMI/TV path on Exynos5433-TM2
  arm64: dts: exynos: Add HDMI node to Exynos5433
  arm64: dts: exynos: Add DECON_TV node to Exynos5433
  arm64: dts: exynos: Fix addresses in node names on Exynos5433
  arm64: dts: exynos: Make TM2 and TM2E independent from each other
  arm64: dts: exynos: Fix wrong values for ldo23 and ldo25 on TM2/TM2E
  ...
parents a121103c 6629490a

arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi

0 → 100644
+197 −0
Original line number Original line Diff line number Diff line 
/*

 * Samsung's Exynos5433 SoC Memory interface and AMBA bus device tree source

 *

 * Copyright (c) 2016 Samsung Electronics Co., Ltd.

 * Chanwoo Choi <cw00.choi@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



&soc {

	bus_g2d_400: bus0 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_G2D_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_g2d_400_opp_table>;

		status = "disabled";

	};



	bus_g2d_266: bus1 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_G2D_266>;

		clock-names = "bus";

		operating-points-v2 = <&bus_g2d_266_opp_table>;

		status = "disabled";

	};



	bus_gscl: bus2 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_GSCL_333>;

		clock-names = "bus";

		operating-points-v2 = <&bus_gscl_opp_table>;

		status = "disabled";

	};



	bus_hevc: bus3 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_HEVC_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_hevc_opp_table>;

		status = "disabled";

	};



	bus_jpeg: bus4 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_SCLK_JPEG_MSCL>;

		clock-names = "bus";

		operating-points-v2 = <&bus_g2d_400_opp_table>;

		status = "disabled";

	};



	bus_mfc: bus5 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_MFC_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_g2d_400_opp_table>;

		status = "disabled";

	};



	bus_mscl: bus6 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_MSCL_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_g2d_400_opp_table>;

		status = "disabled";

	};



	bus_noc0: bus7 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_BUS0_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_hevc_opp_table>;

		status = "disabled";

	};



	bus_noc1: bus8 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_top CLK_ACLK_BUS1_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_hevc_opp_table>;

		status = "disabled";

	};



	bus_noc2: bus9 {

		compatible = "samsung,exynos-bus";

		clocks = <&cmu_mif CLK_ACLK_BUS2_400>;

		clock-names = "bus";

		operating-points-v2 = <&bus_noc2_opp_table>;

		status = "disabled";

	};



	bus_g2d_400_opp_table: opp_table2 {

		compatible = "operating-points-v2";

		opp-shared;



		opp@400000000 {

			opp-hz = /bits/ 64 <400000000>;

			opp-microvolt = <1075000>;

		};

		opp@267000000 {

			opp-hz = /bits/ 64 <267000000>;

			opp-microvolt = <1000000>;

		};

		opp@200000000 {

			opp-hz = /bits/ 64 <200000000>;

			opp-microvolt = <975000>;

		};

		opp@160000000 {

			opp-hz = /bits/ 64 <160000000>;

			opp-microvolt = <962500>;

		};

		opp@134000000 {

			opp-hz = /bits/ 64 <134000000>;

			opp-microvolt = <950000>;

		};

		opp@100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <937500>;

		};

	};



	bus_g2d_266_opp_table: opp_table3 {

		compatible = "operating-points-v2";



		opp@267000000 {

			opp-hz = /bits/ 64 <267000000>;

		};

		opp@200000000 {

			opp-hz = /bits/ 64 <200000000>;

		};

		opp@160000000 {

			opp-hz = /bits/ 64 <160000000>;

		};

		opp@134000000 {

			opp-hz = /bits/ 64 <134000000>;

		};

		opp@100000000 {

			opp-hz = /bits/ 64 <100000000>;

		};

	};



	bus_gscl_opp_table: opp_table4 {

		compatible = "operating-points-v2";



		opp@333000000 {

			opp-hz = /bits/ 64 <333000000>;

		};

		opp@222000000 {

			opp-hz = /bits/ 64 <222000000>;

		};

		opp@166500000 {

			opp-hz = /bits/ 64 <166500000>;

		};

	};



	bus_hevc_opp_table: opp_table5 {

		compatible = "operating-points-v2";

		opp-shared;



		opp@400000000 {

			opp-hz = /bits/ 64 <400000000>;

		};

		opp@267000000 {

			opp-hz = /bits/ 64 <267000000>;

		};

		opp@200000000 {

			opp-hz = /bits/ 64 <200000000>;

		};

		opp@160000000 {

			opp-hz = /bits/ 64 <160000000>;

		};

		opp@134000000 {

			opp-hz = /bits/ 64 <134000000>;

		};

		opp@100000000 {

			opp-hz = /bits/ 64 <100000000>;

		};

	};



	bus_noc2_opp_table: opp_table6 {

		compatible = "operating-points-v2";



		opp@400000000 {

			opp-hz = /bits/ 64 <400000000>;

		};

		opp@200000000 {

			opp-hz = /bits/ 64 <200000000>;

		};

		opp@134000000 {

			opp-hz = /bits/ 64 <134000000>;

		};

		opp@100000000 {

			opp-hz = /bits/ 64 <100000000>;

		};

	};

};

arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi

+181 −192
Original line number Original line Diff line number Diff line
@@ -12,25 +12,14 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#define PIN_PULL_NONE		0

#include <dt-bindings/pinctrl/samsung.h>

#define PIN_PULL_DOWN		1

#define PIN_PULL_UP		3



#define PIN_DRV_LV1		0

#define PIN_DRV_LV2		2

#define PIN_DRV_LV3		1

#define PIN_DRV_LV4		3



#define PIN_IN			0

#define PIN_OUT			1

#define PIN_FUNC1		2





#define PIN(_func, _pin, _pull, _drv)					\

#define PIN(_func, _pin, _pull, _drv)					\

	_pin {								\

	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pins = #_pin;					\

		samsung,pin-function = <PIN_ ##_func>;	\

		samsung,pin-function = <EXYNOS_PIN_FUNC_ ##_func>;	\

		samsung,pin-pud = <PIN_PULL_ ##_pull>;	\

		samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>;		\

		samsung,pin-drv = <PIN_DRV_ ##_drv>;	\

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_ ##_drv>;		\

	}

	}





&pinctrl_alive {

&pinctrl_alive {
@@ -145,23 +134,23 @@ 
	i2s0_bus: i2s0-bus {

	i2s0_bus: i2s0-bus {

		samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3",

		samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3",

				"gpz0-4", "gpz0-5", "gpz0-6";

				"gpz0-4", "gpz0-5", "gpz0-6";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pcm0_bus: pcm0-bus {

	pcm0_bus: pcm0-bus {

		samsung,pins = "gpz1-0", "gpz1-1", "gpz1-2", "gpz1-3";

		samsung,pins = "gpz1-0", "gpz1-1", "gpz1-2", "gpz1-3";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	uart_aud_bus: uart-aud-bus {

	uart_aud_bus: uart-aud-bus {

		samsung,pins = "gpz1-3", "gpz1-2", "gpz1-1", "gpz1-0";

		samsung,pins = "gpz1-3", "gpz1-2", "gpz1-1", "gpz1-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};

};

};
@@ -196,16 +185,16 @@ 




	spi2_bus: spi2-bus {

	spi2_bus: spi2-bus {

		samsung,pins = "gpd5-0", "gpd5-2", "gpd5-3";

		samsung,pins = "gpd5-0", "gpd5-2", "gpd5-3";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c6_bus: hs-i2c6-bus {

	hs_i2c6_bus: hs-i2c6-bus {

		samsung,pins = "gpd5-3", "gpd5-2";

		samsung,pins = "gpd5-3", "gpd5-2";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};

};

};
@@ -260,141 +249,141 @@ 




	sd0_clk: sd0-clk {

	sd0_clk: sd0-clk {

		samsung,pins = "gpr0-0";

		samsung,pins = "gpr0-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_cmd: sd0-cmd {

	sd0_cmd: sd0-cmd {

		samsung,pins = "gpr0-1";

		samsung,pins = "gpr0-1";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_rdqs: sd0-rdqs {

	sd0_rdqs: sd0-rdqs {

		samsung,pins = "gpr0-2";

		samsung,pins = "gpr0-2";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_qrdy: sd0-qrdy {

	sd0_qrdy: sd0-qrdy {

		samsung,pins = "gpr0-3";

		samsung,pins = "gpr0-3";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_bus1: sd0-bus-width1 {

	sd0_bus1: sd0-bus-width1 {

		samsung,pins = "gpr1-0";

		samsung,pins = "gpr1-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_bus4: sd0-bus-width4 {

	sd0_bus4: sd0-bus-width4 {

		samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";

		samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd0_bus8: sd0-bus-width8 {

	sd0_bus8: sd0-bus-width8 {

		samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";

		samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd1_clk: sd1-clk {

	sd1_clk: sd1-clk {

		samsung,pins = "gpr2-0";

		samsung,pins = "gpr2-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd1_cmd: sd1-cmd {

	sd1_cmd: sd1-cmd {

		samsung,pins = "gpr2-1";

		samsung,pins = "gpr2-1";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd1_bus1: sd1-bus-width1 {

	sd1_bus1: sd1-bus-width1 {

		samsung,pins = "gpr3-0";

		samsung,pins = "gpr3-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd1_bus4: sd1-bus-width4 {

	sd1_bus4: sd1-bus-width4 {

		samsung,pins = "gpr3-1", "gpr3-2", "gpr3-3";

		samsung,pins = "gpr3-1", "gpr3-2", "gpr3-3";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd1_bus8: sd1-bus-width8 {

	sd1_bus8: sd1-bus-width8 {

		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";

		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	pcie_bus: pcie_bus {

	pcie_bus: pcie_bus {

		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";

		samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

	};

	};





	sd2_clk: sd2-clk {

	sd2_clk: sd2-clk {

		samsung,pins = "gpr4-0";

		samsung,pins = "gpr4-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd2_cmd: sd2-cmd {

	sd2_cmd: sd2-cmd {

		samsung,pins = "gpr4-1";

		samsung,pins = "gpr4-1";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd2_cd: sd2-cd {

	sd2_cd: sd2-cd {

		samsung,pins = "gpr4-2";

		samsung,pins = "gpr4-2";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd2_bus1: sd2-bus-width1 {

	sd2_bus1: sd2-bus-width1 {

		samsung,pins = "gpr4-3";

		samsung,pins = "gpr4-3";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd2_bus4: sd2-bus-width4 {

	sd2_bus4: sd2-bus-width4 {

		samsung,pins = "gpr4-4", "gpr4-5", "gpr4-6";

		samsung,pins = "gpr4-4", "gpr4-5", "gpr4-6";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <3>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR4>;

	};

	};





	sd2_clk_output: sd2-clk-output {

	sd2_clk_output: sd2-clk-output {

		samsung,pins = "gpr4-0";

		samsung,pins = "gpr4-0";

		samsung,pin-function = <1>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <2>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR3>;

	};

	};





	sd2_cmd_output: sd2-cmd-output {

	sd2_cmd_output: sd2-cmd-output {

		samsung,pins = "gpr4-1";

		samsung,pins = "gpr4-1";

		samsung,pin-function = <1>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <2>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR3>;

	};

	};

};

};
@@ -419,9 +408,9 @@ 




	hs_i2c4_bus: hs-i2c4-bus {

	hs_i2c4_bus: hs-i2c4-bus {

		samsung,pins = "gpj0-1", "gpj0-0";

		samsung,pins = "gpj0-1", "gpj0-0";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};

};

};
@@ -564,225 +553,225 @@ 




	hs_i2c8_bus: hs-i2c8-bus {

	hs_i2c8_bus: hs-i2c8-bus {

		samsung,pins = "gpb0-1", "gpb0-0";

		samsung,pins = "gpb0-1", "gpb0-0";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c9_bus: hs-i2c9-bus {

	hs_i2c9_bus: hs-i2c9-bus {

		samsung,pins = "gpb0-3", "gpb0-2";

		samsung,pins = "gpb0-3", "gpb0-2";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	i2s1_bus: i2s1-bus {

	i2s1_bus: i2s1-bus {

		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",

		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",

				"gpd4-3", "gpd4-4";

				"gpd4-3", "gpd4-4";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pcm1_bus: pcm1-bus {

	pcm1_bus: pcm1-bus {

		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",

		samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",

				"gpd4-3", "gpd4-4";

				"gpd4-3", "gpd4-4";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	spdif_bus: spdif-bus {

	spdif_bus: spdif-bus {

		samsung,pins = "gpd4-3", "gpd4-4";

		samsung,pins = "gpd4-3", "gpd4-4";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <1>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_spi_pin0: fimc-is-spi-pin0 {

	fimc_is_spi_pin0: fimc-is-spi-pin0 {

		samsung,pins = "gpc3-3", "gpc3-2", "gpc3-1", "gpc3-0";

		samsung,pins = "gpc3-3", "gpc3-2", "gpc3-1", "gpc3-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_spi_pin1: fimc-is-spi-pin1 {

	fimc_is_spi_pin1: fimc-is-spi-pin1 {

		samsung,pins = "gpc3-7", "gpc3-6", "gpc3-5", "gpc3-4";

		samsung,pins = "gpc3-7", "gpc3-6", "gpc3-5", "gpc3-4";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	uart0_bus: uart0-bus {

	uart0_bus: uart0-bus {

		samsung,pins = "gpd0-3", "gpd0-2", "gpd0-1", "gpd0-0";

		samsung,pins = "gpd0-3", "gpd0-2", "gpd0-1", "gpd0-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};

	};





	hs_i2c2_bus: hs-i2c2-bus {

	hs_i2c2_bus: hs-i2c2-bus {

		samsung,pins = "gpd0-3", "gpd0-2";

		samsung,pins = "gpd0-3", "gpd0-2";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	uart2_bus: uart2-bus {

	uart2_bus: uart2-bus {

		samsung,pins = "gpd1-5", "gpd1-4";

		samsung,pins = "gpd1-5", "gpd1-4";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};

	};





	uart1_bus: uart1-bus {

	uart1_bus: uart1-bus {

		samsung,pins = "gpd1-3", "gpd1-2", "gpd1-1", "gpd1-0";

		samsung,pins = "gpd1-3", "gpd1-2", "gpd1-1", "gpd1-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};

	};





	hs_i2c3_bus: hs-i2c3-bus {

	hs_i2c3_bus: hs-i2c3-bus {

		samsung,pins = "gpd1-3", "gpd1-2";

		samsung,pins = "gpd1-3", "gpd1-2";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c0_bus: hs-i2c0-bus {

	hs_i2c0_bus: hs-i2c0-bus {

		samsung,pins = "gpd2-1", "gpd2-0";

		samsung,pins = "gpd2-1", "gpd2-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c1_bus: hs-i2c1-bus {

	hs_i2c1_bus: hs-i2c1-bus {

		samsung,pins = "gpd2-3", "gpd2-2";

		samsung,pins = "gpd2-3", "gpd2-2";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pwm0_out: pwm0-out {

	pwm0_out: pwm0-out {

		samsung,pins = "gpd2-4";

		samsung,pins = "gpd2-4";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pwm1_out: pwm1-out {

	pwm1_out: pwm1-out {

		samsung,pins = "gpd2-5";

		samsung,pins = "gpd2-5";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pwm2_out: pwm2-out {

	pwm2_out: pwm2-out {

		samsung,pins = "gpd2-6";

		samsung,pins = "gpd2-6";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	pwm3_out: pwm3-out {

	pwm3_out: pwm3-out {

		samsung,pins = "gpd2-7";

		samsung,pins = "gpd2-7";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	spi1_bus: spi1-bus {

	spi1_bus: spi1-bus {

		samsung,pins = "gpd6-2", "gpd6-4", "gpd6-5";

		samsung,pins = "gpd6-2", "gpd6-4", "gpd6-5";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c7_bus: hs-i2c7-bus {

	hs_i2c7_bus: hs-i2c7-bus {

		samsung,pins = "gpd2-7", "gpd2-6";

		samsung,pins = "gpd2-7", "gpd2-6";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	spi0_bus: spi0-bus {

	spi0_bus: spi0-bus {

		samsung,pins = "gpd8-0", "gpd6-0", "gpd6-1";

		samsung,pins = "gpd8-0", "gpd6-0", "gpd6-1";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c10_bus: hs-i2c10-bus {

	hs_i2c10_bus: hs-i2c10-bus {

		samsung,pins = "gpg3-1", "gpg3-0";

		samsung,pins = "gpg3-1", "gpg3-0";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	hs_i2c11_bus: hs-i2c11-bus {

	hs_i2c11_bus: hs-i2c11-bus {

		samsung,pins = "gpg3-3", "gpg3-2";

		samsung,pins = "gpg3-3", "gpg3-2";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	spi3_bus: spi3-bus {

	spi3_bus: spi3-bus {

		samsung,pins = "gpg3-4", "gpg3-6", "gpg3-7";

		samsung,pins = "gpg3-4", "gpg3-6", "gpg3-7";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	spi4_bus: spi4-bus {

	spi4_bus: spi4-bus {

		samsung,pins = "gpv7-1", "gpv7-3", "gpv7-4";

		samsung,pins = "gpv7-1", "gpv7-3", "gpv7-4";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_uart: fimc-is-uart {

	fimc_is_uart: fimc-is-uart {

		samsung,pins = "gpc1-1", "gpc0-7";

		samsung,pins = "gpc1-1", "gpc0-7";

		samsung,pin-function = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch0_i2c: fimc-is-ch0_i2c {

	fimc_is_ch0_i2c: fimc-is-ch0_i2c {

		samsung,pins = "gpc2-1", "gpc2-0";

		samsung,pins = "gpc2-1", "gpc2-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch0_mclk: fimc-is-ch0_mclk {

	fimc_is_ch0_mclk: fimc-is-ch0_mclk {

		samsung,pins = "gpd7-0";

		samsung,pins = "gpd7-0";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch1_i2c: fimc-is-ch1-i2c {

	fimc_is_ch1_i2c: fimc-is-ch1-i2c {

		samsung,pins = "gpc2-3", "gpc2-2";

		samsung,pins = "gpc2-3", "gpc2-2";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch1_mclk: fimc-is-ch1-mclk {

	fimc_is_ch1_mclk: fimc-is-ch1-mclk {

		samsung,pins = "gpd7-1";

		samsung,pins = "gpd7-1";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch2_i2c: fimc-is-ch2-i2c {

	fimc_is_ch2_i2c: fimc-is-ch2-i2c {

		samsung,pins = "gpc2-5", "gpc2-4";

		samsung,pins = "gpc2-5", "gpc2-4";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};





	fimc_is_ch2_mclk: fimc-is-ch2-mclk {

	fimc_is_ch2_mclk: fimc-is-ch2-mclk {

		samsung,pins = "gpd7-2";

		samsung,pins = "gpd7-2";

		samsung,pin-function = <2>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <0>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};

};

};
@@ -797,8 +786,8 @@ 




	hs_i2c5_bus: hs-i2c5-bus {

	hs_i2c5_bus: hs-i2c5-bus {

		samsung,pins = "gpj1-1", "gpj1-0";

		samsung,pins = "gpj1-1", "gpj1-0";

		samsung,pin-function = <4>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <0>;

		samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;

	};

	};

};
 
};

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

0 → 100644
+1191 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/exynos/exynos5433-tm2.dts

+58 −1029

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts

+33 −9
Original line number Original line Diff line number Diff line
@@ -11,21 +11,45 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#include "exynos5433-tm2.dts"

#include "exynos5433-tm2-common.dtsi"





/ {

/ {

	model = "Samsung TM2E board";

	model = "Samsung TM2E board";

	compatible = "samsung,tm2e", "samsung,exynos5433";

	compatible = "samsung,tm2e", "samsung,exynos5433";

};

};





&ldo23_reg {

&cmu_disp {

	regulator-name = "CAM_SEN_CORE_1.025V_AP";

	/*

	regulator-max-microvolt = <1050000>;

	 * TM2 and TM2e differ only by DISP_PLL rate, but define all assigned

};

	 * clocks properties for DISP CMU for each board to keep them together



	 * for easier review and maintenance.

&ldo25_reg {

	 */

	regulator-name = "UNUSED_LDO25";

	assigned-clocks = <&cmu_disp CLK_FOUT_DISP_PLL>,

	regulator-always-off;

			  <&cmu_mif CLK_DIV_SCLK_DECON_TV_ECLK>,

			  <&cmu_disp CLK_MOUT_ACLK_DISP_333_USER>,

			  <&cmu_disp CLK_MOUT_SCLK_DSIM0_USER>,

			  <&cmu_disp CLK_MOUT_SCLK_DSIM0>,

			  <&cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER>,

			  <&cmu_disp CLK_MOUT_SCLK_DECON_ECLK>,

			  <&cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_RXCLKESC0_USER>,

			  <&cmu_disp CLK_MOUT_PHYCLK_MIPIDPHY0_BITCLKDIV8_USER>,

			  <&cmu_disp CLK_MOUT_DISP_PLL>,

			  <&cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A>,

			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>,

			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK>;

	assigned-clock-parents = <0>, <0>,

				 <&cmu_mif CLK_ACLK_DISP_333>,

				 <&cmu_mif CLK_SCLK_DSIM0_DISP>,

				 <&cmu_disp CLK_MOUT_SCLK_DSIM0_USER>,

				 <&cmu_mif CLK_SCLK_DECON_ECLK_DISP>,

				 <&cmu_disp CLK_MOUT_SCLK_DECON_ECLK_USER>,

				 <&cmu_disp CLK_PHYCLK_MIPIDPHY0_RXCLKESC0_PHY>,

				 <&cmu_disp CLK_PHYCLK_MIPIDPHY0_BITCLKDIV8_PHY>,

				 <&cmu_disp CLK_FOUT_DISP_PLL>,

				 <&cmu_mif CLK_MOUT_BUS_PLL_DIV2>,

				 <&cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP>,

				 <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>;

	assigned-clock-rates = <278000000>, <400000000>;

};

};





&ldo31_reg {

&ldo31_reg {