Merge "ARM: dts: msm: Fix cdp and rcm boards of 8084+9x35-alt" (7cf95536) · Commits · e / devices / android_kernel_sony_msm8994_rework

arch/arm/boot/dts/qcom/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,10 +102,10 @@ dtb-$(CONFIG_ARCH_APQ8084) += apq8084-liquid.dtb \
		apq8084-smb1359-mdm9x35-alt-mtp.dtb \
		apq8084-smb349-cdp.dtb \
		apq8084-smb349-mtp.dtb \
		apq8084-nocharger-cdp.dtb \
		apq8084-smb1357-mdm9x35-alt-rcm.dtb \
		apq8084-smb1357-mdm9x35-mtp.dtb \
		apq8084-smb1357-mdm9x35-cdp.dtb \
		apq8084-smb1357-mdm9x35-alt-cdp.dtb \
		apq8084-mdm9x35-alt-cdp.dtb \
		apq8084-sbc.dtb
		dtb-$(CONFIG_ARCH_MSM) += msmplutonium-sim.dtb

+21 −1

Original line number	Diff line number	Diff line
		@@ -16,12 +16,13 @@
		#include "apq8084-cdp.dtsi"

		/ {
		model = "Qualcomm APQ 8084, SMB1357 CDP";
		model = "Qualcomm APQ 8084, MDM9x35 ALT CDP";
		compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";
		qcom,board-id = <1 6>;
		};

		&soc {
		/* No smb charger */
		usb_detect {
		compatible = "qcom,qpnp-usbdetect";
		interrupt-parent = <&spmi_bus>;
		@@ -29,3 +30,22 @@
		interrupt-names = "vbus_det_irq";
		};
		};

		&mdm1 {
		interrupt-map = <0 &msmgpio 111 0x3
		1 &msmgpio 109 0x3
		2 &msmgpio 113 0x3
		3 &msmgpio 115 0x3>;
		qcom,mdm2ap-errfatal-gpio = <&msmgpio 111 0x00>;
		qcom,ap2mdm-errfatal-gpio = <&msmgpio 112 0x00>;
		qcom,mdm2ap-status-gpio = <&msmgpio 109 0x00>;
		qcom,ap2mdm-status-gpio = <&msmgpio 110 0x00>;
		qcom,ap2mdm-soft-reset-gpio = <&msmgpio 128 0x00>;
		qcom,mdm2ap-pblrdy-gpio = <&msmgpio 113 0x00>;
		qcom,ap2mdm-wakeup-gpio = <&msmgpio 108 0x00>;
		qcom,ap2mdm-vddmin-gpio = <&msmgpio 114 0x00>;
		qcom,mdm2ap-vddmin-gpio = <&msmgpio 115 0x00>;
		qcom,mdm-dual-link;
		status = "ok";
		};

+2 −3

Original line number	Diff line number	Diff line
		@@ -16,10 +16,9 @@
		#include "apq8084-cdp.dtsi"

		/ {
		model = "Qualcomm APQ 8084, SMB1357 MDM9x35 ALT CDP";
		model = "Qualcomm APQ 8084, SMB1357 MDM9x35 ALT RCM";
		compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";
		qcom,board-id = <1 6>,
		<21 6>;
		qcom,board-id = <21 6>;
		};

		&i2c_0 {

+1 −3

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@
		model = "Qualcomm APQ 8084, SMB1357 MDM9x35 CDP";
		compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";
		qcom,board-id = <1 3>,
		<1 6>,
		<21 3>,
		<21 6>;
		<21 3>;
		};

		&i2c_0 {