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

Commit 608f46f2 authored by Hemant Kumar's avatar Hemant Kumar
Browse files

ARM: dts: msm: Add secondary USB configuration for kona 



Add support for second USB controller and PHYs on kona. Add
nodes for GPIO based extcon on CDP and MTP which is used to
notify cable connection status via VBUS and ID pins. Also use
secondary phandles for regulators which match the naming scheme
used in the power grid hardware documentation.

Change-Id: I353671184302c0b806ba3ac7df6b05b83f364674
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
parent 92537f8c

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 */



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

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



#include "kona-pmic-overlay.dtsi"

#include "kona-sde-display.dtsi"

#include "kona-camera-sensor-cdp.dtsi"
@@ -152,6 +154,18 @@ 
		qca,bt-vdd-rfa1-voltage-level = <1900000 1900000>;

		qca,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

	};



	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;

		id-gpio = <&tlmm 91 GPIO_ACTIVE_HIGH>;

		vbus-out-gpio = <&pm8150_gpios 9 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default

			     &usb2_id_det_default

			     &usb2_vbus_boost_default>;

	};

};



&dsi_sw43404_amoled_cmd {
@@ -643,3 +657,6 @@ 
	status = "ok";

};



&usb1 {

	extcon = <&extcon_usb1>;

};

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 */



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

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



#include "kona-pmic-overlay.dtsi"

#include "kona-sde-display.dtsi"

#include "kona-camera-sensor-mtp.dtsi"
@@ -150,6 +152,18 @@ 
		#include "fg-gen4-batterydata-alium-3600mah.dtsi"

		#include "fg-gen4-batterydata-ascent-3450mah.dtsi"

	};



	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;

		id-gpio = <&tlmm 91 GPIO_ACTIVE_HIGH>;

		vbus-out-gpio = <&pm8150_gpios 9 GPIO_ACTIVE_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&usb2_vbus_det_default

			     &usb2_id_det_default

			     &usb2_vbus_boost_default>;

	};

};



&vreg_hap_boost {
@@ -503,3 +517,6 @@ 
	status = "ok";

};



&usb1 {

	extcon = <&extcon_usb1>;

};

arch/arm64/boot/dts/qcom/kona-pinctrl.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -3852,5 +3852,14 @@ 
				};

			};

		};



		usb2_id_det_default: usb2_id_det_default {

			config {

				pins = "gpio91";

				function = "gpio";

				input-enable;

				bias-pull-up;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/kona-pmic-overlay.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -56,6 +56,25 @@ 
			power-source = <1>;

		};

	};



	usb2_vbus_boost {

		usb2_vbus_boost_default: usb2_vbus_boost_default {

			pins = "gpio9";

			function = "normal";

			output-low;

			power-source = <1>;	/* 1.8V input supply */

		};

	};



	usb2_vbus_det {

		usb2_vbus_det_default: usb2_vbus_det_default {

			pins = "gpio10";

			function = "normal";

			input-enable;

			bias-pull-down;

			power-source = <1>;	/* 1.8V input supply */

		};

	};

};



&pm8150b_gpios {

arch/arm64/boot/dts/qcom/kona-usb.dtsi

+238 −0
Original line number Diff line number Diff line
@@ -347,4 +347,242 @@ 
	usb_nop_phy: usb_nop_phy {

		compatible = "usb-nop-xceiv";

	};



	/* Secondary USB port related controller */

	usb1: ssusb@a800000 {

		compatible = "qcom,dwc-usb3-msm";

		reg = <0xa800000 0x100000>;

		reg-names = "core_base";



		iommus = <&apps_smmu 0x20 0x0>;

		qcom,iommu-dma = "atomic";

		qcom,iommu-dma-addr-pool = <0x90000000 0x60000000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		interrupts-extended = <&pdc 12 IRQ_TYPE_LEVEL_HIGH>,

			     <&intc GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,

			     <&pdc 16 IRQ_TYPE_LEVEL_HIGH>,

			     <&pdc 13 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "dp_hs_phy_irq", "pwr_event_irq",

				"ss_phy_irq", "dm_hs_phy_irq";

		qcom,use-pdc-interrupts;



		USB3_GDSC-supply = <&usb30_sec_gdsc>;

		clocks = <&clock_gcc GCC_USB30_SEC_MASTER_CLK>,

		       <&clock_gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>,

		       <&clock_gcc GCC_AGGRE_USB3_SEC_AXI_CLK>,

		       <&clock_gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,

		       <&clock_gcc GCC_USB30_SEC_SLEEP_CLK>,

		       <&clock_gcc GCC_USB3_SEC_CLKREF_EN>;



		clock-names = "core_clk", "iface_clk", "bus_aggr_clk",

				"utmi_clk", "sleep_clk", "xo";



		resets = <&clock_gcc GCC_USB30_SEC_BCR>;

		reset-names = "core_reset";



		qcom,core-clk-rate = <200000000>;

		qcom,core-clk-rate-hs = <66666667>;

		qcom,num-gsi-evt-buffs = <0x3>;

		qcom,gsi-reg-offset =

			<0x0fc /* GSI_GENERAL_CFG */

			 0x110 /* GSI_DBL_ADDR_L */

			 0x120 /* GSI_DBL_ADDR_H */

			 0x130 /* GSI_RING_BASE_ADDR_L */

			 0x144 /* GSI_RING_BASE_ADDR_H */

			 0x1a4>; /* GSI_IF_STS */

		qcom,dwc-usb3-msm-tx-fifo-size = <27696>;

		qcom,charging-disabled;



		qcom,msm-bus,name = "usb1";

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <3>;

		qcom,msm-bus,vectors-KBps =

			/*  suspend vote */

			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_EBI_CH0 0 0>,

			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_IPA_CFG 0 0>,

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3_1 0 0>,



			/*  nominal vote */

			<MSM_BUS_MASTER_USB3_1

				MSM_BUS_SLAVE_EBI_CH0 1000000 2500000>,

			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_IPA_CFG 0 2400>,

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3_1 0 40000>,



			/*  svs vote */

			<MSM_BUS_MASTER_USB3_1

				MSM_BUS_SLAVE_EBI_CH0 240000 700000>,

			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_IPA_CFG 0 2400>,

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3_1 0 40000>;



		dwc3@a800000 {

			compatible = "snps,dwc3";

			reg = <0xa800000 0xcd00>;

			interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

			usb-phy = <&usb2_phy1>, <&usb_qmp_phy>;

			linux,sysdev_is_parent;

			snps,disable-clk-gating;

			snps,has-lpm-erratum;

			snps,hird-threshold = /bits/ 8 <0x10>;

			snps,usb3_lpm_capable;

			usb-core-id = <1>;

			tx-fifo-resize;

			maximum-speed = "super-speed";

			dr_mode = "drd";

		};

	};



	/* Primary USB port related High Speed PHY */

	usb2_phy1: hsphy@88e4000 {

		compatible = "qcom,usb-hsphy-snps-femto";

		reg = <0x88e4000 0x110>;

		reg-names = "hsusb_phy_base";



		vdd-supply = <&pm8150_l5>;

		vdda18-supply = <&pm8150_l12>;

		vdda33-supply = <&pm8150_l2>;

		qcom,vdd-voltage-level = <0 880000 880000>;



		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clock-names = "ref_clk_src";



		resets = <&clock_gcc GCC_QUSB2PHY_SEC_BCR>;

		reset-names = "phy_reset";

	};



	/* Secondary USB port related QMP PHY */

	usb_qmp_phy: ssphy@88eb000 {

		compatible = "qcom,usb-ssphy-qmp-v2";

		reg = <0x88eb000 0x1000>,

		    <0x088eb88c 0x4>;

		reg-names = "qmp_phy_base",

			"pcs_clamp_enable_reg";



		vdd-supply = <&pm8150_l18>;

		qcom,vdd-voltage-level = <0 880000 880000>;

		qcom,vdd-max-load-uA = <47000>;

		core-supply = <&pm8150_l9>;

		qcom,vbus-valid-override;

		qcom,qmp-phy-init-seq =

		    /* <reg_offset, value, delay> */

		    <USB3_UNI_QSERDES_COM_SYSCLK_EN_SEL 0x1a 0

		     USB3_UNI_QSERDES_COM_BIN_VCOCAL_HSCLK_SEL 0x11 0

		     USB3_UNI_QSERDES_COM_HSCLK_SEL 0x01 0

		     USB3_UNI_QSERDES_COM_DEC_START_MODE0 0x82 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START1_MODE0 0xab 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START2_MODE0 0xea 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START3_MODE0 0x02 0

		     USB3_UNI_QSERDES_COM_BIN_VCOCAL_CMP_CODE1_MODE0 0xca 0

		     USB3_UNI_QSERDES_COM_BIN_VCOCAL_CMP_CODE2_MODE0 0x1e 0

		     USB3_UNI_QSERDES_COM_CP_CTRL_MODE0 0x06 0

		     USB3_UNI_QSERDES_COM_PLL_RCTRL_MODE0 0x16 0

		     USB3_UNI_QSERDES_COM_PLL_CCTRL_MODE0 0x36 0

		     USB3_UNI_QSERDES_COM_VCO_TUNE1_MODE0 0x24 0

		     USB3_UNI_QSERDES_COM_LOCK_CMP2_MODE0 0x34 0

		     USB3_UNI_QSERDES_COM_LOCK_CMP1_MODE0 0x14 0

		     USB3_UNI_QSERDES_COM_LOCK_CMP_EN 0x04 0

		     USB3_UNI_QSERDES_COM_SYSCLK_BUF_ENABLE 0x0a 0

		     USB3_UNI_QSERDES_COM_VCO_TUNE2_MODE1 0x02 0

		     USB3_UNI_QSERDES_COM_VCO_TUNE1_MODE1 0x24 0

		     USB3_UNI_QSERDES_COM_CORECLK_DIV_MODE1 0x08 0

		     USB3_UNI_QSERDES_COM_DEC_START_MODE1 0x82 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START1_MODE1 0xab 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START2_MODE1 0xea 0

		     USB3_UNI_QSERDES_COM_DIV_FRAC_START3_MODE1 0x02 0

		     USB3_UNI_QSERDES_COM_LOCK_CMP2_MODE1 0x82 0

		     USB3_UNI_QSERDES_COM_LOCK_CMP1_MODE1 0x34 0

		     USB3_UNI_QSERDES_COM_CP_CTRL_MODE1 0x06 0

		     USB3_UNI_QSERDES_COM_PLL_RCTRL_MODE1 0x16 0

		     USB3_UNI_QSERDES_COM_PLL_CCTRL_MODE1 0x36 0

		     USB3_UNI_QSERDES_COM_BIN_VCOCAL_CMP_CODE1_MODE1 0xca 0

		     USB3_UNI_QSERDES_COM_BIN_VCOCAL_CMP_CODE2_MODE1 0x1e 0

		     USB3_UNI_QSERDES_COM_CMN_IPTRIM 0x20 0

		     USB3_UNI_QSERDES_COM_SSC_EN_CENTER 0x01 0

		     USB3_UNI_QSERDES_COM_SSC_PER1 0x31 0

		     USB3_UNI_QSERDES_COM_SSC_PER2 0x01 0

		     USB3_UNI_QSERDES_COM_SSC_STEP_SIZE1_MODE1 0xde 0

		     USB3_UNI_QSERDES_COM_SSC_STEP_SIZE2_MODE1 0x07 0

		     USB3_UNI_QSERDES_COM_SSC_STEP_SIZE1_MODE0 0xde 0

		     USB3_UNI_QSERDES_COM_SSC_STEP_SIZE2_MODE0 0x07 0

		     USB3_UNI_QSERDES_COM_VCO_TUNE_MAP 0x02 0

		     USB3_UNI_QSERDES_RX_RX_MODE_00_HIGH4 0xb8 0

		     USB3_UNI_QSERDES_RX_RX_MODE_00_HIGH3 0xff 0

		     USB3_UNI_QSERDES_RX_RX_MODE_00_HIGH2 0xb7 0

		     USB3_UNI_QSERDES_RX_RX_MODE_00_HIGH 0x7f 0

		     USB3_UNI_QSERDES_RX_RX_MODE_00_LOW 0x7f 0

		     USB3_UNI_QSERDES_RX_RX_MODE_01_HIGH4 0xb4 0

		     USB3_UNI_QSERDES_RX_RX_MODE_01_HIGH3 0x7b 0

		     USB3_UNI_QSERDES_RX_RX_MODE_01_HIGH2 0x5c 0

		     USB3_UNI_QSERDES_RX_RX_MODE_01_HIGH 0xdc 0

		     USB3_UNI_QSERDES_RX_RX_MODE_01_LOW 0xdc 0

		     USB3_UNI_QSERDES_RX_UCDR_PI_CONTROLS 0x99 0

		     USB3_UNI_QSERDES_RX_UCDR_SB2_THRESH1 0x04 0

		     USB3_UNI_QSERDES_RX_UCDR_SB2_THRESH2 0x08 0

		     USB3_UNI_QSERDES_RX_UCDR_SB2_GAIN1 0x05 0

		     USB3_UNI_QSERDES_RX_UCDR_SB2_GAIN2 0x05 0

		     USB3_UNI_QSERDES_RX_UCDR_FASTLOCK_FO_GAIN 0x2f 0

		     USB3_UNI_QSERDES_RX_UCDR_FASTLOCK_COUNT_LOW 0xff 0

		     USB3_UNI_QSERDES_RX_UCDR_FASTLOCK_COUNT_HIGH 0x0f 0

		     USB3_UNI_QSERDES_RX_UCDR_SO_SATURATION_AND_ENABLE 0x7f 0

		     USB3_UNI_QSERDES_RX_UCDR_FO_GAIN 0x0a 0

		     USB3_UNI_QSERDES_RX_VGA_CAL_CNTRL1 0x54 0

		     USB3_UNI_QSERDES_RX_VGA_CAL_CNTRL2 0x0c 0

		     USB3_UNI_QSERDES_RX_RX_EQU_ADAPTOR_CNTRL2 0x0f 0

		     USB3_UNI_QSERDES_RX_RX_EQU_ADAPTOR_CNTRL3 0x4a 0

		     USB3_UNI_QSERDES_RX_RX_EQU_ADAPTOR_CNTRL4 0x0a 0

		     USB3_UNI_QSERDES_RX_DFE_EN_TIMER 0x04 0

		     USB3_UNI_QSERDES_RX_RX_EQ_OFFSET_ADAPTOR_CNTRL1 0x47 0

		     USB3_UNI_QSERDES_RX_RX_OFFSET_ADAPTOR_CNTRL2 0x80 0

		     USB3_UNI_QSERDES_RX_SIGDET_CNTRL 0x04 0

		     USB3_UNI_QSERDES_RX_SIGDET_DEGLITCH_CNTRL 0x0e 0

		     USB3_UNI_QSERDES_RX_RX_IDAC_TSETTLE_HIGH 0x00 0

		     USB3_UNI_QSERDES_RX_RX_IDAC_TSETTLE_LOW 0xc0 0

		     USB3_UNI_QSERDES_RX_DFE_CTLE_POST_CAL_OFFSET 0x38 0

		     USB3_UNI_QSERDES_RX_UCDR_SO_GAIN 0x06 0

		     USB3_UNI_QSERDES_RX_DCC_CTRL1 0x0c 0

		     USB3_UNI_QSERDES_RX_GM_CAL 0x1f 0

		     USB3_UNI_QSERDES_TX_RCV_DETECT_LVL_2 0x12 0

		     USB3_UNI_QSERDES_TX_LANE_MODE_1 0xd5 0

		     USB3_UNI_QSERDES_TX_PI_QEC_CTRL 0x54 0

		     USB3_UNI_QSERDES_TX_RES_CODE_LANE_OFFSET_TX 0x08 0

		     USB3_UNI_PCS_LOCK_DETECT_CONFIG1 0xd0 0

		     USB3_UNI_PCS_LOCK_DETECT_CONFIG2 0x07 0

		     USB3_UNI_PCS_LOCK_DETECT_CONFIG3 0x20 0

		     USB3_UNI_PCS_LOCK_DETECT_CONFIG6 0x13 0

		     USB3_UNI_PCS_RCVR_DTCT_DLY_P1U2_L 0xe7 0

		     USB3_UNI_PCS_RCVR_DTCT_DLY_P1U2_H 0x03 0

		     USB3_UNI_PCS_RX_SIGDET_LVL 0xaa 0

		     USB3_UNI_PCS_PCS_TX_RX_CONFIG 0x0c 0

		     USB3_UNI_PCS_USB3_RXEQTRAINING_DFE_TIME_S2 0x07 0

		     USB3_UNI_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL 0xf8 0

		     USB3_UNI_PCS_CDR_RESET_TIME 0x0a 0

		     USB3_UNI_PCS_ALIGN_DETECT_CONFIG1 0x88 0

		     USB3_UNI_PCS_ALIGN_DETECT_CONFIG2 0x13 0

		     USB3_UNI_PCS_EQ_CONFIG1 0x4b 0

		     USB3_UNI_PCS_EQ_CONFIG5 0x10 0

		     USB3_UNI_PCS_REFGEN_REQ_CONFIG1 0x21 0

		     0xffffffff 0xffffffff 0x00>;



		qcom,qmp-phy-reg-offset =

				<USB3_UNI_PCS_PCS_STATUS1

				 USB3_UNI_PCS_USB3_AUTONOMOUS_MODE_CTRL

				 USB3_UNI_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR

				 USB3_UNI_PCS_POWER_DOWN_CONTROL

				 USB3_UNI_PCS_SW_RESET

				 USB3_UNI_PCS_START_CONTROL>;



		clocks = <&clock_gcc GCC_USB3_SEC_PHY_AUX_CLK>,

			 <&clock_gcc GCC_USB3_SEC_PHY_PIPE_CLK>,

			 <&clock_rpmh RPMH_CXO_CLK>,

			 <&clock_gcc GCC_USB3_SEC_CLKREF_EN>,

			 <&clock_gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>;

		clock-names = "aux_clk", "pipe_clk", "ref_clk_src",

				"ref_clk", "com_aux_clk";



		resets = <&clock_gcc GCC_USB3_PHY_SEC_BCR>,

			<&clock_gcc GCC_USB3PHY_PHY_SEC_BCR>;

		reset-names = "phy_reset", "phy_phy_reset";

	};

};