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

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

Merge "ARM: dts: Add sdcard support for sdxprairie"

parents ea890b21 5c9136d9

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+11 −0
Original line number Diff line number Diff line
@@ -301,6 +301,16 @@ CONFIG_USB_CONFIGFS_F_GSI=y 
CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_BLOCK_DEFERRED_RESUME=y

CONFIG_MMC_TEST=m

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y
@@ -366,6 +376,7 @@ CONFIG_QTI_RPM_STATS_LOG=y 
CONFIG_QCOM_SMCINVOKE=y

CONFIG_MSM_PM=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

CONFIG_ARM_MEMLAT_MON=y

CONFIG_DEVFREQ_GOV_MEMLAT=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

arch/arm/configs/vendor/sdxprairie_defconfig

+12 −0
Original line number Diff line number Diff line
@@ -294,6 +294,17 @@ CONFIG_USB_CONFIGFS_F_GSI=y 
CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_BLOCK_DEFERRED_RESUME=y

CONFIG_MMC_TEST=m

CONFIG_MMC_RING_BUFFER=y

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y
@@ -359,6 +370,7 @@ CONFIG_QTI_RPM_STATS_LOG=y 
CONFIG_QCOM_SMCINVOKE=y

CONFIG_MSM_PM=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

CONFIG_ARM_MEMLAT_MON=y

CONFIG_DEVFREQ_GOV_MEMLAT=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

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

+21 −0
Original line number Diff line number Diff line
@@ -186,3 +186,24 @@ 
	qcom,hw-connector-mitigation;

	qcom,hw-skin-temp-mitigation;

};



&sdhc_1 {

	vdd-supply = <&vreg_sd_vdd>;

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

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



	vdd-io-supply = <&vreg_vddpx_2>;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_cd_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_cd_off>;



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

								200000000>;

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



	cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;

	status = "ok";

};

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

+21 −0
Original line number Diff line number Diff line
@@ -218,3 +218,24 @@ 
	qcom,fg-esr-cal-soc-thresh = <26 230>;

	qcom,fg-esr-cal-temp-thresh = <10 40>;

};



&sdhc_1 {

	vdd-supply = <&vreg_sd_vdd>;

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

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



	vdd-io-supply = <&vreg_vddpx_2>;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_cd_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_cd_off>;



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

								200000000>;

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



	cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;

	status = "ok";

};

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

+76 −0
Original line number Diff line number Diff line
@@ -1358,5 +1358,81 @@ 
				};

			};

		};



		/* 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";

				num-grp-pins = <1>;

				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_cd_on: cd_on {

			mux {

				pins = "gpio99";

				function = "gpio";

			};



			config {

				pins = "gpio99";

				drive-strength = <2>;

				bias-pull-up;

			};

		};



		sdc1_cd_off: cd_off {

			mux {

				pins = "gpio99";

				function = "gpio";

			};



			config {

				pins = "gpio99";

				drive-strength = <2>;

				bias-disable;

			};

		};

	};

};