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

Commit 03951a35 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial dts support for QM215 QRD"

parents 6e93386d cf2b48e7
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@ dtbo-$(CONFIG_ARCH_MSM8917) += msm8917-mtp-overlay.dtbo \
	msm8917-rcm-overlay.dtbo \
	apq8017-mtp-overlay.dtbo \
	apq8017-cdp-overlay.dtbo \
	apq8017-cdp-wcd-rome-overlay.dtbo
	apq8017-cdp-wcd-rome-overlay.dtbo \
	qm215-qrd-overlay.dtbo

dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \
	msm8953-cdp-overlay.dtbo \
@@ -389,6 +390,7 @@ msm8917-mtp-overlay.dtbo-base := msm8917-pmi8950.dtb \

msm8917-qrd-overlay.dtbo-base := msm8917-pmi8937.dtb


msm8917-cdp-ext-codec-overlay.dtbo-base := msm8917-pmi8950.dtb

msm8917-cdp-ml-touch-overlay.dtbo-base := msm8917-pmi8950.dtb
@@ -410,6 +412,8 @@ apq8017-cdp-overlay.dtbo-base := apq8017-pmi8950.dtb \
apq8017-cdp-wcd-rome-overlay.dtbo-base := apq8017-pmi8950.dtb \
	apq8017-pmi8937.dtb

qm215-qrd-overlay.dtbo-base := qm215.dtb

msm8953-mtp-overlay.dtbo-base := sdm450.dtb \
	msm8953.dtb \
	apq8053.dtb \
@@ -471,6 +475,7 @@ sdm439-cdp-overlay.dtbo-base := sdm439.dtb \
	msm8937-interposer-sdm439.dtb
sdm439-qrd-overlay.dtbo-base := sdm439.dtb \
	msm8937-interposer-sdm439.dtb

sdm439-external-codec-mtp-overlay.dtbo-base := sdm439.dtb
sdm439-rcm-overlay.dtbo-base := sdm439.dtb
sdm429-mtp-overlay.dtbo-base := sdm429.dtb \
@@ -539,7 +544,8 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb \
	apq8017-pmi8937-cdp-wcd-rome.dtb \
	msm8917-pmi8940-mtp.dtb \
	msm8917-pmi8940-cdp.dtb \
	msm8917-pmi8940-rcm.dtb
	msm8917-pmi8940-rcm.dtb \
	qm215-qrd.dtb

dtb-$(CONFIG_ARCH_MSM8909) += sdw3100-msm8909w-wtp.dtb \
	sdw3100-apq8009w-wtp.dtb \
@@ -589,7 +595,8 @@ dtb-$(CONFIG_ARCH_SDM439) += sdm439-mtp.dtb \
	sda439-mtp.dtb \
	sda439-cdp.dtb \
	sdm439-external-codec-mtp.dtb \
	sdm439-rcm.dtb
	sdm439-rcm.dtb \
	qm215-qrd.dtb

dtb-$(CONFIG_ARCH_SDM429) += sdm429-mtp.dtb \
	sdm429-cdp.dtb \
+108 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/* delete PMIC specific nodes */
&soc {
	/* delete rpm-smd base node to delete all regulator in one shot */
	/delete-node/ qcom,rpm-smd;

	/* add rpm-smd node again */
	rpm_bus: qcom,rpm-smd {
		compatible = "qcom,rpm-smd";
		rpm-channel-name = "rpm_requests";
		rpm-channel-type = <15>; /* SMD_APPS_RPM */
	};

	/* delete all pmic nodes */
	qcom,spmi@200f000 {
		/delete-node/ qcom,pm8937@0;
		/delete-node/ qcom,pm8937@1;
	};
};

/* delete all node referring PM8937 */
&soc {
	/delete-node/ thermal-zones;

	qcom,cpu-clock-8939@b111050 {
		/delete-property/ vdd-c1-supply;
	};

	qcom,gcc@1800000 {
		/delete-property/ vdd_dig-supply;
		/delete-property/ vdd_hf_dig-supply;
		/delete-property/ vdd_hf_pll-supply;
	};

	usb@78db000 {
		/delete-property/ hsusb_vdd_dig-supply;
		/delete-property/ HSUSB_1p8-supply;
		/delete-property/ HSUSB_3p3-supply;
		/delete-property/ vbus_otg-supply;
	};

	qcom,mss@4080000 {
		/delete-property/ vdd_mss-supply;
		/delete-property/ vdd_cx-supply;
		/delete-property/ vdd_mx-supply;
		/delete-property/ vdd_pll-supply;
	};

	qcom,lpass@c200000 {
		/delete-property/ vdd_cx-supply;
	};

	qcom,pronto@a21b000 {
		/delete-property/ vdd_pronto_pll-supply;
	};

	qcom,wcnss-wlan@a000000 {
		/delete-property/ qcom,pronto-vddmx-supply;
		/delete-property/ qcom,pronto-vddcx-supply;
		/delete-property/ qcom,pronto-vddpx-supply;
		/delete-property/ qcom,iris-vddxo-supply;
		/delete-property/ qcom,iris-vddrfa-supply;
		/delete-property/ qcom,iris-vddpa-supply;
		/delete-property/ qcom,iris-vdddig-supply;
		/delete-property/ qcom,wcnss-adc_tm;
	};

	/delete-node/ qcom,gcc-mdss@1800000;

	/delete-node/ qcom,csid@1b30000;
	/delete-node/ qcom,csid@1b30400;
	/delete-node/ qcom,csid@1b30800;

	/delete-node/ qcom,mdss_mdp@1a00000;
	/delete-node/ qcom,mdss_dsi@0;
	/delete-node/ qcom,mdss_wb_panel;
	/delete-node/ qcom,mdss_rotator;
	/delete-node/ qcom,mdss_dsi_pll@1a94a00;
	/delete-node/ qcom,mdss_dsi_pll@1a96a00;

	/* mem_acc */
	/delete-node/ regulator@01946004;
	/* apc vreg */
	/delete-node/ regulator@b018000;
	/delete-node/ eldo2;
	/delete-node/ adv_vreg;
};

#include "pm8916-rpm-regulator.dtsi"
#include "pm8916.dtsi"

&spmi_bus {
	pm8916@1 {
		/delete-node/ msm8x16_wcd_codec@f000;
	};
};
+22 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/dts-v1/;
/plugin/;

#include "qm215-qrd.dtsi"

/ {
	model = "QRD";
	qcom,board-id = <0x01000b 4>;
};
+25 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/dts-v1/;

#include "qm215.dtsi"
#include "qm215-pm8916.dtsi"
#include "qm215-qrd.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. qm215 QRD";
	compatible = "qcom,qm215-qrd", "qcom,qm215", "qcom,qrd";
	qcom,board-id = <0x01000b 4>;
	qcom,pmic-id = <0x010016 0x25 0x0 0x0>;
};
+35 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

&blsp1_uart2 {
	status = "ok";
};

&soc {
	gpio_keys {
		compatible = "gpio-keys";
		input-name = "gpio-keys";
		pinctrl-names = "default";
		pinctrl-0 = <&gpio_key_active>;

		vol_up {
			label = "volume_up";
			gpios = <&tlmm 91 0x1>;
			linux,input-type = <1>;
			linux,code = <115>;
			debounce-interval = <15>;
			linux,can-disable;
			gpio-key,wakeup;
		};
	};
};
Loading