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

Commit ab33986f 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 Tasha codec"

parents 522f6889 e0c77e7f

arch/arm64/boot/dts/qcom/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sda670-mtp-overlay.dtbo \

		sda670-pm660a-cdp-overlay.dtbo \

		sda670-pm660a-mtp-overlay.dtbo \

		sdm670-tasha-codec-cdp-overlay.dtbo \

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

		qcs605-cdp-overlay.dtbo \

		qcs605-mtp-overlay.dtbo \

		qcs605-360camera-overlay.dtbo \
@@ -149,6 +151,8 @@ 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

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

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

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

sda670-mtp-overlay.dtbo-base := sda670.dtb

sda670-pm660a-cdp-overlay.dtbo-base := sda670.dtb
@@ -181,6 +185,8 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	sdm670-usbc-pm660a-mtp.dtb \

	sda670-mtp.dtb \

	sda670-cdp.dtb \

	sdm670-tasha-codec-cdp.dtb \

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

	sda670-pm660a-mtp.dtb \

	sda670-pm660a-cdp.dtb \

	qcs605-360camera.dtb \

arch/arm64/boot/dts/qcom/sdm670-pm660a-tasha-codec-cdp-overlay.dts

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

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660A + Tasha Codec CDP";

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

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

	qcom,board-id = <1 5>;

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

		       <0x0001001b 0x0002001a 0x0 0x0>,

		       <0x0001001b 0x0202001a 0x0 0x0>;

};



&dsi_dual_nt35597_truly_video_display {

	/delete-property/ qcom,dsi-display-active;

};



&dsi_panel_pwr_supply_labibb_amoled {

	qcom,panel-supply-entry@2 {

		reg = <2>;

		qcom,supply-name = "lab";

		qcom,supply-min-voltage = <4600000>;

		qcom,supply-max-voltage = <6100000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};



	qcom,panel-supply-entry@3 {

		reg = <3>;

		qcom,supply-name = "ibb";

		qcom,supply-min-voltage = <4000000>;

		qcom,supply-max-voltage = <6300000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};



	qcom,panel-supply-entry@4 {

		reg = <4>;

		qcom,supply-name = "oledb";

		qcom,supply-min-voltage = <5000000>;

		qcom,supply-max-voltage = <8100000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

	oledb-supply = <&pm660a_oledb>;

};

arch/arm64/boot/dts/qcom/sdm670-pm660a-tasha-codec-cdp.dts

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

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660A Tasha Codec CDP";

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

	qcom,board-id = <1 5>;

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

		       <0x0001001b 0x0002001a 0x0 0x0>,

		       <0x0001001b 0x0202001a 0x0 0x0>;

};



&dsi_dual_nt35597_truly_video_display {

	/delete-property/ qcom,dsi-display-active;

};



&dsi_panel_pwr_supply_labibb_amoled {

	qcom,panel-supply-entry@2 {

		reg = <2>;

		qcom,supply-name = "lab";

		qcom,supply-min-voltage = <4600000>;

		qcom,supply-max-voltage = <6100000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};



	qcom,panel-supply-entry@3 {

		reg = <3>;

		qcom,supply-name = "ibb";

		qcom,supply-min-voltage = <4000000>;

		qcom,supply-max-voltage = <6300000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};



	qcom,panel-supply-entry@4 {

		reg = <4>;

		qcom,supply-name = "oledb";

		qcom,supply-min-voltage = <5000000>;

		qcom,supply-max-voltage = <8100000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

	oledb-supply = <&pm660a_oledb>;

};

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 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-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L Tasha Codec CDP";

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

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

	qcom,board-id = <1 5>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm670-tasha-codec-cdp.dts

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 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-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L Tasha Codec CDP";

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

	qcom,board-id = <1 5>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};