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

Commit 6dd600c5 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: Support additional APQ8084 CDP variants"

parents 923be5b0 804f05ff
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ dtb-$(CONFIG_ARCH_APQ8084) += apq8084-sim.dtb \
	apq8084-smb1359-mtp.dtb \
	apq8084-smb349-cdp.dtb \
	apq8084-smb349-mtp.dtb \
	apq8084-nocharger-cdp.dtb \
	apq8084-sbc.dtb

DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
+31 −0
Original line number Diff line number Diff line
/* Copyright (c) 2014, 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 "apq8084.dtsi"
#include "apq8084-cdp.dtsi"

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

&soc {
	usb_detect {
		compatible = "qcom,qpnp-usbdetect";
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xca 0x0>;  /* PMA8084 GPIO 11 */
		interrupt-names = "vbus_det_irq";
	};
};
+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@
			<1 4>,
			<21 2>,
			<21 3>,
			<21 4>;
			<21 4>,
			<21 6>;
};

&i2c_0 {