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

Commit 4d49e364 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 NO jacktype for SDM630"

parents 5a092dc8 971e647e

arch/arm/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -205,7 +205,11 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \ 
	sda630-rcm.dtb \

	sda630-pm660a-mtp.dtb \

	sda630-pm660a-cdp.dtb \

	sda630-pm660a-rcm.dtb

	sda630-pm660a-rcm.dtb \

	sdm630-headset-jacktype-no-cdp.dtb \

	sdm630-headset-jacktype-no-rcm.dtb \

	sdm630-pm660a-headset-jacktype-no-cdp.dtb \

	sdm630-pm660a-headset-jacktype-no-rcm.dtb



ifeq ($(CONFIG_ARM64),y)

always          := $(dtb-y)

arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-cdp.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L, Headset Jacktype NO, CDP";

	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";

	qcom,board-id = <1 2>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/sdm630-headset-jacktype-no-rcm.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L, Headset Jacktype NO, RCM";

	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";

	qcom,board-id = <21 2>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-cdp.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"

#include "msm-pm660a.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A, Headset Jacktype NO, CDP";

	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";

	qcom,board-id = <1 2>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/sdm630-pm660a-headset-jacktype-no-rcm.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"

#include "msm-pm660a.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A, Headset Jacktype NO, RCM";

	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";

	qcom,board-id = <21 2>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};