Merge "arm: dts: 8084: Distinguish boards with mdm9x25, mdm9x35 and mdm9x35-alt" (d7ca116f) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/Makefile

+4 −1

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

		DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

arch/arm/boot/dts/qcom/apq8084-mtp.dtsi

+0 −17

Original line number	Diff line number	Diff line
		@@ -143,23 +143,6 @@
		status = "ok";
		};

		&mdm0 {
		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>;
		status = "ok";
		};

		/* CoreSight */
		&tpiu {
		qcom,seta-gpios = <&msmgpio 4 0>,

arch/arm/boot/dts/qcom/apq8084-smb1357-cdp.dts

+18 −4

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

		&i2c_0 {
		@@ -44,6 +41,23 @@
		};
		};

		&mdm0 {
		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>;
		status = "ok";
		};

		&usb3 {
		vbus_dwc3-supply = <&smb1357_otg_vreg>;
		};

arch/arm/boot/dts/qcom/apq8084-smb1357-mdm9x35-alt-cdp.dts

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-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 MDM9x35 ALT CDP";
		compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";
		qcom,board-id = <1 6>,
		<21 6>;
		};

		&i2c_0 {
		smb1357_otg_vreg: smb1357-charger@1c {
		compatible = "qcom,smb1357-charger";
		reg = <0x1c>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xcd 0x0>; /* PMA8084 GPIO 14 */
		qcom,float-voltage-mv = <4200>;
		qcom,charging-timeout = <1536>;
		qcom,recharge-thresh-mv = <200>;
		qcom,iterm-ma = <100>;
		regulator-name = "smb1357_otg_vreg";
		qcom,soft-vfloat-comp-disabled;
		therm-bias-supply = <&pma8084_lvs2>;
		qcom,thermal-mitigation = <1500 700 600 0>;
		};
		};

		&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";
		};

		&usb3 {
		vbus_dwc3-supply = <&smb1357_otg_vreg>;
		};

arch/arm/boot/dts/qcom/apq8084-smb1357-mdm9x35-cdp.dts

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-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 MDM9x35 CDP";
		compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";
		qcom,board-id = <1 3>,
		<1 6>,
		<21 3>,
		<21 6>;
		};

		&i2c_0 {
		smb1357_otg_vreg: smb1357-charger@1c {
		compatible = "qcom,smb1357-charger";
		reg = <0x1c>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xcd 0x0>; /* PMA8084 GPIO 14 */
		qcom,float-voltage-mv = <4200>;
		qcom,charging-timeout = <1536>;
		qcom,recharge-thresh-mv = <200>;
		qcom,iterm-ma = <100>;
		regulator-name = "smb1357_otg_vreg";
		qcom,soft-vfloat-comp-disabled;
		therm-bias-supply = <&pma8084_lvs2>;
		qcom,thermal-mitigation = <1500 700 600 0>;
		};
		};

		&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";
		};

		&usb3 {
		vbus_dwc3-supply = <&smb1357_otg_vreg>;
		};