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

Commit 0112f3c5 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 support for APQ8017 CDP with no PMI"

parents 3863c2f7 6b44a045
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-rumi.dtb \
	msm8917-qgp-tmo.dtb \
	msm8917-pmi8937-qrd-sku5.dtb \
	apq8017-pmi8937-cdp-wcd-rome.dtb \
	apq8017-pmi8950-cdp-wcd-rome.dtb
	apq8017-pmi8950-cdp-wcd-rome.dtb \
	apq8017-no-pmi-wcd-rome-cdp.dtb

dtb-$(CONFIG_ARCH_MSM8920) += msm8920-pmi8937-cdp.dtb \
	msm8920-pmi8937-mtp.dtb \
+89 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016, 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.
 */

#include "msm-pmi8937.dtsi"
#include "msm8917-cdp.dtsi"
#include "msm8917-audio-cdp.dtsi"

&soc {
	led_flash0: qcom,camera-flash {
		status = "disabled";
		cell-index = <0>;
		compatible = "qcom,camera-flash";
		qcom,flash-type = <1>;
		qcom,flash-source = <&pmi8937_flash0 &pmi8937_flash1>;
		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;
		qcom,switch-source = <&pmi8937_switch>;
	};
};

/* delete all PMI nodes */
&spmi_bus {
	qcom,pmi8937@2 {
		qcom,revid@100 {
			status = "disabled";
		};

		qcom,power-on@800 {
			status = "disabled";
		};

		vadc@3100 {
			status = "disabled";
		};

		mpps {
			status = "disabled";
		};

		qcom,qpnp-smbcharger {
			status = "disabled";
		};

		qcom,fg {
			status = "disabled";
		};

		bcl@4200 {
			status = "disabled";
		};

		qcom,leds@a100 {
			status = "disabled";
		};
	};

	qcom,pmi8937@3 {
		pwm@b000 {
			status = "disabled";
		};

		qcom,leds@d800 {
			status = "disabled";
		};

		qcom,leds@d300 {
			status = "disabled";
		};

		qcom,haptic@c000 {
			status = "disabled";
		};
	};
};

&cci {
	qcom,camera@0 {
		status = "disabled";
	};
};
+29 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016, 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 "apq8017.dtsi"
#include "apq8017-no-pmi-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017 CDP no-PMI \
					with WCD codec/Rome card";
	compatible = "qcom,apq8017-cdp", "qcom,apq8017", "qcom,cdp";
	qcom,board-id = <1 3>;
	qcom,pmic-id = <0x10019 0x000000 0x0 0x0>;
};

&blsp1_uart1 {
	status = "ok";
};