Message ID | 20241025-b4-linux-next-24-10-25-camss-dts-fixups-v1-1-cdff2f1a5792@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 231c03c6119d98ae26c7fe72c3281091eb41a35e |
Headers | show |
Series | qcom: camss: dts: Prune and tidy x13s, rb5 and rb3 CAMSS dts | expand |
On 25.10.2024 5:43 PM, Bryan O'Donoghue wrote: > 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 <bryan.odonoghue@linaro.org> # rb5 > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Konrad
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index ac199f809b0d4e514878518604a23b4f1ab8ef79..7145748afaf53c816e7b3efd8d5f583a2efbb82e 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -116,6 +116,9 @@ dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb + +qrb5165-rb5-vision-mezzanine-dtbs := qrb5165-rb5.dtb qrb5165-rb5-vision-mezzanine.dtbo + dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5-vision-mezzanine.dtb dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso similarity index 88% rename from arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts rename to arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso index edc0e42ee01735eda96b2c5c68be247ea37cd534..0603954e24d88fa203679279f01705eea15ce6c3 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso @@ -4,8 +4,10 @@ */ /dts-v1/; +/plugin/; -#include "qrb5165-rb5.dts" +#include <dt-bindings/clock/qcom,camcc-sm8250.h> +#include <dt-bindings/gpio/gpio.h> &camcc { status = "okay"; @@ -33,6 +35,9 @@ &cci1 { }; &cci1_i2c0 { + #address-cells = <1>; + #size-cells = <0>; + camera@1a { compatible = "sony,imx577"; reg = <0x1a>;