Message ID | 20250408-apq8016-sbc-camera-dtso-v1-1-cdf1cd41bda6@linaro.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [RESEND] arm64: dts: qcom: apq8016-sbc-d3-camera: Convert to DT overlay | expand |
On Tue, Apr 08, 2025 at 01:38:42PM +0200, Stephan Gerhold wrote: > From: Stephan Gerhold <stephan@gerhold.net> > > Follow the example of the recently added apq8016-sbc-usb-host.dtso and > convert apq8016-sbc-d3-camera-mezzanine.dts to a DT overlay that can be > applied on top of the apq8016-sbc.dtb. This makes it more clear that > this is not a special type of DB410c but just an addon board that can > be added on top. > > Functionally there should not be any difference since > apq8016-sbc-d3-camera-mezzanine.dtb is still generated as before > (but now by applying the overlay on top of apq8016-sbc.dtb). > > Since dtc does not know that there are default #address/size-cells in > msm8916.dtsi, repeat those in the overlay to avoid dtc warnings because > it expects the wrong amount of address/size-cells. > > It would be nice to have a generic overlay for the D3 camera mezzanine > (that can be applied to all 96Boards) but that's much more complicated > than providing a board-specific DT overlay as intermediate step. > > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > This patch was already applied by Bjorn on Sun, 28 Jan 2024 11:45:55 -0600 > as commit ea689ec32bf0d885277d3f58450a85df5149c98b [1]. However, unlike the > first patch in the series, this one never made it into the repository for > some reason. > > [1]: https://lore.kernel.org/linux-arm-msm/170646395036.64610.14333204830178417809.b4-ty@kernel.org/ > --- > arch/arm64/boot/dts/qcom/Makefile | 5 +++-- > ...ra-mezzanine.dts => apq8016-sbc-d3-camera-mezzanine.dtso} | 12 ++++++++++-- > 2 files changed, 13 insertions(+), 4 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index adb4d026bcc4b24d73de92e204db8d525b0770e6..465b3791f15e66883717ecd59a2ade9461472df7 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb -apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo +apq8016-sbc-d3-camera-mezzanine-dtbs := apq8016-sbc.dtb apq8016-sbc-d3-camera-mezzanine.dtbo +apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo dtb-$(CONFIG_ARCH_QCOM) += sar2130p-qar2130p.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8016-schneider-hmibsc.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso similarity index 89% rename from arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts rename to arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso index f9cbf8c1d6891108e208f4626aa7667c74ee413b..d739ece6b44ff25960f92088a4023ef794215712 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso @@ -5,10 +5,12 @@ */ /dts-v1/; +/plugin/; -#include "apq8016-sbc.dts" +#include <dt-bindings/clock/qcom,gcc-msm8916.h> +#include <dt-bindings/gpio/gpio.h> -/ { +&{/} { camera_vdddo_1v8: regulator-camera-vdddo { compatible = "regulator-fixed"; regulator-name = "camera_vdddo"; @@ -38,6 +40,9 @@ &camss { status = "okay"; ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; csiphy0_ep: endpoint { @@ -53,6 +58,9 @@ &cci { }; &cci_i2c0 { + #address-cells = <1>; + #size-cells = <0>; + camera@3b { compatible = "ovti,ov5640"; reg = <0x3b>;