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

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

Merge "ARM: dts: msm: Add initial device tree for Scuba"

parents 0a249906 40e80b3a
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ SoCs:
- BENGAL
  compatible = "qcom,bengal"

- SCUBA
  compatible = "qcom,scuba"

- SDMSHRIKE
  compatible = "qcom,sdmshrike"

@@ -181,6 +184,7 @@ compatible = "qcom,lagoon-rumi"
compatible = "qcom,bengal-rumi"
compatible = "qcom,bengal-qrd"
compatible = "qcom,bengal-idp"
compatible = "qcom,scuba-rumi"
compatible = "qcom,sdmshrike-rumi"
compatible = "qcom,sdmshrike-mtp"
compatible = "qcom,sdmshrike-cdp"
+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,15 @@ dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \
		bengal-idp-usbc.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
        dtbo-$(CONFIG_ARCH_SCUBA) += \
                scuba-rumi-overlay.dtbo

scuba-rumi-overlay.dtbo-base := scuba.dtb
else
dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb
endif

always		:= $(dtb-y)
subdir-y	:= $(dts-dirs)
clean-files    := *.dtb *.dtbo
+12 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "scuba-rumi.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Scuba RUMI";
	compatible = "qcom,scuba-rumi", "qcom,scuba", "qcom,rumi";
	qcom,msm-id = <441 0x10000>;
	qcom,board-id = <15 0>;
};

qcom/scuba-rumi.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line
/dts-v1/;
/memreserve/ 0x90000000 0x00000100;

#include "scuba.dtsi"
#include "scuba-rumi.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Scuba RUMI";
	compatible = "qcom,scuba-rumi", "qcom,scuba", "qcom,rumi";
	qcom,board-id = <15 0>;
};

qcom/scuba-rumi.dtsi

0 → 100644
+13 −0
Original line number Diff line number Diff line
&soc {
	timer {
		clock-frequency = <500000>;
	};

	timer@f120000 {
		clock-frequency = <500000>;
	};

	wdog: qcom,wdt@f017000 {
		status = "disabled";
	};
};
Loading