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

Commit ab4ec954 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 sdm670 device tree files for Audio over USB-C"

parents ef163140 55e6ed8e

arch/arm64/boot/dts/qcom/Makefile

+26 −2
Original line number Diff line number Diff line
@@ -84,7 +84,15 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm670-external-codec-cdp-overlay.dtbo \

		sdm670-external-codec-mtp-overlay.dtbo \

		sdm670-external-codec-pm660a-cdp-overlay.dtbo \

		sdm670-external-codec-pm660a-mtp-overlay.dtbo

		sdm670-external-codec-pm660a-mtp-overlay.dtbo \

		sdm670-usbc-cdp-overlay.dtbo \

		sdm670-usbc-mtp-overlay.dtbo \

		sdm670-usbc-pm660a-cdp-overlay.dtbo \

		sdm670-usbc-pm660a-mtp-overlay.dtbo \

		sdm670-usbc-external-codec-cdp-overlay.dtbo \

		sdm670-usbc-external-codec-mtp-overlay.dtbo \

		sdm670-usbc-external-codec-pm660a-cdp-overlay.dtbo \

		sdm670-usbc-external-codec-pm660a-mtp-overlay.dtbo



sdm670-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-mtp-overlay.dtbo-base := sdm670.dtb
@@ -95,6 +103,14 @@ sdm670-external-codec-cdp-overlay.dtbo-base := sdm670.dtb 
sdm670-external-codec-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-external-codec-pm660a-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-external-codec-pm660a-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-pm660a-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-pm660a-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-external-codec-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-external-codec-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-external-codec-pm660a-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-usbc-external-codec-pm660a-mtp-overlay.dtbo-base := sdm670.dtb

else

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \

	sdm670-mtp.dtb \
@@ -104,7 +120,15 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	sdm670-external-codec-cdp.dtb \

	sdm670-external-codec-mtp.dtb \

	sdm670-external-codec-pm660a-cdp.dtb \

	sdm670-external-codec-pm660a-mtp.dtb

	sdm670-external-codec-pm660a-mtp.dtb \

	sdm670-usbc-cdp.dtb \

	sdm670-usbc-external-codec-cdp.dtb \

	sdm670-usbc-external-codec-mtp.dtb \

	sdm670-usbc-external-codec-pm660a-cdp.dtb \

	sdm670-usbc-external-codec-pm660a-mtp.dtb \

	sdm670-usbc-mtp.dtb \

	sdm670-usbc-pm660a-cdp.dtb \

	sdm670-usbc-pm660a-mtp.dtb

endif



always		:= $(dtb-y)

arch/arm64/boot/dts/qcom/sdm670-usbc-cdp-overlay.dts

0 → 100644
+33 −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/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm670-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L, USB-C Audio, CDP";

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

	qcom,msm-id = <336 0x0>;

	qcom,board-id = <1 2>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm670-usbc-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 "sdm670.dtsi"

#include "sdm670-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L, USB-C Audio, CDP";

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

	qcom,board-id = <1 2>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm670-usbc-external-codec-cdp-overlay.dts

0 → 100644
+33 −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/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm670-cdp.dtsi"

#include "sdm670-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660+PM660L, USB-C Audio, Ext. Audio Codec CDP";

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

	qcom,msm-id = <336 0x0>;

	qcom,board-id = <1 3>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm670-usbc-external-codec-cdp.dts

0 → 100644
+27 −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 "sdm670.dtsi"

#include "sdm670-cdp.dtsi"

#include "sdm670-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 670 PM660+PM660L, USB-C Audio, Ext. Audio Codec CDP";

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

	qcom,board-id = <1 3>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};