From e0b16c2ae2195050214d4b1eecf88e5bd34c8a62 Mon Sep 17 00:00:00 2001 From: Jianlong Wang Date: Tue, 11 Apr 2023 11:20:04 +0800 Subject: [PATCH] ARM: dts: rockchip: rk312x-evb: add tsadc and earlycon support Change-Id: If75380c08add4ebefe6778bbde15d85dca5de7c9 Signed-off-by: Jianlong Wang --- arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux-slc.dts | 2 +- arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux.dts | 2 +- arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux-slc.dts b/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux-slc.dts index 7e81ff3dfabe..153b27771f97 100644 --- a/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux-slc.dts +++ b/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux-slc.dts @@ -6,7 +6,7 @@ #include "rk3126c-evb-ddr3-v10-linux.dts" / { chosen { - bootargs = "ubi.mtd=7 root=ubi0:rootfs rootfstype=ubifs"; + bootargs = "earlycon=uart8250,mmio32,0x20068000 console=ttyFIQ0 ubi.mtd=7 root=ubi0:rootfs rootfstype=ubifs"; }; }; diff --git a/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux.dts b/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux.dts index cd585a8ca292..e55961e7f46f 100644 --- a/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux.dts +++ b/arch/arm/boot/dts/rk3126c-evb-ddr3-v10-linux.dts @@ -17,7 +17,7 @@ compatible = "rockchip,rk3126"; chosen { - bootargs = "root=PARTUUID=614e0000-0000-4b53-8000-1d28000054a9 rootwait"; + bootargs = "earlycon=uart8250,mmio32,0x20068000 console=ttyFIQ0 root=PARTUUID=614e0000-0000-4b53-8000-1d28000054a9 rootwait"; }; adc-keys { diff --git a/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts b/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts index d660c08190d8..8f7d39e21440 100644 --- a/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts +++ b/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts @@ -17,7 +17,7 @@ compatible = "rockchip,rk3128"; chosen { - bootargs = "root=PARTUUID=614e0000-0000-4b53-8000-1d28000054a9 rootwait"; + bootargs = "earlycon=uart8250,mmio32,0x20068000 console=ttyFIQ0 root=PARTUUID=614e0000-0000-4b53-8000-1d28000054a9 rootwait"; }; adc-keys { @@ -944,6 +944,10 @@ #sound-dai-cells = <0>; }; +&tsadc { + status = "okay"; +}; + &u2phy { status = "okay";