From 257578a333235fe04414699cbe9120598e12e363 Mon Sep 17 00:00:00 2001 From: Denys Drozdov Date: Tue, 18 Jan 2022 12:10:35 +0200 Subject: arm: dts: colibri-imx6ull: clean-up sd card dts Keep +3.3V pull-ups interface by default in imx6ull-colibri.dtsi SD card interface setting per board device tree: imx6ull-colibri-aster.dtsi +3.3V pull-ups imx6ull-colibri-eval-v3.dtsi +3.3V pull-ups imx6ull-colibri-iris.dtsi +3.3V pull-ups imx6ull-colibri-iris-v2.dtsi +1.8V signaling, UHS capable Signed-off-by: Denys Drozdov --- arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 23 +--------------- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 22 --------------- arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 37 ++------------------------ arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 28 ------------------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 19 ++++++++----- 5 files changed, 15 insertions(+), 114 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi index dde3f38faa28..e7d6da210dc1 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi @@ -150,28 +150,7 @@ status = "okay"; }; -/* The define SD_1_8 allows to use the SD interface at a higher speed mode - * if the card supports it. For this the signaling voltage is switched from - * 3.3V to 1.8V under the usdhc1's drivers control. - */ -/* #define SD_1_8 */ &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - vqmmc-supply = <®_sd1_vqmmc>; -#else - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - no-1-8-v; -#endif - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; - keep-power-in-suspend; - status = "okay"; vmmc-supply = <®_3v3>; + status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index a3debdabdbca..821523a12423 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -176,29 +176,7 @@ status = "okay"; }; -/* The define SD_1_8 allows to use the SD interface at a higher speed mode - * if the card supports it. For this the signaling voltage is switched from - * 3.3V to 1.8V under the usdhc1's drivers control. - */ -/* #define SD_1_8 */ &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - vqmmc-supply = <®_sd1_vqmmc>; - disable-wp; - wakeup-source; - keep-power-in-suspend; vmmc-supply = <®_3v3>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi index fa734dac574c..91702bb03dd1 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -33,14 +33,6 @@ pinctrl-0 = <&pinctrl_snvs_usbc_det>; }; - reg_3v3: regulator-3v3 { - compatible = "regulator-fixed"; - regulator-name = "3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - reg_5v0: regulator-5v0 { compatible = "regulator-fixed"; regulator-name = "5V"; @@ -139,36 +131,11 @@ status = "okay"; }; -/* - * The define SD_1_8 allows to use the SD interface at a higher speed mode - * if the card supports it. For this the signaling voltage is switched from - * 3.3V to 1.8V under the usdhc1's drivers control which is supported starting - * with hardware revision V1.1A. - */ -/* #define SD_1_8 */ &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - vqmmc-supply = <®_sd1_vqmmc>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; cap-power-off-card; vmmc-supply = <®_3v3_vmmc>; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi index c252cb4cfe39..4745a52924c4 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi @@ -143,35 +143,7 @@ status = "okay"; }; -/* - * The define SD_1_8 allows to use the SD interface at a higher speed mode - * if the card supports it. For this the signaling voltage is switched from - * 3.3V to 1.8V under the usdhc1's drivers control which is supported starting - * with hardware revision V1.1A. - */ -/* #define SD_1_8 */ &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - vqmmc-supply = <®_sd1_vqmmc>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; - keep-power-in-suspend; vmmc-supply = <®_3v3>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index e5edf740f5c7..220b1aace0ba 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -270,9 +270,20 @@ }; &usdhc1 { + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; + pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_sleep_cd>; assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>; assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; assigned-clock-rates = <0>, <198000000>; + bus-width = <4>; + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + keep-power-in-suspend; + no-1-8-v; + vqmmc-supply = <®_sd1_vqmmc>; + wakeup-source; }; &wdog1 { @@ -664,13 +675,7 @@ >; }; - pinctrl_snvs_usdhc1_cd_sleep: snvs-usdhc1-cd-slp-grp { - fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0 - >; - }; - - pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp { + pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-slp-grp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0 >; -- cgit v1.2.3