ARM: dts: uniphier: sync DT with Linux 4.19-rc1

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts
index 11be2aa05ecd45b1d900769ae2d9331b0e13740c..744b36e28a33588ec9bc5686a400b8fec351c351 100644 (file)
--- a/arch/arm/dts/uniphier-ld11-global.dts
+++ b/arch/arm/dts/uniphier-ld11-global.dts
@@ -54,12 +54,13 @@
        sound {
                compatible = "audio-graph-card";
                label = "UniPhier LD11";
-               widgets = "Headphone", "Headphone Jack";
+               widgets = "Headphone", "Headphones";
                dais = <&i2s_port2
                        &i2s_port3
                        &i2s_port4
                        &spdif_port0
                        &comp_spdif_port0>;
+               hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
        };
 
        spdif-out {

diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index 3f9237cfa4e3cb0d3e34af7ff201b6ac1e966b9c..d63b56e944de9202d3fe349e85aa1f34c5e3bafb 100644 (file)
--- a/arch/arm/dts/uniphier-ld11.dtsi
+++ b/arch/arm/dts/uniphier-ld11.dtsi
@@ -407,7 +407,7 @@
                        reg = <0x5a000000 0x400>;
                        interrupts = <0 78 4>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_emmc_1v8>;
+                       pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
                        resets = <&sys_rst 4>;
                        bus-width = <8>;

diff --git a/arch/arm/dts/uniphier-ld20-global.dts b/arch/arm/dts/uniphier-ld20-global.dts
index fe6608ea327772e3ad0125c020f8d0102dda35bb..1a5e7c24b90160a4b05ea237705a17415adb630f 100644 (file)
--- a/arch/arm/dts/uniphier-ld20-global.dts
+++ b/arch/arm/dts/uniphier-ld20-global.dts
@@ -54,12 +54,13 @@
        sound {
                compatible = "audio-graph-card";
                label = "UniPhier LD20";
-               widgets = "Headphone", "Headphone Jack";
+               widgets = "Headphone", "Headphones";
                dais = <&i2s_port2
                        &i2s_port3
                        &i2s_port4
                        &spdif_port0
                        &comp_spdif_port0>;
+               hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
        };
 
        spdif-out {

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 6ffbf18a8c936092924fb3e190ede466f3a61d34..35867ab95322e8ca51d99e320ce2686ce5f3645a 100644 (file)
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -58,6 +58,7 @@
                        clocks = <&sys_clk 32>;
                        enable-method = "psci";
                        operating-points-v2 = <&cluster0_opp>;
+                       #cooling-cells = <2>;
                };
 
                cpu2: cpu@100 {
@@ -77,6 +78,7 @@
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
                        operating-points-v2 = <&cluster1_opp>;
+                       #cooling-cells = <2>;
                };
        };
 
@@ -512,7 +514,7 @@
                        reg = <0x5a000000 0x400>;
                        interrupts = <0 78 4>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_emmc_1v8>;
+                       pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
                        resets = <&sys_rst 4>;
                        bus-width = <8>;

diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi
index 4545056ba708ea00f11a6c3ec17dafe58b802b7c..e3d3138e6d9d427e6f73e88ecb62abfaf06412c5 100644 (file)
--- a/arch/arm/dts/uniphier-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ld4.dtsi
@@ -247,9 +247,8 @@
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
                        interrupts = <0 78 4>;
-                       pinctrl-names = "default", "1.8v";
+                       pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
-                       pinctrl-1 = <&pinctrl_emmc_1v8>;
                        clocks = <&mio_clk 1>;
                        reset-names = "host", "bridge";
                        resets = <&mio_rst 1>, <&mio_rst 4>;

diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
index 9dd9d49ad7f2d4fd038008cfedb51a5b740b9c3d..2dc86d272845813441a9f23f574e0b848ff9aced 100644 (file)
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -56,11 +56,6 @@
                function = "emmc";
        };
 
-       pinctrl_emmc_1v8: emmc-1v8 {
-               groups = "emmc", "emmc_dat8";
-               function = "emmc";
-       };
-
        pinctrl_ether_mii: ether-mii {
                groups = "ether_mii";
                function = "ether_mii";

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 8185b54e2854d2d73ae7c69908f3750a087eadc0..3cd9b729d0d29895d2902527cc849471dd6ae459 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -281,9 +281,8 @@
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
                        interrupts = <0 78 4>;
-                       pinctrl-names = "default", "1.8v";
+                       pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
-                       pinctrl-1 = <&pinctrl_emmc_1v8>;
                        clocks = <&mio_clk 1>;
                        reset-names = "host", "bridge";
                        resets = <&mio_rst 1>, <&mio_rst 4>;

diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi
index f4101c0aa0cb87f37c75d376978bc83dd6847aac..48782a567af81a51a4e3777c3f865cdb69816b20 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/dts/uniphier-pxs2.dtsi
@@ -36,6 +36,7 @@
                        enable-method = "psci";
                        next-level-cache = <&l2>;
                        operating-points-v2 = <&cpu_opp>;
+                       #cooling-cells = <2>;
                };
 
                cpu2: cpu@2 {
@@ -46,6 +47,7 @@
                        enable-method = "psci";
                        next-level-cache = <&l2>;
                        operating-points-v2 = <&cpu_opp>;
+                       #cooling-cells = <2>;
                };
 
                cpu3: cpu@3 {
@@ -56,6 +58,7 @@
                        enable-method = "psci";
                        next-level-cache = <&l2>;
                        operating-points-v2 = <&cpu_opp>;
+                       #cooling-cells = <2>;
                };
        };
 

diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index cfeeecdad0568d7d11880384ca6568fae8fa40e8..c6ec63c6973ebae72c0b7b86dec9ed2895c17a97 100644 (file)
--- a/arch/arm/dts/uniphier-pxs3.dtsi
+++ b/arch/arm/dts/uniphier-pxs3.dtsi
@@ -327,7 +327,7 @@
                        reg = <0x5a000000 0x400>;
                        interrupts = <0 78 4>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_emmc_1v8>;
+                       pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
                        resets = <&sys_rst 4>;
                        bus-width = <8>;

diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi
index f20926e4a995d8e2b224d7aa7154155349963513..35c2f856f05d69e2c30bd9303ff636870f5adb4f 100644 (file)
--- a/arch/arm/dts/uniphier-sld8.dtsi
+++ b/arch/arm/dts/uniphier-sld8.dtsi
@@ -251,9 +251,8 @@
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
                        interrupts = <0 78 4>;
-                       pinctrl-names = "default", "1.8v";
+                       pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
-                       pinctrl-1 = <&pinctrl_emmc_1v8>;
                        clocks = <&mio_clk 1>;
                        reset-names = "host", "bridge";
                        resets = <&mio_rst 1>, <&mio_rst 4>;