From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A5EA1FCD0C; Wed, 5 Feb 2025 14:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766858; cv=none; b=FpXGhQ+WZSKhVbqdOrYoBSPNVmkukDuGlIcGYYZnVOMSngIrffXZ8T5QPnejBnJiZTqhx/FKNWyrtnfPSDm5HZ5FXZ+a6FxX34Tv+vozIsLZryNDP0Y+Pe8zszUjOg7cnxLr3YxHtmfzEKDRumZ6W65nnScsmCkGsUc1CWkQ7pk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766858; c=relaxed/simple; bh=yCuxGwhg6UPdKd+qMry/Kd97mNY/7egpXKuou5XJD/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ojYs7yqd/L64+QbGDFCB/GjxL3wiM0rK4QLL/D9FYnwE993L+a0Wu5tKoRai7ZthW9GHeM93uopP7U8uBkGEzJkLpvTjSXc9ngdAZzoUen9xhcUtr756lIh3slns5RTgrqrgtqWcpeuvd0qGq5FHyDb+iX6zmfMgdfNL752uuNk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vmfBYAo2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vmfBYAo2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECACCC4CED1; Wed, 5 Feb 2025 14:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766858; bh=yCuxGwhg6UPdKd+qMry/Kd97mNY/7egpXKuou5XJD/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vmfBYAo2bps8+NxBAMeuk1xH7hDkNsDGmLNbBTZNb7Dh9Vw6FusRJH3ylgqgu1kyl UKtYhHJdLrSP9+U8RHOUMKfwD5SYVjM2/gu1df/PDw/pft+copVjO8S9y8c5qNE+3V 1y6BPBZUNk/WsVZz6MJxhzRg50FuZQqsWZvJ1K44= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryan ODonoghue , Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12 372/590] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to dtso Date: Wed, 5 Feb 2025 14:42:07 +0100 Message-ID: <20250205134509.501581193@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bryan O'Donoghue [ Upstream commit 30df676a31b7a4881352097d8ae7c2bb83515a17 ] Convert the navigation / camera mezzanine from its own dts to a dtso. A small amount of additional includes / address / cell size change needs to be applied to convert. Tested-by: Bryan O'Donoghue # rb3 Signed-off-by: Bryan O'Donoghue Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20241025-b4-linux-next-24-10-25-camss-dts-fixups-v1-2-cdff2f1a5792@linaro.org [bjorn: Corrected up makefile syntax, added missing cells for cci_i2c1] Signed-off-by: Bjorn Andersson Stable-dep-of: 80b47f14d543 ("arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: remove disabled ov7251 camera") Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/Makefile | 3 +++ ...ine.dts => sdm845-db845c-navigation-mezzanine.dtso} | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) rename arch/arm64/boot/dts/qcom/{sdm845-db845c-navigation-mezzanine.dts => sdm845-db845c-navigation-mezzanine.dtso} (91%) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index ae002c7cf1268..b13c169ec70d2 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -207,6 +207,9 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb + +sdm845-db845c-navigation-mezzanine-dtbs := sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo + dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c-navigation-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyln.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyp.dtb diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso similarity index 91% rename from arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts rename to arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso index a21caa6f3fa25..b5f717d0ddd97 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso @@ -4,8 +4,10 @@ */ /dts-v1/; +/plugin/; -#include "sdm845-db845c.dts" +#include +#include &camss { vdda-phy-supply = <&vreg_l1a_0p875>; @@ -28,6 +30,9 @@ }; &cci_i2c0 { + #address-cells = <1>; + #size-cells = <0>; + camera@10 { compatible = "ovti,ov8856"; reg = <0x10>; @@ -65,6 +70,9 @@ }; &cci_i2c1 { + #address-cells = <1>; + #size-cells = <0>; + camera@60 { compatible = "ovti,ov7251"; -- 2.39.5