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

Commit 85b6ea70 authored by Kaushal Kumar's avatar Kaushal Kumar Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Add device tree support for sxr1130 



Add base device tree and overlay support for sxr1130
MTP and CDP board variants. Support both internal and
external audio codec variants. Support USB type-C
connector as well. Also support both PM660L and PM660A.

Change-Id: I8973c0cce404813033436bc060b8bfcabcf61840
Signed-off-by: default avatarKaushal Kumar <kaushalk@codeaurora.org>
parent cebe1742

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ SoCs: 
- SDA670

  compatible = "qcom,sda670"



- SXR1130

  compatible = "qcom,sxr1130"



- MSM8952

  compatible = "qcom,msm8952"
@@ -321,6 +324,8 @@ compatible = "qcom,sda845-mtp" 
compatible = "qcom,sda845-qrd"

compatible = "qcom,sda845-hdk"

compatible = "qcom,sda845-svr"

compatible = "qcom,sxr1130-cdp"

compatible = "qcom,sxr1130-mtp"

compatible = "qcom,sdm670-rumi"

compatible = "qcom,sdm670-cdp"

compatible = "qcom,sdm670-mtp"

arch/arm64/boot/dts/qcom/Makefile

+35 −2
Original line number Diff line number Diff line
@@ -174,7 +174,18 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm710-tasha-codec-cdp-overlay.dtbo \

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

		sdm710-aqt1000-cdp-overlay.dtbo \

		sdm710-pm660a-aqt1000-cdp-overlay.dtbo

		sdm710-pm660a-aqt1000-cdp-overlay.dtbo \

		sxr1130-cdp-overlay.dtbo \

		sxr1130-external-codec-cdp-overlay.dtbo \

		sxr1130-mtp-overlay.dtbo \

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

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

		sxr1130-pm660a-mtp-overlay.dtbo \

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

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

		sxr1130-usbc-external-codec-pm660a-mtp-overlay.dtbo \

		sxr1130-usbc-mtp-overlay.dtbo \

		sxr1130-usbc-pm660a-mtp-overlay.dtbo



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

sdm670-mtp-overlay.dtbo-base := sdm670.dtb
@@ -237,6 +248,17 @@ sdm710-tasha-codec-cdp-overlay.dtbo-base := sdm710.dtb 
sdm710-pm660a-tasha-codec-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-aqt1000-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-pm660a-aqt1000-cdp-overlay.dtbo-base := sdm710.dtb

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

sxr1130-external-codec-cdp-overlay.dtbo-base := sxr1130.dtb

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

sxr1130-external-codec-mtp-overlay.dtbo-base := sxr1130.dtb

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

sxr1130-pm660a-mtp-overlay.dtbo-base := sxr1130.dtb

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

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

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

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

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



else

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
@@ -295,7 +317,18 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	sdm710-usbc-pm660a-cdp.dtb \

	sdm710-usbc-pm660a-mtp.dtb \

	sdm710-tasha-codec-cdp.dtb \

	sdm710-pm660a-tasha-codec-cdp.dtb

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

	sxr1130-cdp.dtb \

	sxr1130-external-codec-cdp.dtb \

	sxr1130-mtp.dtb \

	sxr1130-external-codec-mtp.dtb \

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

	sxr1130-pm660a-mtp.dtb \

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

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

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

	sxr1130-usbc-mtp.dtb \

	sxr1130-usbc-pm660a-mtp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sxr1130-cdp-overlay.dts

0 → 100644
+78 −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. SXR1130 PM660 + PM660L CDP";

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

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

	qcom,board-id = <1 0>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};



&cam_cci {

	/delete-node/ qcom,cam-sensor@1;

	qcom,cam-sensor@1 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		reg = <0x1>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;

		cam_vdig-supply = <&camera_rear_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vdig", "cam_vio", "cam_vana",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1352000 1800000 2850000 0>;

		rgltr-max-voltage = <1352000 1800000 2850000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 28 0>;

		gpio-reset = <1>;

		gpio-req-tbl-num = <0 1>;

		gpio-req-tbl-flags = <1 0>;

		gpio-req-tbl-label = "CAMIF_MCLK0",

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

arch/arm64/boot/dts/qcom/sxr1130-cdp.dts

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

#include "sdm670-cdp.dtsi"

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SXR1130 PM660 + PM660L CDP";

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

	qcom,board-id = <1 0>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};



&cam_cci {

	/delete-node/ qcom,cam-sensor@1;

	qcom,cam-sensor@1 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		reg = <0x1>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&camera_vio_ldo>;

		cam_vana-supply = <&camera_vana_ldo>;

		cam_vdig-supply = <&camera_rear_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vdig", "cam_vio", "cam_vana",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1352000 1800000 2850000 0>;

		rgltr-max-voltage = <1352000 1800000 2850000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 28 0>;

		gpio-reset = <1>;

		gpio-req-tbl-num = <0 1>;

		gpio-req-tbl-flags = <1 0>;

		gpio-req-tbl-label = "CAMIF_MCLK0",

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

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

0 → 100644
+34 −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-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SXR1130 PM660 + PM660L Ext. Audio Codec CDP";

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

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

	qcom,board-id = <1 1>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};