| Message ID | 20240703025850.2172008-5-quic_tengfan@quicinc.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arm64: qcom: dts: add QCS9100 support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 03/07/2024 04:58, Tengfei Fan wrote: > Add support for the QCS9100 RIDE board dts. The current QCS9100 RIDE > board dts is directly renamed from the SA8775p RIDE board dts. > The difference between the current QCS9100 RIDE board and the SA8775p > RIDE board lies solely in the replacement of the SA8775p SoC with the > QCS9100 SoC, all other board resources remain the same. > The following items have been updated: > - use QCS9100-related compatible names for this board dts. > - replace the inclusion of sa8775p.dtsi with qcs9100.dtsi. > - replace the inclusion of sa8775p-pmics.dtsi with qcs9100-pmics.dtsi > > Signed-off-by: Tengfei Fan <quic_tengfan@quicinc.com> > --- > arch/arm64/boot/dts/qcom/Makefile | 2 +- > .../boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > rename arch/arm64/boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} (99%) > > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index 5576c7d6ea06..a7a3792b0691 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb > dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb > dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb > dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb > +dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb > dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb > dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb > dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb > @@ -112,7 +113,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb > dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb > dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb > dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb > -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb > dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb > diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts > similarity index 99% > rename from arch/arm64/boot/dts/qcom/sa8775p-ride.dts > rename to arch/arm64/boot/dts/qcom/qcs9100-ride.dts > index 26ad05bd3b3f..2415d34b8aa5 100644 > --- a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts > +++ b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts > @@ -8,12 +8,12 @@ > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > > -#include "sa8775p.dtsi" > -#include "sa8775p-pmics.dtsi" > +#include "qcs9100.dtsi" > +#include "qcs9100-pmics.dtsi" > > / { > - model = "Qualcomm SA8775P Ride"; > - compatible = "qcom,sa8775p-ride", "qcom,sa8775p"; > + model = "Qualcomm QCS9100 Ride"; > + compatible = "qcom,qcs9100-ride", "qcom,qcs9100"; It does not look like you tested the DTS against bindings. Please run `make dtbs_check W=1` (see Documentation/devicetree/bindings/writing-schema.rst or https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/ for instructions). Your own internal guideline tells you to perform above tests, doesn't it? Best regards, Krzysztof
On 7/3/2024 12:39 PM, Krzysztof Kozlowski wrote: > On 03/07/2024 04:58, Tengfei Fan wrote: >> Add support for the QCS9100 RIDE board dts. The current QCS9100 RIDE >> board dts is directly renamed from the SA8775p RIDE board dts. >> The difference between the current QCS9100 RIDE board and the SA8775p >> RIDE board lies solely in the replacement of the SA8775p SoC with the >> QCS9100 SoC, all other board resources remain the same. >> The following items have been updated: >> - use QCS9100-related compatible names for this board dts. >> - replace the inclusion of sa8775p.dtsi with qcs9100.dtsi. >> - replace the inclusion of sa8775p-pmics.dtsi with qcs9100-pmics.dtsi >> >> Signed-off-by: Tengfei Fan <quic_tengfan@quicinc.com> >> --- >> arch/arm64/boot/dts/qcom/Makefile | 2 +- >> .../boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} | 8 ++++---- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> rename arch/arm64/boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} (99%) >> >> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile >> index 5576c7d6ea06..a7a3792b0691 100644 >> --- a/arch/arm64/boot/dts/qcom/Makefile >> +++ b/arch/arm64/boot/dts/qcom/Makefile >> @@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb >> +dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb >> dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb >> @@ -112,7 +113,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb >> -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb >> dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb >> diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts >> similarity index 99% >> rename from arch/arm64/boot/dts/qcom/sa8775p-ride.dts >> rename to arch/arm64/boot/dts/qcom/qcs9100-ride.dts >> index 26ad05bd3b3f..2415d34b8aa5 100644 >> --- a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts >> +++ b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts >> @@ -8,12 +8,12 @@ >> #include <dt-bindings/gpio/gpio.h> >> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> >> >> -#include "sa8775p.dtsi" >> -#include "sa8775p-pmics.dtsi" >> +#include "qcs9100.dtsi" >> +#include "qcs9100-pmics.dtsi" >> >> / { >> - model = "Qualcomm SA8775P Ride"; >> - compatible = "qcom,sa8775p-ride", "qcom,sa8775p"; >> + model = "Qualcomm QCS9100 Ride"; >> + compatible = "qcom,qcs9100-ride", "qcom,qcs9100"; > > It does not look like you tested the DTS against bindings. Please run > `make dtbs_check W=1` (see > Documentation/devicetree/bindings/writing-schema.rst or > https://www.linaro.org/blog/tips-and-tricks-for-validating-devicetree-sources-with-the-devicetree-schema/ > for instructions). > > Your own internal guideline tells you to perform above tests, doesn't it? > > Best regards, > Krzysztof > I have performed relevant check, and it's possible that there are some issues about the parameters used. I will follow your advice and refer to the relevant documentation to perform DTBS check again, ensuring that similar issues do not arise in the future.
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 5576c7d6ea06..a7a3792b0691 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb +dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb @@ -112,7 +113,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb diff --git a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts similarity index 99% rename from arch/arm64/boot/dts/qcom/sa8775p-ride.dts rename to arch/arm64/boot/dts/qcom/qcs9100-ride.dts index 26ad05bd3b3f..2415d34b8aa5 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p-ride.dts +++ b/arch/arm64/boot/dts/qcom/qcs9100-ride.dts @@ -8,12 +8,12 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> -#include "sa8775p.dtsi" -#include "sa8775p-pmics.dtsi" +#include "qcs9100.dtsi" +#include "qcs9100-pmics.dtsi" / { - model = "Qualcomm SA8775P Ride"; - compatible = "qcom,sa8775p-ride", "qcom,sa8775p"; + model = "Qualcomm QCS9100 Ride"; + compatible = "qcom,qcs9100-ride", "qcom,qcs9100"; aliases { ethernet0 = ðernet0;
Add support for the QCS9100 RIDE board dts. The current QCS9100 RIDE board dts is directly renamed from the SA8775p RIDE board dts. The difference between the current QCS9100 RIDE board and the SA8775p RIDE board lies solely in the replacement of the SA8775p SoC with the QCS9100 SoC, all other board resources remain the same. The following items have been updated: - use QCS9100-related compatible names for this board dts. - replace the inclusion of sa8775p.dtsi with qcs9100.dtsi. - replace the inclusion of sa8775p-pmics.dtsi with qcs9100-pmics.dtsi Signed-off-by: Tengfei Fan <quic_tengfan@quicinc.com> --- arch/arm64/boot/dts/qcom/Makefile | 2 +- .../boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm64/boot/dts/qcom/{sa8775p-ride.dts => qcs9100-ride.dts} (99%)