From 6f36ee0b48ca03f89de03464cacd0931de81649e Mon Sep 17 00:00:00 2001 From: Katsuhiro Suzuki Date: Tue, 20 Mar 2018 11:48:24 +0900 Subject: ARM: dts: uniphier: add syscon property for UniPhier sound system This patch adds syscon property for specifying soc-glue core into device-tree of PXs2 SoC. Currently, soc-glue core is used for changing the state of S/PDIF signal output pin to signal output state or Hi-Z state. Signed-off-by: Katsuhiro Suzuki Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-pxs2.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/boot') diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index 595045441c9c..debcbd15c24b 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -242,6 +242,7 @@ reset-names = "aio"; resets = <&sys_rst 40>; #sound-dai-cells = <1>; + socionext,syscon = <&soc_glue>; i2s_port0: port@0 { i2s_hdmi: endpoint { @@ -418,7 +419,7 @@ }; }; - soc-glue@5f800000 { + soc_glue: soc-glue@5f800000 { compatible = "socionext,uniphier-pxs2-soc-glue", "simple-mfd", "syscon"; reg = <0x5f800000 0x2000>; -- cgit v1.2.3 From 9ca6129d007681c54c27a4cf147982a2296fb8cf Mon Sep 17 00:00:00 2001 From: Kunihiko Hayashi Date: Tue, 27 Mar 2018 19:32:45 +0900 Subject: ARM: dts: uniphier: add pinctrl groups of ethernet for second instance Add pinctrl groups of ethernet, such as "ether1_rgmii" and "ether1_rmii". These are used for second ethernet instance. Signed-off-by: Kunihiko Hayashi Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-pinctrl.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'arch/arm/boot') diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi index 9847af85b542..51f0e69f49fd 100644 --- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi @@ -71,6 +71,16 @@ function = "ether_rmii"; }; + pinctrl_ether1_rgmii: ether1-rgmii { + groups = "ether1_rgmii"; + function = "ether1_rgmii"; + }; + + pinctrl_ether1_rmii: ether1-rmii { + groups = "ether1_rmii"; + function = "ether1_rmii"; + }; + pinctrl_i2c0: i2c0 { groups = "i2c0"; function = "i2c0"; -- cgit v1.2.3