Merge tag 'samsung-dt64-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Samsung DeviceTree ARM64 update for v4.11, second round:
1. Use proper drive strengths on Exynos7.
2. Fix significant current leak on Exynos5433-based TM2/TM2E due
   to disabled regulator.
3. Add touchkey to TM2, set display clocks for Ultra HD modes.
4. Cleanups and minor fixes for Exynos5433, TM2 and TM2E.

* tag 'samsung-dt64-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  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

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
index d49879bd34bb126d7517d38bcffe58c49d984ebb..50403700274bd6ff7bd48c466b6b1367ea7631e4 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
@@ -135,14 +135,14 @@
                samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3",
                                "gpz0-4", "gpz0-5", "gpz0-6";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
        };
 
        pcm0_bus: pcm0-bus {
                samsung,pins = "gpz1-0", "gpz1-1", "gpz1-2", "gpz1-3";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
        };
 
@@ -569,7 +569,7 @@
                samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",
                                "gpd4-3", "gpd4-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
        };
 
@@ -577,14 +577,14 @@
                samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2",
                                "gpd4-3", "gpd4-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
        };
 
        spdif_bus: spdif-bus {
                samsung,pins = "gpd4-3", "gpd4-4";
                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
                samsung,pin-drv = <EXYNOS5433_PIN_DRV_FAST_SR1>;
        };
 

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index a5c866901e9322903023bb636c742ef29e5d6573..53fd0683d4001b7d9dedbbc2c87cb7cca68f84ae 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -217,6 +217,18 @@
        assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>;
 };
 
+&cmu_disp {
+       assigned-clocks = <&cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A>,
+                         <&cmu_mif CLK_DIV_SCLK_DECON_TV_ECLK>,
+                         <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>,
+                         <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK>;
+       assigned-clock-parents = <&cmu_mif CLK_MOUT_BUS_PLL_DIV2>,
+                                <0>,
+                                <&cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP>,
+                                <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>;
+       assigned-clock-rates = <0>, <400000000>;
+};
+
 &cmu_fsys {
        assigned-clocks = <&cmu_top CLK_MOUT_SCLK_USBDRD30>,
                <&cmu_top CLK_MOUT_SCLK_USBHOST30>,
@@ -420,6 +432,10 @@
                                regulator-name = "VDD18_MIPI2L_1.8V_AP";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo8_reg: LDO8 {

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index 2449266b268f323fa33c90725e8f7842fa71c931..ddba2f889326b10171877b632fc4e654f29b87eb 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -18,6 +18,19 @@
        compatible = "samsung,tm2", "samsung,exynos5433";
 };
 
+&hsi2c_9 {
+       status = "okay";
+
+       touchkey@20 {
+               compatible = "cypress,tm2-touchkey";
+               reg = <0x20>;
+               interrupt-parent = <&gpa3>;
+               interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
+               vcc-supply = <&ldo32_reg>;
+               vdd-supply = <&ldo33_reg>;
+       };
+};
+
 &ldo31_reg {
        regulator-name = "TSP_VDD_1.85V_AP";
        regulator-min-microvolt = <1850000>;

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index f120d99fd595362309486b68c4f98d858a9dbb67..7b02fd6e33e19d30a0ff97a649f6b810f3a7155e 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -706,7 +706,7 @@
                        interrupts = <GIC_PPI 9 0xf04>;
                };
 
-               mipi_phy: video-phy@105c0710 {
+               mipi_phy: video-phy {
                        compatible = "samsung,exynos5433-mipi-video-phy";
                        #phy-cells = <1>;
                        samsung,pmu-syscon = <&pmu_system_controller>;
@@ -1357,7 +1357,7 @@
                        status = "disabled";
                };
 
-               usbdrd30: usb@15400000  {
+               usbdrd30: usbdrd {
                        compatible = "samsung,exynos5250-dwusb3";
                        clocks = <&cmu_fsys CLK_ACLK_USBDRD30>,
                                <&cmu_fsys CLK_SCLK_USBDRD30>;
@@ -1404,7 +1404,7 @@
                        status = "disabled";
                };
 
-               usbhost30: usb@15a00000 {
+               usbhost30: usbhost {
                        compatible = "samsung,exynos5250-dwusb3";
                        clocks = <&cmu_fsys CLK_ACLK_USBHOST30>,
                                <&cmu_fsys CLK_SCLK_USBHOST30>;
@@ -1494,6 +1494,8 @@
                audio-subsystem@11400000 {
                        compatible = "samsung,exynos5433-lpass";
                        reg = <0x11400000 0x100>, <0x11500000 0x08>;
+                       clocks = <&cmu_aud CLK_PCLK_SFR0_CTRL>;
+                       clock-names = "sfr0_ctrl";
                        samsung,pmu-syscon = <&pmu_system_controller>;
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
index 82321984e1fb4d7decf86334cf0e6b878936f667..7ebb93927f136a4a72ff625d8bf9dee7b16f4964 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
@@ -497,49 +497,49 @@
                samsung,pins = "gpr0-0";
                samsung,pin-function = <2>;
                samsung,pin-pud = <0>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_cmd: sd0-cmd {
                samsung,pins = "gpr0-1";
                samsung,pin-function = <2>;
                samsung,pin-pud = <3>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_ds: sd0-ds {
                samsung,pins = "gpr0-2";
                samsung,pin-function = <2>;
                samsung,pin-pud = <1>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_qrdy: sd0-qrdy {
                samsung,pins = "gpr0-3";
                samsung,pin-function = <2>;
                samsung,pin-pud = <1>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_bus1: sd0-bus-width1 {
                samsung,pins = "gpr1-0";
                samsung,pin-function = <2>;
                samsung,pin-pud = <3>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_bus4: sd0-bus-width4 {
                samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";
                samsung,pin-function = <2>;
                samsung,pin-pud = <3>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd0_bus8: sd0-bus-width8 {
                samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";
                samsung,pin-function = <2>;
                samsung,pin-pud = <3>;
-               samsung,pin-drv = <3>;
+               samsung,pin-drv = <4>;
        };
 
        sd1_clk: sd1-clk {