From d21f77d0fd90f9bd46d7593da8adad2c96dbdd57 Mon Sep 17 00:00:00 2001 From: Wu Liangqing Date: Thu, 17 Aug 2023 06:41:01 +0000 Subject: [PATCH] arm64: dts: rockchip: Makefile add rk3399-sapphire-excavator-edp-avb.dtb arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi:210.20-216.4: ERROR (i2c_bus_reg): /i2c@ff110000/vm149c@0c: I2C bus unit address format error, expected "c" arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi:243.20-249.4: ERROR (duplicate_label): /i2c@ff110000/vm149c@0c: Duplicate label 'vm149c' on /i2c@ff110000/vm149c@0c and /i2c@ff110000/vm149c@c arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts:29.24-54.4: ERROR (i2c_bus_reg): /i2c@ff110000/tc35874x@0f: I2C bus unit address format error, expected "f" Change-Id: Ie89eb8038b8791e89b63dab2c990f929596984a8 Signed-off-by: Wu Liangqing --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../rockchip/rk3399-sapphire-excavator-edp-avb.dts | 4 ++-- .../dts/rockchip/rk3399-sapphire-excavator-edp.dtsi | 12 ++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index b27190581e3f..69211157efb2 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -69,6 +69,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp-avb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3528-demo1-lp4-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3528-demo4-ddr4-v10.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts index 3e9ef7b0773b..c951691120a3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -24,9 +24,9 @@ &i2c1 { status = "okay"; - /delete-node/ tc358749x@0f; + /delete-node/ tc358749x@f; - tc35874x: tc35874x@0f { + tc35874x: tc35874x@f { status = "disabled"; reg = <0x0f>; compatible = "toshiba,tc358749"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi index 89ff138a5794..5304f0f52e7c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -192,7 +192,7 @@ }; }; - tc358749x: tc358749x@0f { + tc358749x: tc358749x@f { compatible = "toshiba,tc358749x"; reg = <0x0f>; power-gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; @@ -207,7 +207,7 @@ status = "disabled"; }; - vm149c: vm149c@0c { + vm149c: vm149c@c { compatible = "silicon touch,vm149c"; status = "okay"; reg = <0x0c>; @@ -240,14 +240,6 @@ }; }; - vm149c: vm149c@0c { - compatible = "silicon touch,vm149c"; - status = "okay"; - reg = <0x0c>; - rockchip,camera-module-index = <0>; - rockchip,camera-module-facing = "back"; - }; - ov13850: ov13850@10 { compatible = "ovti,ov13850"; status = "okay";