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

Commit d9e1af55 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add USB support on sm6150-interposer-trinket"

parents 15ac1fdc e92e8ba7

arch/arm64/boot/dts/qcom/sm6150-interposer-trinket-idp.dtsi

+30 −1
Original line number Diff line number Diff line
@@ -11,8 +11,37 @@ 
 * GNU General Public License for more details.

 */



#include "sm6150-idp.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



&pm6125_gpios {

	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio5";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm6125_gpios 5 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			linux,can-disable;

			debounce-interval = <15>;

			gpio-key,wakeup;

		};

	};

};

arch/arm64/boot/dts/qcom/sm6150-interposer-trinket.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include "sm6150.dtsi"

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



/ {

	model = "Qualcomm Technologies, Inc. SM6150 Interposer TRINKET";
@@ -19,3 +20,24 @@ 
	qcom,msm-id = <355 0>;

};



&soc {

	clock_rpmcc: qcom,rpmcc {

	};

};



#include "sm6150-pm6125-interposer-trinket.dtsi"



&qusb_phy0 {

	vdd-supply = <&L7A>;

	vdda18-supply = <&L10A>;

	vdda33-supply = <&L15A>;

};



&usb_qmp_phy {

	vdd-supply = <&L7A>;

	core-supply = <&L10A>;

};



&usb0 {

	extcon = <&pmi632_charger>;

};

arch/arm64/boot/dts/qcom/sm6150-pm6125-interposer-trinket.dtsi

0 → 100644
+443 −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.

 */

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



&spmi_bus {

	/delete-node/ qcom,pm6150@0;

	/delete-node/ qcom,pm6150@1;

	/delete-node/ qcom,pm6150l@4;

	/delete-node/ qcom,pm6150l@5;

};



&thermal_zones {

	pm6150-tz {

		/delete-property/ thermal-sensors;

	};



	pm6150-ibat-lvl0 {

		/delete-property/ thermal-sensors;

	};



	pm6150-ibat-lvl1 {

		/delete-property/ thermal-sensors;



	};



	pm6150-vbat-lvl0 {

		/delete-property/ thermal-sensors;

	};



	pm6150-vbat-lvl1 {

		/delete-property/ thermal-sensors;

	};



	pm6150-vbat-lvl2 {

		/delete-property/ thermal-sensors;

	};



	pm6150l-tz {

		/delete-property/ thermal-sensors;

	};



	pm6150l-vph-lvl0 {

		/delete-property/ thermal-sensors;

	};



	pm6150l-vph-lvl1 {

		/delete-property/ thermal-sensors;

	};



	pm6150l-vph-lvl2 {

		/delete-property/ thermal-sensors;

	};



	xo-therm {

		/delete-property/ thermal-sensors;

	};



	sdm-therm {

		/delete-property/ thermal-sensors;

	};



	conn-therm {

		/delete-property/ thermal-sensors;

	};



	emmc_ufs-therm {

		/delete-property/ thermal-sensors;

	};



	rf_pa0_therm-therm {

		/delete-property/ thermal-sensors;

	};



	camera_flash-therm {

		/delete-property/ thermal-sensors;

	};



	quiet-therm {

		/delete-property/ thermal-sensors;

	};



	quiet-therm-step {

		/delete-property/ thermal-sensors;

	};



	soc {

		/delete-property/ thermal-sensors;

	};



	quiet-therm-step {

		cooling-maps {

			battery_lvl0 {

				/delete-property/ cooling-device;

			};



			battery_lvl1 {

				/delete-property/ cooling-device;

			};



			battery_lvl2 {

				/delete-property/ cooling-device;

			};



			battery_lvl3 {

				/delete-property/ cooling-device;

			};

		};

	};

};



&usb0 {

	/delete-property/ extcon;

};



&soc {

	qcom,lpass@62400000 {

		/delete-property/ vdd_cx-supply;

	};



	/* Regulators */

	/delete-node/ rpmh-regulator-modemlvl;

	/delete-node/ rpmh-regulator-lmxlvl;

	/delete-node/ rpmh-regulator-lcxlvl;



	rpmh-regulator-mxlvl {

		/delete-node/ regulator-pm6150-s3;

		/delete-node/ regulator-pm6150-s3-level-ao;



		VDD_MX_LEVEL:

		S5A_LEVEL: pm6150_s5_level: regulator-pm6150-s5 {

			regulator-name = "pm6150_s5_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

		};



		VDD_MX_LEVEL_AO:

		S5A_LEVEL_AO: pm6150_s5_level_ao: regulator-pm6150-s5-level-ao {

			regulator-name = "pm6150_s5_level_ao";

			qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;

			regulator-min-microvolt =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

		};

	};



	rpmh-regulator-cxlvl {

		/delete-property/ pm6150_s1_level-parent-supply;

		/delete-property/ pm6150_s1_level_ao-parent-supply;

		/delete-node/ regulator-pm6150-s1;

		/delete-node/ regulator-pm6150-s1-level-ao;

		VDD_CX_LEVEL:

		VDD_MSS_LEVEL:

		S3A_LEVEL: pm6150_s3_level: regulator-pm6150-s3 {

			regulator-name = "pm6150_s3_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};



		VDD_CX_LEVEL_AO:

		S3A_LEVEL_AO: pm6150_s3_level_ao: regulator-pm6150-s3-level-ao {

			qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;

			regulator-name = "pm6150_s3_level_ao";

			regulator-min-microvolt =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

					<RPMH_REGULATOR_LEVEL_RETENTION>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};

	};



	rpmh-regulator-ldoa5 {

		L5A: pm6150_l5: regulator-pm6150-l5 {

			regulator-min-microvolt = <1650000>;

			regulator-max-microvolt = <3100000>;

			qcom,init-voltage = <1650000>;

		};

	};



	rpmh-regulator-ldoa6 {

		L6A: pm6150_l6: regulator-pm6150-l6 {

			regulator-min-microvolt = <568000>;

			regulator-max-microvolt = <650000>;

			qcom,init-voltage = <568000>;

		};

	};



	rpmh-regulator-ldoa7 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa7";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L7A: pm6150_l7: regulator-pm6150-l7 {

			regulator-name = "pm6150_l7";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <975000>;

			qcom,init-voltage = <800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	/* pm6125 L8 - WCSS_CX supply */

	rpmh-regulator-ldoa8 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa8";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L8A: pm6150_l8: regulator-pm6150-l8 {

			regulator-name = "pm6150_l8";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <400000>;

			regulator-max-microvolt = <728000>;

			qcom,init-voltage = <400000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa9 {

		L9A: pm6150_l9: regulator-pm6150-l9 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1829000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpmh-regulator-ldoa10 {

		L10A: pm6150_l10: regulator-pm6150-l10 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1890000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpmh-regulator-ldoa11 {

		L11A: pm6150_l11: regulator-pm6150-l11 {

			regulator-min-microvolt = <1624000>;

			regulator-max-microvolt = <1984000>;

			qcom,init-voltage = <1624000>;

		};

	};



	rpmh-regulator-ldoa12 {

		L12A: pm6150_l12: regulator-pm6150-l12 {

			regulator-min-microvolt = <1648000>;

			regulator-max-microvolt = <1904000>;

			qcom,init-voltage = <1648000>;

		};

	};



	rpmh-regulator-ldoa13 {

		L13A: pm6150_l13: regulator-pm6150-l13 {

			regulator-min-microvolt = <1720000>;

			regulator-max-microvolt = <1824000>;

			qcom,init-voltage = <1720000>;

		};

	};



	rpmh-regulator-ldoa14 {

		L14A: pm6150_l14: regulator-pm6150-l14 {

			regulator-min-microvolt = <1696000>;

			regulator-max-microvolt = <1904000>;

			qcom,init-voltage = <1696000>;

		};

	};



	rpmh-regulator-ldoa15 {

		L15A: pm6150_l15: regulator-pm6150-l15 {

			regulator-min-microvolt = <2928000>;

			regulator-max-microvolt = <3230000>;

			qcom,init-voltage = <2928000>;

		};

	};



	rpmh-regulator-ldoa16 {

		L16A: pm6150_l16: regulator-pm6150-l16 {

			regulator-min-microvolt = <1648000>;

			regulator-max-microvolt = <1900000>;

			qcom,init-voltage = <1648000>;

		};

	};



	rpmh-regulator-ldoa17 {

		L17A: pm6150_l17: regulator-pm6150-l17 {

			regulator-min-microvolt = <1144000>;

			regulator-max-microvolt = <1304000>;

			qcom,init-voltage = <1144000>;

		};

	};



	rpmh-regulator-ldoa18 {

		L18A: pm6150_l18: regulator-pm6150-l18 {

			regulator-min-microvolt = <1136000>;

			regulator-max-microvolt = <1260000>;

			qcom,init-voltage = <1136000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa19 {

		L19A: pm6150_l19: regulator-pm6150-l19 {

			regulator-min-microvolt = <1650000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1650000>;

		};

	};



	rpmh-regulator-ldoa20 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa20";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L20A: pm6150_l20: regulator-pm6150-l20 {

			regulator-name = "pm6150_l20";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <1650000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1650000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa21 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa21";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L21A: pm6150_l21: regulator-pm6150-l21 {

			regulator-name = "pm6150_l21";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <2600000>;

			regulator-max-microvolt = <2856000>;

			qcom,init-voltage = <2600000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa22 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa22";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L22A: pm6150_l22: regulator-pm6150-l22 {

			regulator-name = "pm6150_l22";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <2944000>;

			regulator-max-microvolt = <3304000>;

			qcom,init-voltage = <2944000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa23 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa23";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L23A: pm6150_l23: regulator-pm6150-l23 {

			regulator-name = "pm6150_l23";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <3400000>;

			qcom,init-voltage = <2700000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	rpmh-regulator-ldoa24 {

		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa24";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		L24A: pm6150_l24: regulator-pm6150-l24 {

			regulator-name = "pm6150_l24";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <1696000>;

			regulator-max-microvolt = <3304000>;

			qcom,init-voltage = <1696000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};

};



#include "pm6125.dtsi"

#include "pmi632.dtsi"



&pm6125_clkdiv {

	/delete-property/ clocks;

	clocks = <&clock_rpmh RPMH_CXO_CLK>;

};