From nobody Fri Nov 29 17:45:23 2024 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AF22BE6C; Mon, 16 Sep 2024 20:03:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726517037; cv=none; b=ZJMWbi5mXssQ/fgsdkr01C3Psmf6e5TEYkEJUHwWcE/v918iL18kM2DGx2Akr6hUlP6R2T5NPxR1/XjJQlekEktvUjjM0u943pDkK3CCE0iBqbei2tSeEX1I/VNPnnDZNh8QVM0DGBQ1E2AgP1wlOv3YekLUN8Z08wkBwrshpOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726517037; c=relaxed/simple; bh=Df0vu8wyKcJgl+eGOHEdy980cdxBQwXmPA5py9E7sMM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=oiPzWm3Fi6lAis1Bzf9KBw0/MduxP4KvAzYk7I7MovyjddcpWQrfDSipdyBonsith5BR2+XZl4O29AudwWnZVDeaoNGcDrBYv42iI401zqDwPjSGhiquVPFOPto0mhDErAWxajb1z2pv/e6NVc3QIY7vJ0enZwAV/RMT/+6cf+8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ebyNXrAD; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ebyNXrAD" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-42cba8340beso36905945e9.1; Mon, 16 Sep 2024 13:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726517034; x=1727121834; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oJqKzDykopbcXCyaQAM3tTia9TVWEfHdxg285UZzTsY=; b=ebyNXrAD/30SB8yhRSJCghW+YysatBF2bKl41/EvhTgQi8lZmxhSHww+gfmKTBz8B+ KYO1zcts+XBLp+Ez32y/mNQ9mpIyFaJ80DWSQhpTthmTl1N79En68esug2bBsgVXE3Ql r1cniGdmw5s9qrDlMLMAn76imr3KcDwsZX5z1wUjgSx1MKlqmvvXPqjaGHblBvoO6Ktl n1aVjVH2Yz4pc8zz9tSYaS7mds1t/r8VVrdoqxobMgHPH/ojyS/H9tjGYcI/rs/kZ26T kbeq6DWy2PpJvdbC9myWi2jPkJooaUmJ8KVFiAngpkbRa4XDMTJneFQK5XimAP0mU2CV sJFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726517034; x=1727121834; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oJqKzDykopbcXCyaQAM3tTia9TVWEfHdxg285UZzTsY=; b=DnnHDux0Iq3SBMdtfa3wpXP5KcOyon7oWDS/xF7Q9SDZ6u3ZcmWkIHNfSi9ym57c56 8F+7kyiYkxZQpkU1aaWgLhE6/ZRb2FQeH5Ow/tNcctfLyg0Nuq4xfLwtIOLhsaqIxtr+ QwmrrgnOSWJXIoC3fdEZM013HgatQSt9p1eT/GKP/xrrbWG36q2cfCqRiKV3567zubZo TUzMM49UDArTKW+t4J791pfAmpAIFo8KqYXS3IxhS+shvrhINRSutGCTt+ng7C6i2bK1 2b81lMDWuN5opNGu7bhac+k1Mhk2uT1QeH8OSn5bikp+0FZdmovCG5ZHF5eFHCKVrGMZ WvoA== X-Forwarded-Encrypted: i=1; AJvYcCXh0KqBb96gxV1Zui5M1fjTvqASXmnbBHnFEMnKcE8B9UFIp2fERtqPbrAuUUtZ/egzO39O8F340Uzcd7A=@vger.kernel.org X-Gm-Message-State: AOJu0YzwFDHZhaemUWK2wdAFMc4rrYWdzCTfJd9P5TanUH75SkwlqrOT XJXd0/M3du+EfoWprsviCzPXcyB2RUMWGYdl2bPlxaQ79EMtQ1LV X-Google-Smtp-Source: AGHT+IGpcdlnbpU7EgkN9nVbuDNBKqoVX0DKnfVRK05L+w7SZW6I3HTkSWOHcc7UuhjMDardzIpoZA== X-Received: by 2002:a05:600c:3516:b0:42c:b7ae:4c97 with SMTP id 5b1f17b1804b1-42cbde1a867mr131407545e9.11.1726517034351; Mon, 16 Sep 2024 13:03:54 -0700 (PDT) Received: from ld-100007.ds1.internal (178.165.165.188.wireless.dyn.drei.com. [178.165.165.188]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-378e7800138sm7884487f8f.68.2024.09.16.13.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 13:03:53 -0700 (PDT) From: Diogo Silva X-Google-Original-From: Diogo Silva To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, aisheng.dong@nxp.com, Frank.Li@nxp.com Cc: devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, diogompaissilva@gmail.com Subject: [PATCH] arm64: dts: imx8: Fix lvds0 device tree Date: Mon, 16 Sep 2024 22:02:56 +0200 Message-Id: <20240916200255.2566209-1-diogo.pais@ttcontrol.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Diogo Silva Some clock output names on lvds0 device tree were duplicated from mipi1, which caused an -EEXIST when registering these clocks during probe. Also fixed the device naming to be consistent with lvds1. Fixes: 0fba24b3b956 ("arm64: dts: imx8: add basic lvds0 and lvds1 subsystem= ") subsystem") Signed-off-by: Diogo Silva --- .../boot/dts/freescale/imx8-ss-lvds0.dtsi | 22 +++++++++---------- arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 4 ++-- .../boot/dts/freescale/imx8qm-ss-lvds.dtsi | 20 ++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi b/arch/arm64/= boot/dts/freescale/imx8-ss-lvds0.dtsi index d00036204a8c..a4d94467039f 100644 --- a/arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi @@ -10,34 +10,34 @@ lvds0_subsys: bus@56240000 { #size-cells =3D <1>; ranges =3D <0x56240000 0x0 0x56240000 0x10000>; =20 - qm_lvds0_lis_lpcg: qxp_mipi1_lis_lpcg: clock-controller@56243000 { + lvds0_lis_lpcg: clock-controller@56243000 { compatible =3D "fsl,imx8qxp-lpcg"; reg =3D <0x56243000 0x4>; #clock-cells =3D <1>; - clock-output-names =3D "mipi1_lis_lpcg_ipg_clk"; + clock-output-names =3D "lvds0_lis_lpcg_ipg_clk"; power-domains =3D <&pd IMX_SC_R_MIPI_1>; }; =20 - qm_lvds0_pwm_lpcg: qxp_mipi1_pwm_lpcg: clock-controller@5624300c { + lvds0_pwm_lpcg: clock-controller@5624300c { compatible =3D "fsl,imx8qxp-lpcg"; reg =3D <0x5624300c 0x4>; #clock-cells =3D <1>; - clock-output-names =3D "mipi1_pwm_lpcg_clk", - "mipi1_pwm_lpcg_ipg_clk", - "mipi1_pwm_lpcg_32k_clk"; + clock-output-names =3D "lvds0_pwm_lpcg_clk", + "lvds0_pwm_lpcg_ipg_clk", + "lvds0_pwm_lpcg_32k_clk"; power-domains =3D <&pd IMX_SC_R_MIPI_1_PWM_0>; }; =20 - qm_lvds0_i2c0_lpcg: qxp_mipi1_i2c0_lpcg: clock-controller@56243010 { + lvds0_i2c0_lpcg: clock-controller@56243010 { compatible =3D "fsl,imx8qxp-lpcg"; reg =3D <0x56243010 0x4>; #clock-cells =3D <1>; - clock-output-names =3D "mipi1_i2c0_lpcg_clk", - "mipi1_i2c0_lpcg_ipg_clk"; + clock-output-names =3D "lvds0_i2c0_lpcg_clk", + "lvds0_i2c0_lpcg_ipg_clk"; power-domains =3D <&pd IMX_SC_R_MIPI_1_I2C_0>; }; =20 - qm_pwm_lvds0: qxp_pwm_mipi_lvds1: pwm@56244000 { + pwm_lvds0: pwm@56244000 { compatible =3D "fsl,imx8qxp-pwm", "fsl,imx27-pwm"; reg =3D <0x56244000 0x1000>; clock-names =3D "ipg", "per"; @@ -48,7 +48,7 @@ qm_pwm_lvds0: qxp_pwm_mipi_lvds1: pwm@56244000 { status =3D "disabled"; }; =20 - qm_i2c0_lvds0: qxp_i2c0_mipi_lvds1: i2c@56246000 { + i2c0_lvds0: i2c@56246000 { compatible =3D "fsl,imx8qxp-lpi2c", "fsl,imx7ulp-lpi2c"; reg =3D <0x56246000 0x1000>; #address-cells =3D <1>; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot= /dts/freescale/imx8qm-mek.dts index 62203eed6a6c..f7b9b319a58a 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts @@ -96,7 +96,7 @@ vdevbuffer: memory@90400000 { =20 lvds_backlight0: backlight-lvds0 { compatible =3D "pwm-backlight"; - pwms =3D <&qm_pwm_lvds0 0 100000 0>; + pwms =3D <&pwm_lvds0 0 100000 0>; brightness-levels =3D <0 100>; num-interpolated-steps =3D <100>; default-brightness-level =3D <80>; @@ -541,7 +541,7 @@ &fec2 { status =3D "okay"; }; =20 -&qm_pwm_lvds0 { +&pwm_lvds0 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pwm_lvds0>; status =3D "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi b/arch/arm64= /boot/dts/freescale/imx8qm-ss-lvds.dtsi index 0514d8b2af75..46fa97d5ba5c 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi @@ -4,31 +4,31 @@ * Copyright 2024 NXP */ =20 -&qm_lvds0_lis_lpcg { +&lvds0_lis_lpcg { clocks =3D <&lvds_ipg_clk>; clock-indices =3D ; }; =20 -&qm_lvds0_pwm_lpcg { +&lvds0_pwm_lpcg { clocks =3D <&clk IMX_SC_R_LVDS_0_PWM_0 IMX_SC_PM_CLK_PER>, <&lvds_ipg_clk>; clock-indices =3D , ; }; =20 -&qm_lvds0_i2c0_lpcg { +&lvds0_i2c0_lpcg { clocks =3D <&clk IMX_SC_R_LVDS_0_I2C_0 IMX_SC_PM_CLK_PER>, <&lvds_ipg_clk>; clock-indices =3D , ; }; =20 -&qm_pwm_lvds0 { - clocks =3D <&qm_lvds0_pwm_lpcg IMX_LPCG_CLK_4>, - <&qm_lvds0_pwm_lpcg IMX_LPCG_CLK_0>; +&pwm_lvds0 { + clocks =3D <&lvds0_pwm_lpcg IMX_LPCG_CLK_4>, + <&lvds0_pwm_lpcg IMX_LPCG_CLK_0>; }; =20 -&qm_i2c0_lvds0 { - clocks =3D <&qm_lvds0_i2c0_lpcg IMX_LPCG_CLK_0>, - <&qm_lvds0_i2c0_lpcg IMX_LPCG_CLK_4>; +&i2c0_lvds0 { + clocks =3D <&lvds0_i2c0_lpcg IMX_LPCG_CLK_0>, + <&lvds0_i2c0_lpcg IMX_LPCG_CLK_4>; }; =20 &lvds0_subsys { @@ -41,7 +41,7 @@ irqsteer_lvds0: interrupt-controller@56240000 { interrupt-controller; interrupt-parent =3D <&gic>; #interrupt-cells =3D <1>; - clocks =3D <&qm_lvds0_lis_lpcg IMX_LPCG_CLK_4>; + clocks =3D <&lvds0_lis_lpcg IMX_LPCG_CLK_4>; clock-names =3D "ipg"; power-domains =3D <&pd IMX_SC_R_LVDS_0>; =20 --=20 2.34.1