[U-Boot] [PATCH 2/2] mx6sx: vining2000: pinmux usdhc4 reset

From: Christoph Fritz chf.fritz@googlemail.com
This patch configures pinmux for pin usdhc4 reset.
Signed-off-by: Christoph Fritz chf.fritz@googlemail.com --- board/softing/vining_2000/vining_2000.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c index 77c34e39be..30693c0cdf 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -58,6 +58,9 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST)
+#define USDHC_RESET_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \ + PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm) + #define GPIO_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_PKE)
@@ -94,6 +97,7 @@ static iomux_v3_cfg_t const usdhc4_pads[] = { MX6_PAD_SD4_DATA5__USDHC4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA6__USDHC4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA7__USDHC4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX6_PAD_SD4_RESET_B__USDHC4_RESET_B | MUX_PAD_CTRL(USDHC_RESET_CTRL), };
static iomux_v3_cfg_t const fec1_pads[] = {

Hi Marek,
On 17/05/19 21:19, Marek Vasut wrote:
From: Christoph Fritz chf.fritz@googlemail.com
This patch configures pinmux for pin usdhc4 reset.
Signed-off-by: Christoph Fritz chf.fritz@googlemail.com
board/softing/vining_2000/vining_2000.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
^---- new path
index 77c34e39be..30693c0cdf 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -58,6 +58,9 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST)
+#define USDHC_RESET_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
- PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm)
#define GPIO_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_PKE)
@@ -94,6 +97,7 @@ static iomux_v3_cfg_t const usdhc4_pads[] = { MX6_PAD_SD4_DATA5__USDHC4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA6__USDHC4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA7__USDHC4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX6_PAD_SD4_RESET_B__USDHC4_RESET_B | MUX_PAD_CTRL(USDHC_RESET_CTRL),
};
static iomux_v3_cfg_t const fec1_pads[] = {
FYI: I am applying this together with the series "ARM: imx: Update VINING|2000 to DM/DT". However, this patch applies after renaming the vendor to softimg, and it cannot be applied (the series is a follow up of this patch). It is also different from the patch you applied on your own tree (you applied to samtec and not softimg):
https://github.com/marex/u-boot-imx/commit/3bbd03e4edf419ff3eb00e58f6b4d73d2...
I have just applied this as you did before renaming, no need to repost - I am just tracking while the applied patch differs from the one in patchwork.
Regards, Stefano

On 6/9/19 10:33 AM, Stefano Babic wrote:
Hi Marek,
On 17/05/19 21:19, Marek Vasut wrote:
From: Christoph Fritz chf.fritz@googlemail.com
This patch configures pinmux for pin usdhc4 reset.
Signed-off-by: Christoph Fritz chf.fritz@googlemail.com
board/softing/vining_2000/vining_2000.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
^---- new path
index 77c34e39be..30693c0cdf 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -58,6 +58,9 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm | \ PAD_CTL_SRE_FAST)
+#define USDHC_RESET_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
- PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm)
#define GPIO_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | \ PAD_CTL_PKE)
@@ -94,6 +97,7 @@ static iomux_v3_cfg_t const usdhc4_pads[] = { MX6_PAD_SD4_DATA5__USDHC4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA6__USDHC4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD4_DATA7__USDHC4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX6_PAD_SD4_RESET_B__USDHC4_RESET_B | MUX_PAD_CTRL(USDHC_RESET_CTRL),
};
static iomux_v3_cfg_t const fec1_pads[] = {
FYI: I am applying this together with the series "ARM: imx: Update VINING|2000 to DM/DT". However, this patch applies after renaming the vendor to softimg, and it cannot be applied (the series is a follow up of this patch). It is also different from the patch you applied on your own tree (you applied to samtec and not softimg):
https://github.com/marex/u-boot-imx/commit/3bbd03e4edf419ff3eb00e58f6b4d73d2...
I have just applied this as you did before renaming, no need to repost - I am just tracking while the applied patch differs from the one in patchwork.
Ah hum, I guess bulk-posting so many conversions with cross-dependencies wasn't so great.
Thanks. Let me know once you have some tree with the patches, so I can retest that.

From: Christoph Fritz chf.fritz@googlemail.com This patch configures pinmux for pin usdhc4 reset. Signed-off-by: Christoph Fritz chf.fritz@googlemail.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (3)
-
Marek Vasut
-
sbabic@denx.de
-
Stefano Babic