Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff5e7708 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial dts support for bengal-iot"

parents 99ab8dbd e3804a10

bindings/arm/msm/msm.txt

+8 −8
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ SoCs: 
- SDA660

  compatible = "qcom,sda660"



- QCM4290

  compatible = "qcom,qcm4290"

- BENGAL_IOT

  compatible = "qcom,bengal-iot"



- QCS4290

  compatible = "qcom,qcs4290"

- BENGALP-IOT

  compatible = "qcom,bengalp-iot"



Generic board variants:
@@ -232,7 +232,7 @@ compatible = "qcom,sdm660-sim" 
compatible = "qcom,sda660-mtp"

compatible = "qcom,sda660-cdp"

compatible = "qcom,sda660-qrd"

compatible = "qcom,qcm4290"

compatible = "qcom,qcs4290"

compatible = "qcom,qcm4290-idp"

compatible = "qcom,qcs4290-idp"
 
compatible = "qcom,bengal-iot"

compatible = "qcom,bengalp-iot"

compatible = "qcom,bengal-iot-idp"

compatible = "qcom,bengalp-iot-idp"

qcom/Makefile

+24 −21
Original line number Diff line number Diff line
@@ -116,13 +116,14 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                bengal-idp-2gb-overlay.dtbo \

                bengal-idp-usbc-1gb-overlay.dtbo \

                bengal-idp-usbc-2gb-overlay.dtbo \

                qcm4290-iot-idp-overlay.dtbo \

                qcs4290-iot-idp-overlay.dtbo \

                qcm4290-iot-idp-1gb-overlay.dtbo \

                qcm4290-iot-idp-2gb-overlay.dtbo \

                qcm4290-iot-idp-usbc-1gb-overlay.dtbo \

                qcm4290-iot-idp-usbc-2gb-overlay.dtbo \

                qcm4290-iot-idp-usbc-overlay.dtbo

                bengal-iot-idp-overlay.dtbo \

                bengalp-iot-idp-overlay.dtbo \

                bengal-iot-idp-2gb-overlay.dtbo \

                bengal-iot-idp-usbc-2gb-overlay.dtbo \

                bengal-iot-idp-usbc-overlay.dtbo \

                bengalp-iot-idp-2gb-overlay.dtbo \

                bengalp-iot-idp-usbc-2gb-overlay.dtbo \

                bengalp-iot-idp-usbc-overlay.dtbo



bengal-rumi-overlay.dtbo-base := bengal.dtb

bengal-qrd-overlay.dtbo-base := bengal.dtb
@@ -133,13 +134,14 @@ bengal-idp-1gb-overlay.dtbo-base := bengal-1gb.dtb 
bengal-idp-2gb-overlay.dtbo-base := bengal-2gb.dtb

bengal-idp-usbc-1gb-overlay.dtbo-base := bengal-1gb.dtb

bengal-idp-usbc-2gb-overlay.dtbo-base := bengal-2gb.dtb

qcm4290-iot-idp-overlay.dtbo-base := qcm4290.dtb

qcs4290-iot-idp-overlay.dtbo-base := qcs4290.dtb

qcm4290-iot-idp-1gb-overlay.dtbo-base := qcm4290-iot-1gb.dtb

qcm4290-iot-idp-2gb-overlay.dtbo-base := qcm4290-iot-2gb.dtb

qcm4290-iot-idp-usbc-1gb-overlay.dtbo-base := qcm4290-iot-1gb.dtb

qcm4290-iot-idp-usbc-2gb-overlay.dtbo-base := qcm4290-iot-2gb.dtb

qcm4290-iot-idp-usbc-overlay.dtbo-base := qcm4290.dtb

bengal-iot-idp-overlay.dtbo-base := bengal-iot.dtb

bengalp-iot-idp-overlay.dtbo-base := bengalp-iot.dtb

bengal-iot-idp-2gb-overlay.dtbo-base := bengal-iot-2gb.dtb

bengal-iot-idp-usbc-2gb-overlay.dtbo-base := bengal-iot-2gb.dtb

bengal-iot-idp-usbc-overlay.dtbo-base := bengal-iot.dtb

bengalp-iot-idp-2gb-overlay.dtbo-base := bengalp-iot-2gb.dtb

bengalp-iot-idp-usbc-2gb-overlay.dtbo-base := bengalp-iot-2gb.dtb

bengalp-iot-idp-usbc-overlay.dtbo-base := bengalp-iot.dtb

else

dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \

                bengal-qrd.dtb \
@@ -150,13 +152,14 @@ dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \ 
		bengal-idp-2gb.dtb \

		bengal-idp-usbc-1gb.dtb \

		bengal-idp-usbc-2gb.dtb \

		qcm4290-iot-idp.dtb \

		qcs4290-iot-idp.dtb \

		qcm4290-iot-idp-1gb.dtb \

		qcm4290-iot-idp-2gb.dtb \

		qcm4290-iot-idp-usbc-1gb.dtb \

		qcm4290-iot-idp-usbc-2gb.dtb \

		qcm4290-iot-idp-usbc.dtb

		bengal-iot-idp.dtb \

		bengalp-iot-idp.dtb \

		bengal-iot-idp-2gb.dtb \

		bengal-iot-idp-usbc-2gb.dtb \

		bengal-iot-idp-usbc.dtb \

		bengalp-iot-idp-2gb.dtb \

		bengalp-iot-idp-usbc-2gb.dtb \

		bengalp-iot-idp-usbc.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/bengal-iot-2gb.dts

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "bengal-iot-low-ram.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. BENGAL-IOT 2Gb DDR HD+ SoC";

	compatible = "qcom,bengal-iot";

	qcom,board-id = <0 0x403>;

};

qcom/qcm4290-iot-idp-2gb-overlay.dts→qcom/bengal-iot-idp-2gb-overlay.dts

+3 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "qcm4290-iot-idp-low-ram.dtsi"

#include "bengal-iot-idp-low-ram.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCM4290 IDP 2Gb DDR HD+";

	compatible = "qcom,qcm4290-idp", "qcom,qcm4290", "qcom,idp";

	model = "Qualcomm Technologies, Inc. BENGAL-IOT IDP 2Gb DDR HD+";

	compatible = "qcom,bengal-iot-idp", "qcom,bengal-iot", "qcom,idp";

	qcom,msm-id = <469 0x10000>;

	qcom,board-id = <34 0x403>;

};

qcom/qcm4290-iot-idp-2gb.dts→qcom/bengal-iot-idp-2gb.dts

+4 −4
Original line number Diff line number Diff line 
/dts-v1/;



#include "qcm4290-iot-low-ram.dtsi"

#include "qcm4290-iot-idp-low-ram.dtsi"

#include "bengal-iot-low-ram.dtsi"

#include "bengal-iot-idp-low-ram.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCM4290 IDP 2Gb DDR HD+";

	compatible = "qcom,qcm4290-idp", "qcom,qcm4290", "qcom,idp";

	model = "Qualcomm Technologies, Inc. BENGAL-IOT IDP 2Gb DDR HD+";

	compatible = "qcom,bengal-iot-idp", "qcom,bengal-iot", "qcom,idp";

	qcom,board-id = <34 0x403>;

};