Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/dts/uniphier-ld11-global.dts | 3 ++- arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-ld20-global.dts | 3 ++- arch/arm/dts/uniphier-ld20.dtsi | 4 +++- arch/arm/dts/uniphier-ld4.dtsi | 3 +-- arch/arm/dts/uniphier-pinctrl.dtsi | 5 ----- arch/arm/dts/uniphier-pro4.dtsi | 3 +-- arch/arm/dts/uniphier-pxs2.dtsi | 3 +++ arch/arm/dts/uniphier-pxs3.dtsi | 2 +- arch/arm/dts/uniphier-sld8.dtsi | 3 +-- 10 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts index 11be2aa..744b36e 100644 --- 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 3f9237c..d63b56e 100644 --- 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 fe6608e..1a5e7c2 100644 --- 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 6ffbf18..35867ab 100644 --- 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 4545056..e3d3138 100644 --- 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 9dd9d49..2dc86d2 100644 --- 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 8185b54..3cd9b72 100644 --- 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 f4101c0..48782a5 100644 --- 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 cfeeecd..c6ec63c 100644 --- 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 f20926e..35c2f85 100644 --- 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>;