diff mbox series

arm64: dts: exynosautov9: convert serial_0 for USI

Message ID 20211208003946.139423-1-chanho61.park@samsung.com (mailing list archive)
State New
Headers show
Series arm64: dts: exynosautov9: convert serial_0 for USI | expand

Commit Message

Chanho Park Dec. 8, 2021, 12:39 a.m. UTC
According to USI v2 driver change[1], serial_0 node should be converted to
use the USI node hierarchy. syscon_peric0 will be used as a syscon node
to control the USI00_USI_SW_CONF register.
This also changes the serial node name from uart@ to serial@.

[1]: https://lore.kernel.org/linux-samsung-soc/20211204195757.8600-2-semen.protsenko@linaro.org/

Cc: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---
 .../boot/dts/exynos/exynosautov9-sadk.dts     |  4 +++
 arch/arm64/boot/dts/exynos/exynosautov9.dtsi  | 36 ++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

Comments

Krzysztof Kozlowski Dec. 8, 2021, 9:14 a.m. UTC | #1
On 08/12/2021 01:39, Chanho Park wrote:
> According to USI v2 driver change[1], serial_0 node should be converted to
> use the USI node hierarchy. syscon_peric0 will be used as a syscon node
> to control the USI00_USI_SW_CONF register.
> This also changes the serial node name from uart@ to serial@.
> 
> [1]: https://lore.kernel.org/linux-samsung-soc/20211204195757.8600-2-semen.protsenko@linaro.org/
> 
> Cc: Sam Protsenko <semen.protsenko@linaro.org>
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> ---
>  .../boot/dts/exynos/exynosautov9-sadk.dts     |  4 +++
>  arch/arm64/boot/dts/exynos/exynosautov9.dtsi  | 36 ++++++++++++++-----
>  2 files changed, 32 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> index ef46d7aa6e28..6cc903443809 100644
> --- a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> +++ b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> @@ -41,6 +41,10 @@ ufs_0_fixed_vcc_reg: regulator-0 {
>  	};
>  };
>  
> +&usi_0 {
> +	status = "okay";
> +};
> +

Put this one alphabetically in DTS.

>  &serial_0 {
>  	status = "okay";
>  };

Best regards,
Krzysztof
Chanho Park Dec. 8, 2021, 9:20 a.m. UTC | #2
Hi,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> Sent: Wednesday, December 8, 2021 6:15 PM
> To: Chanho Park <chanho61.park@samsung.com>; Rob Herring
> <robh+dt@kernel.org>
> Cc: devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-samsung-soc@vger.kernel.org; Sam Protsenko
> <semen.protsenko@linaro.org>
> Subject: Re: [PATCH] arm64: dts: exynosautov9: convert serial_0 for USI
> 
> On 08/12/2021 01:39, Chanho Park wrote:
> > According to USI v2 driver change[1], serial_0 node should be
> > converted to use the USI node hierarchy. syscon_peric0 will be used as
> > a syscon node to control the USI00_USI_SW_CONF register.
> > This also changes the serial node name from uart@ to serial@.
> >
> > [1]:
> > https://lore.kernel.org/linux-samsung-soc/20211204195757.8600-2-semen.
> > protsenko@linaro.org/
> >
> > Cc: Sam Protsenko <semen.protsenko@linaro.org>
> > Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> > ---
> >  .../boot/dts/exynos/exynosautov9-sadk.dts     |  4 +++
> >  arch/arm64/boot/dts/exynos/exynosautov9.dtsi  | 36
> > ++++++++++++++-----
> >  2 files changed, 32 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> > b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> > index ef46d7aa6e28..6cc903443809 100644
> > --- a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> > +++ b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
> > @@ -41,6 +41,10 @@ ufs_0_fixed_vcc_reg: regulator-0 {
> >  	};
> >  };
> >
> > +&usi_0 {
> > +	status = "okay";
> > +};
> > +
> 
> Put this one alphabetically in DTS.

Regarding usi / serial/hsi2c/spi nodes, I thought it looks better to keep the order of DTSi.
Anyway, I'll follow alphabetical order in DTS. I'll apply this next patch.

Best Regards,
Chanho Park
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
index ef46d7aa6e28..6cc903443809 100644
--- a/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
+++ b/arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
@@ -41,6 +41,10 @@  ufs_0_fixed_vcc_reg: regulator-0 {
 	};
 };
 
+&usi_0 {
+	status = "okay";
+};
+
 &serial_0 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/exynos/exynosautov9.dtsi b/arch/arm64/boot/dts/exynos/exynosautov9.dtsi
index a960c0bc2dba..de8fcb82eaec 100644
--- a/arch/arm64/boot/dts/exynos/exynosautov9.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynosautov9.dtsi
@@ -7,6 +7,7 @@ 
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/soc/samsung,exynos-usi.h>
 
 / {
 	compatible = "samsung,exynosautov9";
@@ -256,16 +257,35 @@  syscon_fsys2: syscon@17c20000 {
 			reg = <0x17c20000 0x1000>;
 		};
 
-		/* USI: UART */
-		serial_0: uart@10300000 {
-			compatible = "samsung,exynos850-uart";
-			reg = <0x10300000 0x100>;
-			interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart0_bus_dual>;
+		syscon_peric0: syscon@10220000 {
+			compatible = "samsung,exynosautov9-sysreg", "syscon";
+			reg = <0x10220000 0x2000>;
+		};
+
+		usi_0: usi@103000c0 {
+			compatible = "samsung,exynos850-usi";
+			reg = <0x103000c0 0x20>;
+			samsung,sysreg = <&syscon_peric0 0x1000>;
+			samsung,mode = <USI_V2_UART>;
+			samsung,clkreq-on; /* needed for UART mode */
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
 			clocks = <&uart_clock>, <&uart_clock>;
-			clock-names = "uart", "clk_uart_baud0";
+			clock-names = "pclk", "ipclk";
 			status = "disabled";
+
+			/* USI: UART */
+			serial_0: serial@10300000 {
+				compatible = "samsung,exynos850-uart";
+				reg = <0x10300000 0xc0>;
+				interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&uart0_bus_dual>;
+				clocks = <&uart_clock>, <&uart_clock>;
+				clock-names = "uart", "clk_uart_baud0";
+				status = "disabled";
+			};
 		};
 
 		ufs_0_phy: ufs0-phy@17e04000 {