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

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

Merge "ARM: dts: msm: Enable second instance of UFS as a storage device"

parents d4b996cb 19ea690c

arch/arm64/boot/dts/qcom/sa8195p-regulator.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ 
	rpmh-regulator-ldoc5 {

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

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa5";

		qcom,resource-name = "ldoc5";

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

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LPM

arch/arm64/boot/dts/qcom/sa8195p.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -330,6 +330,31 @@ 
	status= "ok";

};



&ufs2phy_mem {

	compatible = "qcom,ufs-phy-qmp-v4";

	vdda-phy-supply = <&pm8195_3_l5>;

	vdda-pll-supply = <&pm8195_1_l9>;

	vdda-phy-max-microamp = <138000>;

	vdda-pll-max-microamp = <65100>;



	status = "ok";

};



&ufshc2_mem {

	vdd-hba-supply = <&ufs_card_2_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8195_1_l17>;

	vcc-voltage-level = <2894000 2904000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8195_2_l5>;

	vccq2-supply = <&pm8195_s4>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <750000>;

	vccq2-max-microamp = <750000>;



	status= "ok";

};



&usb2_phy0 {

	vdd-supply = <&pm8195_3_l5>;

	vdda18-supply = <&pm8195_1_l12>;

arch/arm64/boot/dts/qcom/sdmshrike.dtsi

+154 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


	aliases {

		ufshc1 = &ufshc_mem; /* Embedded UFS slot */

		ufshc2 = &ufshc2_mem; /* Embedded 2nd UFS slot */

		sdhc2 = &sdhc_2; /* SDC2 SD Card slot */

		serial0 = &qupv3_se12_2uart;

		hsuart0 = &qupv3_se13_4uart;
@@ -2155,6 +2156,159 @@ 
		status = "disabled";

	};



	ufs2_ice: ufs2ice@1d70000 {

		compatible = "qcom,ice";

		reg = <0x1d70000 0x8000>;

		qcom,enable-ice-clk;

		clock-names = "ufs_core_clk",

				"iface_clk", "ice_core_clk";

		clocks = <&clock_gcc GCC_UFS_PHY_ICE_CORE_CLK>,

			 <&clock_gcc GCC_UFS_CARD_2_AHB_CLK>,

			 <&clock_gcc GCC_UFS_CARD_2_ICE_CORE_CLK>;

		qcom,op-freq-hz = <0>, <0>, <300000000>;

		vdd-hba-supply = <&ufs_card_2_gdsc>;

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

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

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

		qcom,msm-bus,vectors-KBps =

				<1 650 0 0>,    /* No vote */

				<1 650 1000 0>; /* Max. bandwidth */

		qcom,bus-vector-names = "MIN",

					"MAX";

		qcom,instance-type = "ufs";



		status = "disabled";

	};



	ufs2phy_mem: ufsphy2_mem@1d67000 {

		reg = <0x1d67000 0xda8>; /* PHY regs */

		reg-names = "phy_mem";

		#phy-cells = <0>;

		ufs-qcom-crypto = <&ufs2_ice>;



		lanes-per-direction = <2>;



		clock-names = "ref_clk_src",

			"ref_aux_clk";

		clocks = <&clock_rpmh RPMH_CXO_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_PHY_AUX_CLK>;



		status = "disabled";

	};



	ufshc2_mem: ufshc2@1d64000 {

		compatible = "qcom,ufshc";

		reg = <0x1d64000 0x2500>;

		interrupts = <0 649 0>;

		phys = <&ufs2phy_mem>;

		phy-names = "ufsphy";

		ufs-qcom-crypto = <&ufs2_ice>;



		lanes-per-direction = <2>;

		dev-ref-clk-freq = <0>; /* 19.2 MHz */



		clock-names =

			"core_clk",

			"bus_aggr_clk",

			"iface_clk",

			"core_clk_unipro",

			"core_clk_ice",

			"ref_clk",

			"tx_lane0_sync_clk",

			"rx_lane0_sync_clk",

			"rx_lane1_sync_clk";

		clocks =

			<&clock_gcc GCC_UFS_CARD_2_AXI_CLK>,

			<&clock_gcc GCC_AGGRE_UFS_CARD_2_AXI_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_AHB_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_UNIPRO_CORE_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_ICE_CORE_CLK>,

			<&clock_rpmh RPMH_CXO_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_TX_SYMBOL_0_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_RX_SYMBOL_0_CLK>,

			<&clock_gcc GCC_UFS_CARD_2_RX_SYMBOL_1_CLK>;

		freq-table-hz =

			<37500000 300000000>,

			<0 0>,

			<0 0>,

			<37500000 300000000>,

			<37500000 300000000>,

			<0 0>,

			<0 0>,

			<0 0>,

			<0 0>;



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

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

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

		qcom,msm-bus,vectors-KBps =

		/*

		 * During HS G3 UFS runs at nominal voltage corner, vote

		 * higher bandwidth to push other buses in the data path

		 * to run at nominal to achieve max throughput.

		 * 4GBps pushes BIMC to run at nominal.

		 * 200MBps pushes CNOC to run at nominal.

		 * Vote for half of this bandwidth for HS G3 1-lane.

		 * For max bandwidth, vote high enough to push the buses

		 * to run in turbo voltage corner.

		 */

		<163 512 0 0>, <1 798 0 0>,          /* No vote */

		<163 512 922 0>, <1 798 1000 0>,     /* PWM G1 */

		<163 512 1844 0>, <1 798 1000 0>,    /* PWM G2 */

		<163 512 3688 0>, <1 798 1000 0>,    /* PWM G3 */

		<163 512 7376 0>, <1 798 1000 0>,    /* PWM G4 */

		<163 512 1844 0>, <1 798 1000 0>,    /* PWM G1 L2 */

		<163 512 3688 0>, <1 798 1000 0>,    /* PWM G2 L2 */

		<163 512 7376 0>, <1 798 1000 0>,    /* PWM G3 L2 */

		<163 512 14752 0>, <1 798 1000 0>,   /* PWM G4 L2 */

		<163 512 127796 0>, <1 798 1000 0>,  /* HS G1 RA */

		<163 512 255591 0>, <1 798 1000 0>,  /* HS G2 RA */

		<163 512 2097152 0>, <1 798 102400 0>,  /* HS G3 RA */

		<163 512 4194304 0>, <1 798 204800 0>,  /* HS G4 RA */

		<163 512 255591 0>, <1 798 1000 0>,  /* HS G1 RA L2 */

		<163 512 511181 0>, <1 798 1000 0>,  /* HS G2 RA L2 */

		<163 512 4194304 0>, <1 798 204800 0>, /* HS G3 RA L2 */

		<163 512 8388608 0>, <1 798 409600 0>, /* HS G4 RA L2 */

		<163 512 149422 0>, <1 798 1000 0>,  /* HS G1 RB */

		<163 512 298189 0>, <1 798 1000 0>,  /* HS G2 RB */

		<163 512 2097152 0>, <1 798 102400 0>,  /* HS G3 RB */

		<163 512 4194304 0>, <1 798 204800 0>,  /* HS G4 RB */

		<163 512 298189 0>, <1 798 1000 0>,  /* HS G1 RB L2 */

		<163 512 596378 0>, <1 798 1000 0>,  /* HS G2 RB L2 */

		/* As UFS working in HS G3 RB L2 mode, aggregated

		 * bandwidth (AB) should take care of providing

		 * optimum throughput requested. However, as tested,

		 * in order to scale up CNOC clock, instantaneous

		 * bindwidth (IB) needs to be given a proper value too.

		 */

		<163 512 4194304 0>, <1 798 204800 409600>, /* HS G3 RB L2 */

		<163 512 8388608 0>, <1 798 409600 409600>, /* HS G4 RB L2 */

		<163 512 7643136 0>, <1 798 307200 0>; /* Max. bandwidth */



		qcom,bus-vector-names = "MIN",

		"PWM_G1_L1", "PWM_G2_L1", "PWM_G3_L1", "PWM_G4_L1",

		"PWM_G1_L2", "PWM_G2_L2", "PWM_G3_L2", "PWM_G4_L2",

		"HS_RA_G1_L1", "HS_RA_G2_L1", "HS_RA_G3_L1", "HS_RA_G4_L1",

		"HS_RA_G1_L2", "HS_RA_G2_L2", "HS_RA_G3_L2", "HS_RA_G4_L2",

		"HS_RB_G1_L1", "HS_RB_G2_L1", "HS_RB_G3_L1", "HS_RB_G4_L1",

		"HS_RB_G1_L2", "HS_RB_G2_L2", "HS_RB_G3_L2", "HS_RB_G4_L2",

		"MAX";



		/* PM QoS */

		qcom,pm-qos-cpu-groups = <0x0f 0xf0>;

		qcom,pm-qos-cpu-group-latency-us = <44 44>;

		qcom,pm-qos-default-cpu = <0>;



		pinctrl-names = "dev-reset-assert", "dev-reset-deassert";

		pinctrl-0 = <&ufs0_dev_reset_assert>;

		pinctrl-1 = <&ufs0_dev_reset_deassert>;



		resets = <&clock_gcc GCC_UFS_CARD_2_BCR>;

		reset-names = "core_reset";



		status = "disabled";

	};



	qcom,msm-cdsp-loader {

		compatible = "qcom,cdsp-loader";

		qcom,proc-img-to-load = "cdsp";