From: Fabio Estevam
Commit 0aea5dda2928 ("ARM: dts: imx7d-sdb-u-boot: Fix usdhc1 UHS
operation") did a temporary workaround by addng the usdhc1 fix
inside the -u-boot.dtsi file.
The imx7d-sdb.dts from kernel 6.5-rc1 contains the proper UHS
fix, so sync the devicetree tree and remove the previous fix
from -u-boot.dtsi.
Also, adjust the PMIC node name inside pmic_get() to match
the devicetree update.
Signed-off-by: Fabio Estevam
---
arch/arm/dts/imx7d-sdb-u-boot.dtsi| 51
arch/arm/dts/imx7d-sdb.dts| 73 +--
board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
3 files changed, 56 insertions(+), 70 deletions(-)
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index ac1d6e2e6480..b78358fa1397 100644
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -5,54 +5,3 @@
{
dr_mode = "peripheral";
};
-
- {
- pinctrl-names = "default", "state_100mhz", "state_200mhz";
- pinctrl-0 = <_usdhc1>, <_usdhc1_gpio>;
- pinctrl-1 = <_usdhc1_100mhz>, <_usdhc1_gpio>;
- pinctrl-2 = <_usdhc1_200mhz>, <_usdhc1_gpio>;
-};
-
-_usdhc1 {
- fsl,pins = <
- MX7D_PAD_SD1_CMD__SD1_CMD 0x59
- MX7D_PAD_SD1_CLK__SD1_CLK 0x19
- MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59
- MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59
- MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59
- MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59
- >;
-};
-
- {
- pinctrl_usdhc1_gpio: usdhc1gpiogrp {
- fsl,pins = <
- MX7D_PAD_SD1_CD_B__GPIO5_IO00x59 /* CD */
- MX7D_PAD_SD1_WP__GPIO5_IO1 0x59 /* WP */
- MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0x59 /* vmmc */
- MX7D_PAD_GPIO1_IO08__SD1_VSELECT0x59 /* VSELECT
*/
- >;
- };
-
- pinctrl_usdhc1_100mhz: usdhc1100mhzgrp {
- fsl,pins = <
- MX7D_PAD_SD1_CMD__SD1_CMD 0x5a
- MX7D_PAD_SD1_CLK__SD1_CLK 0x1a
- MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a
- MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a
- MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a
- MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a
- >;
- };
-
- pinctrl_usdhc1_200mhz: usdhc1200mhzgrp {
- fsl,pins = <
- MX7D_PAD_SD1_CMD__SD1_CMD 0x5b
- MX7D_PAD_SD1_CLK__SD1_CLK 0x1b
- MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b
- MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b
- MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b
- MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b
- >;
- };
-};
diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts
index 78f4224a9bf4..75f1cd14bea1 100644
--- a/arch/arm/dts/imx7d-sdb.dts
+++ b/arch/arm/dts/imx7d-sdb.dts
@@ -24,14 +24,14 @@
pinctrl-names = "default";
pinctrl-0 = <_gpio_keys>;
- volume-up {
+ key-volume-up {
label = "Volume Up";
gpios = < 11 GPIO_ACTIVE_LOW>;
linux,code = ;
wakeup-source;
};
- volume-down {
+ key-volume-down {
label = "Volume Down";
gpios = < 10 GPIO_ACTIVE_LOW>;
linux,code = ;
@@ -39,12 +39,12 @@
};
};
- spi4 {
+ spi-4 {
compatible = "spi-gpio";
pinctrl-names = "default";
pinctrl-0 = <_spi4>;
- gpio-sck = < 13 GPIO_ACTIVE_HIGH>;
- gpio-mosi = < 9 GPIO_ACTIVE_HIGH>;
+ sck-gpios = < 13 GPIO_ACTIVE_HIGH>;
+ mosi-gpios = < 9 GPIO_ACTIVE_HIGH>;
cs-gpios = < 12 GPIO_ACTIVE_LOW>;
num-chipselects = <1>;
#address-cells = <1>;
@@ -60,6 +60,17 @@
};
};
+ reg_sd1_vmmc: regulator-sd1-vmmc {
+ compatible = "regulator-fixed";
+ regulator-name = "VDD_SD1";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ gpio = < 2 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ startup-delay-us = <20>;
+ off-on-delay-us = <2>;
+ };
+
reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
compatible = "regulator-fixed";
