@@ -50,6 +50,7 @@ ufs_1_fixed_vcc_reg: regulator-1 {
};
&serial_0 {
+ pinctrl-0 = <&uart0_bus_dual>;
status = "okay";
};
@@ -74,6 +75,7 @@ &ufs_1 {
};
&usi_0 {
+ samsung,clkreq-on; /* needed for UART mode */
status = "okay";
};
@@ -351,34 +351,6 @@ syscon_peric0: syscon@10220000 {
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 = <&cmu_peric0 CLK_GOUT_PERIC0_PCLK_0>,
- <&cmu_peric0 CLK_GOUT_PERIC0_IPCLK_0>;
- 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 = <&cmu_peric0 CLK_GOUT_PERIC0_PCLK_0>,
- <&cmu_peric0 CLK_GOUT_PERIC0_IPCLK_0>;
- clock-names = "uart", "clk_uart_baud0";
- status = "disabled";
- };
- };
-
ufs_0_phy: phy@17e04000 {
compatible = "samsung,exynosautov9-ufs-phy";
reg = <0x17e04000 0xc00>;
@@ -466,3 +438,4 @@ watchdog_cl1: watchdog@10060000 {
};
#include "exynosautov9-pinctrl.dtsi"
+#include "exynosautov9-usi.dtsi"
By including exynosautov9-usi.dtsi, we can remove usi_0 definitions from exynosautov9.dtsi. We also need to overide serial_0's pinctrl and clkreq-on property in order to be used it as serial console. Signed-off-by: Chanho Park <chanho61.park@samsung.com> --- .../boot/dts/exynos/exynosautov9-sadk.dts | 2 ++ arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 29 +------------------ 2 files changed, 3 insertions(+), 28 deletions(-)