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

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

Merge "ARM: dts: msm: Add bus voting and platform support for yupik"

parents 2ae16844 a78d2c71

qcom/yupik-atp.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -186,3 +186,39 @@ 
&pm8350c_flash {

	status = "disabled";

};



&sdhc_1 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_on>;

	pinctrl-1 = <&sdc1_off>;



	vdd-supply = <&L7B>;

	qcom,vdd-voltage-level = <2952000 2952000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L19B>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <0 325000>;



	status = "ok";

};



&sdhc_2 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	vdd-supply = <&L9C>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&L6C>;

	qcom,vdd-io-voltage-level = <1800000 2960000>;

	qcom,vdd-io-current-level = <0 22000>;



	cd-gpios = <&tlmm 91 GPIO_ACTIVE_LOW>;



	status = "ok";

};

qcom/yupik-idp.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -191,3 +191,39 @@ 
	io-channels = <&pmk8350_vadc PM7325B_ADC7_DIE_TEMP>;

	io-channel-names = "thermal";

};



&sdhc_1 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_on>;

	pinctrl-1 = <&sdc1_off>;



	vdd-supply = <&L7B>;

	qcom,vdd-voltage-level = <2952000 2952000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L19B>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <0 325000>;



	status = "ok";

};



&sdhc_2 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	vdd-supply = <&L9C>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&L6C>;

	qcom,vdd-io-voltage-level = <1800000 2960000>;

	qcom,vdd-io-current-level = <0 22000>;



	cd-gpios = <&tlmm 91 GPIO_ACTIVE_LOW>;



	status = "ok";

};

qcom/yupik-qrd.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -419,3 +419,38 @@ 
				  <&bolero>;

};



&sdhc_1 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_on>;

	pinctrl-1 = <&sdc1_off>;



	vdd-supply = <&L7B>;

	qcom,vdd-voltage-level = <2952000 2952000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L19B>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <0 325000>;



	status = "ok";

};



&sdhc_2 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	vdd-supply = <&L9C>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&L6C>;

	qcom,vdd-io-voltage-level = <1800000 2960000>;

	qcom,vdd-io-current-level = <0 22000>;



	cd-gpios = <&tlmm 91 GPIO_ACTIVE_LOW>;



	status = "ok";

};

qcom/yupik.dtsi

+51 −0
Original line number Diff line number Diff line
@@ -1943,6 +1943,32 @@ 


		qcom,ice-clk-rates = <300000000 100000000>;



		interconnects = <&aggre1_noc MASTER_SDCC_1 &mc_virt SLAVE_EBI1>,

			<&gem_noc MASTER_APPSS_PROC &cnoc2 SLAVE_SDCC_1>;

		interconnect-names = "sdhc-ddr","cpu-sdhc";

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

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

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

		qcom,msm-bus,vectors-KBps =

			/* No Vote */

			<0 0>, <0 0>,

			/* 400 KB/s*/

			<1000 590000>, <2000 1590000>,

			/* 25 MB/s */

			<50000 590000>, <30000 1590000>,

			/* 50 MB/s */

			<80000 590000>, <40000 1590000>,

			/* 100 MB/s */

			<100000 590000>, <50000 1590000>,

			/* 200 MB/s */

			<150000 2060000>, <80000 6440000>,

			/* 400 MB/s */

			<261438 2060000>, <300000 6440000>,

			/* Max. bandwidth */

			<1338562 4096000>, <1338562 9170000>;

		qcom,bus-bw-vectors-bps = <0 400000 25000000 50000000

			100000000 200000000 400000000 4294967295>;



		/* DLL HSR settings. Refer go/hsr - <Target> DLL settings */

		qcom,dll-hsr-list = <0x000f642c 0x0 0x0 0x2C010800 0x80040868>;
@@ -1984,6 +2010,31 @@ 
		clock-names = "core", "iface";



		bus-width = <4>;



		interconnects = <&aggre1_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>,

			<&gem_noc MASTER_APPSS_PROC &cnoc2 SLAVE_SDCC_2>;

		interconnect-names = "sdhc-ddr","cpu-sdhc";

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

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

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

		qcom,msm-bus,vectors-KBps =

			/* No Vote */

			<0 0>, <0 0>,

			/* 400 KB/s*/

			<1000 590000>, <2000 1590000>,

			/* 25 MB/s */

			<50000 590000>, <30000 1590000>,

			/* 50 MB/s */

			<80000 590000>, <40000 1590000>,

			/* 100 MB/s */

			<100000 590000>, <50000 1590000>,

			/* 200 MB/s */

			<261438 2060000>, <300000 6440000>,

			/* Max. bandwidth */

			<1338562 4096000>, <1338562 9170000>;

		qcom,bus-bw-vectors-bps = <0 400000 25000000 50000000

			100000000 200000000 4294967295>;



		/* DLL HSR settings. Refer go/hsr - <Target> DLL settings */

		qcom,dll-hsr-list = <0x0007642c 0x0 0x10 0x2C010800 0x80040868>;