From 427fe90066d1daa5bba24bf3036f60b6492a670a Mon Sep 17 00:00:00 2001 From: Lin Jinhan Date: Thu, 2 Jun 2022 17:21:02 +0800 Subject: [PATCH] ARM: dts: rockchip: rv1106-smd-cam: fix pinctrl conflicts Fix pinctrk conflicts between rkcif_mipi_lvds1 and rkisp Signed-off-by: Lin Jinhan Change-Id: I57335c652cde902b6408d7c49cd6f0dab51128a1 --- arch/arm/boot/dts/rv1106-smd-cam.dtsi | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/boot/dts/rv1106-smd-cam.dtsi b/arch/arm/boot/dts/rv1106-smd-cam.dtsi index 12fc683a8b11..8688810a9af4 100644 --- a/arch/arm/boot/dts/rv1106-smd-cam.dtsi +++ b/arch/arm/boot/dts/rv1106-smd-cam.dtsi @@ -281,9 +281,6 @@ &rkcif_mipi_lvds1 { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&mipi_pins>; - port { /* MIPI CSI-2 endpoint */ cif_mipi1_in: endpoint {