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

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

Merge "ARM: dts: msm: Add eMMC and SDCard support for lagoon"

parents ce9370d1 4b07346a

qcom/lagoon-pinctrl.dtsi

+137 −0
Original line number Diff line number Diff line
@@ -500,5 +500,142 @@ 
				};

			};

		};



		/* SDC pin type */

		sdc1_clk_on: sdc1_clk_on {

			config {

				pins = "sdc1_clk";

				bias-disable;		/* No pull */

				drive-strength = <16>;	/* 16 MA */

			};

		};



		sdc1_clk_off: sdc1_clk_off {

			config {

				pins = "sdc1_clk";

				bias-disable;		/* No Pull */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc1_cmd_on: sdc1_cmd_on {

			config {

				pins = "sdc1_cmd";

				bias-pull-up;		/* Pull up */

				drive-strength = <10>;	/* 10 MA */

			};

		};



		sdc1_cmd_off: sdc1_cmd_off {

			config {

				pins = "sdc1_cmd";

				bias-pull-up;		/* Pull up */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc1_data_on: sdc1_data_on {

			config {

				pins = "sdc1_data";

				bias-pull-up;		/* Pull up */

				drive-strength = <10>;	/* 10 MA */

			};

		};



		sdc1_data_off: sdc1_data_off {

			config {

				pins = "sdc1_data";

				bias-pull-up;		/* Pull up */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc1_rclk_on: sdc1_rclk_on {

			config {

				pins = "sdc1_rclk";

				bias-pull-down;		/* Pull down */

			};

		};



		sdc1_rclk_off: sdc1_rclk_off {

			config {

				pins = "sdc1_rclk";

				bias-pull-down;		/* Pull down */

			};

		};



		sdc2_clk_on: sdc2_clk_on {

			config {

				pins = "sdc2_clk";

				bias-disable;		/* No pull */

				drive-strength = <16>;	/* 16 MA */

			};

		};



		sdc2_clk_off: sdc2_clk_off {

			config {

				pins = "sdc2_clk";

				bias-disable;		/* No pull */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc2_cmd_on: sdc2_cmd_on {

			config {

				pins = "sdc2_cmd";

				bias-pull-up;		/* Pull up */

				drive-strength = <10>;	/* 10 MA */

			};

		};



		sdc2_cmd_off: sdc2_cmd_off {

			config {

				pins = "sdc2_cmd";

				bias-pull-up;		/* Pull up */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc2_data_on: sdc2_data_on {

			config {

				pins = "sdc2_data";

				bias-pull-up;		/* Pull up */

				drive-strength = <10>;	/* 10 MA */

			};

		};



		sdc2_data_off: sdc2_data_off {

			config {

				pins = "sdc2_data";

				bias-pull-up;		/* Pull up */

				drive-strength = <2>;	/* 2 MA */

			};

		};



		sdc2_cd_on: cd_on {

			mux {

				pins = "gpio94";

				function = "gpio";

			};



			config {

				pins = "gpio94";

				drive-strength = <2>;

				bias-pull-up;

			};

		};



		sdc2_cd_off: cd_off {

			mux {

				pins = "gpio94";

				function = "gpio";

			};



			config {

				pins = "gpio94";

				drive-strength = <2>;

				bias-disable;

			};

		};

	};

};

qcom/lagoon-rumi.dtsi

+46 −0
Original line number Diff line number Diff line
@@ -94,3 +94,49 @@ 
	compatible = "qcom,dummycc";

	clock-output-names = "qdss_clocks";

};



&sdhc_1 {

	vdd-supply = <&L7E>;

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

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



	vdd-io-supply = <&L12A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on

				&sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off

				&sdc1_rclk_off>;



	qcom,clk-rates = <400000 25000000 50000000>;

	qcom,bus-speed-mode = "DDR_1p8v";



	/delete-property/qcom,devfreq,freq-table;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&L9E>;

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

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



	vdd-io-supply = <&L6E>;

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

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



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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	qcom,clk-rates = <400000 25000000 50000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50";



	/delete-property/qcom,devfreq,freq-table;



	status = "ok";

};

qcom/lagoon.dtsi

+146 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
	aliases {

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

		serial0 = &qupv3_se9_2uart; /* Debug Console */

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

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

	};



	cpus {
@@ -2286,6 +2288,150 @@ 
				< 3000000 MHZ_TO_MBPS(2092, 4) >;

		};

	};



	sdhc_1: sdhci@7c4000 {

		compatible = "qcom,sdhci-msm-v5", "qcom,sdhci-msm-cqe";

		reg = <0x7c4000 0x1000>, <0x7c5000 0x1000>;

		reg-names = "hc_mem", "cqhci_mem";



		interrupts = <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>,

				 <GIC_SPI 644 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "hc_irq", "pwr_irq";



		qcom,bus-width = <8>;

		qcom,large-address-bus;



		qcom,clk-rates = <400000 25000000 50000000 100000000

					192000000 384000000>;

		qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";



		qcom,devfreq,freq-table = <50000000 200000000>;



		qcom,scaling-lower-bus-speed-mode = "DDR52";



		clocks = <&gcc GCC_SDCC1_AHB_CLK>,

			<&gcc GCC_SDCC1_APPS_CLK>,

			<&gcc GCC_SDCC1_ICE_CORE_CLK>;

		clock-names = "iface_clk", "core_clk", "ice_core_clk";



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



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

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

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

		qcom,msm-bus,vectors-KBps =

			/* No vote */

			<150 10073 0 0>,

			<135 512 0 0>,

			<1 825 0 0>,

			/* 400 KB/s */

			<150 10073 1000 790000>,

			<135 512 1000 1800000>,

			<1 825 2000 131000>,

			/* 25 MB/s */

			<150 10073 50000 790000>,

			<135 512 50000 1800000>,

			<1 825 30000 131000>,

			/* 50 MB/s */

			<150 10073 50000 790000>,

			<135 512 80000 1800000>,

			<1 825 40000 131000>,

			/* 100 MB/s */

			<150 10073 50000 790000>,

			<135 512 100000 1800000>,

			<1 825 50000 131000>,

			/* 200 MB/s */

			<150 10073 50000 790000>,

			<135 512 150000 1800000>,

			<1 825 80000 131000>,

			/* 400 MB/s */

			<150 10073 261438 3190000>,

			<135 512 261438 4000000>,

			<1 825 300000 294000>,

			/* Max. bandwidth */

			<150 10073 1338562 4290000>,

			<135 512 1338562 7200000>,

			<1 825 1338562 4096000>;

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

			100000000 200000000 400000000 4294967295>;



		/* PM QoS */

		qcom,pm-qos-irq-type = "affine_irq";

		qcom,pm-qos-irq-latency = <59 59>;

		qcom,pm-qos-cpu-groups = <0x3f 0xc0>;

		qcom,pm-qos-cmdq-latency-us = <65 65>, <65 65>;

		qcom,pm-qos-legacy-latency-us = <65 65>, <65 65>;



		qcom,nonremovable;

		status = "disabled";

	};



	sdhc_2: sdhci@8804000 {

		compatible = "qcom,sdhci-msm-v5";

		reg = <0x8804000 0x1000>;

		reg-names = "hc_mem";



		interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,

				 <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "hc_irq", "pwr_irq";



		qcom,bus-width = <4>;

		qcom,large-address-bus;



		qcom,clk-rates = <400000 25000000

				 50000000 100000000 202000000>;

		qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50",

					"SDR104";



		qcom,devfreq,freq-table = <50000000 202000000>;



		clocks = <&gcc GCC_SDCC2_AHB_CLK>,

			<&gcc GCC_SDCC2_APPS_CLK>;

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



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

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

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

		qcom,msm-bus,vectors-KBps =

			/* No vote */

			<81 10073 0 0>,

			<135 512 0 0>,

			<1 608 0 0>,

			/* 400 KB/s*/

			<81 10073 1000 790000>,

			<135 512 1000 1800000>,

			<1 608 2000 131000>,

			/* 25 MB/s */

			<81 10073 50000 790000>,

			<135 512 50000 1800000>,

			<1 608 30000 131000>,

			/* 50 MB/s */

			<81 10073 50000 790000>,

			<135 512 80000 1800000>,

			<1 608 40000 131000>,

			/* 100 MB/s */

			<81 10073 50000 790000>,

			<135 512 100000 1800000>,

			<1 608 50000 131000>,

			/* 200 MB/s */

			<81 10073 261438 3190000>,

			<135 512 261438 4000000>,

			<1 608 300000 294000>,

			/* Max. bandwidth */

			<81 10073 1338562 4290000>,

			<135 512 1338562 7200000>,

			<1 608 1338562 4096000>;

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

				100000000 200000000 4294967295>;



		/* PM QoS */

		qcom,pm-qos-irq-type = "affine_irq";

		qcom,pm-qos-irq-latency = <59 59>;

		qcom,pm-qos-cpu-groups = <0x3f 0xc0>;

		qcom,pm-qos-legacy-latency-us = <65 65>, <65 65>;



		status = "disabled";

	};

};



#include "lagoon-gdsc.dtsi"