[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet

[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

This imports v11 of "Jetson TK1 Development Platform Pin Mux" from
https://developer.nvidia.com/embedded/downloads.

The new version defines the mux option for the MIPI pad ctrl selection.
The OWR pin no longer has an entry in the configuration table because
the only mux option it support is OWR, that feature isn't supported, and
hence can't conflict with any other pin. This pin can only usefully be
used as a GPIO.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
Note that the cleanup series I sent on Tuesday accidentally depends on
this being applied first. I'd expect this to have higher priority than
the cleanup series and be applied earlier anyway.

 board/nvidia/jetson-tk1/jetson-tk1.c               |  3 +++
 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index 14f0ce54554e..a66b710cddab 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -31,6 +31,9 @@ void pinmux_init(void)
 
 	pinmux_config_drvgrp_table(jetson_tk1_drvgrps,
 				   ARRAY_SIZE(jetson_tk1_drvgrps));
+
+	pinmux_config_mipipadctrlgrp_table(jetson_tk1_mipipadctrlgrps,
+					ARRAY_SIZE(jetson_tk1_mipipadctrlgrps));
 }
 
 #ifdef CONFIG_PCI_TEGRA
diff --git a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
index b2b2057e3bd3..00e0cdc4b8c0 100644
--- a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
+++ b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
@@ -276,7 +276,6 @@ static const struct pmux_pingrp_config jetson_tk1_pingrps[] = {
 	PINCFG(CPU_PWR_REQ,            CPU,          NORMAL, NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
 	PINCFG(PWR_INT_N,              PMI,          UP,     TRISTATE, INPUT,   DEFAULT, DEFAULT),
 	PINCFG(RESET_OUT_N,            RESET_OUT_N,  NORMAL, NORMAL,   INPUT,   DEFAULT, DEFAULT),
-	PINCFG(OWR,                    RSVD2,        DOWN,   TRISTATE, OUTPUT,  DEFAULT, NORMAL),
 	PINCFG(CLK_32K_IN,             CLK,          NORMAL, TRISTATE, INPUT,   DEFAULT, DEFAULT),
 	PINCFG(JTAG_RTCK,              RTCK,         UP,     NORMAL,   OUTPUT,  DEFAULT, DEFAULT),
 };
@@ -296,4 +295,15 @@ static const struct pmux_pingrp_config jetson_tk1_pingrps[] = {
 static const struct pmux_drvgrp_config jetson_tk1_drvgrps[] = {
 };
 
+#define MIPIPADCTRLCFG(_grp, _mux) \
+	{							\
+		.grp		= PMUX_MIPIPADCTRLGRP_##_grp,	\
+		.func		= PMUX_FUNC_##_mux,		\
+	}
+
+static const struct pmux_mipipadctrlgrp_config jetson_tk1_mipipadctrlgrps[] = {
+	/*             grp,   mux */
+	MIPIPADCTRLCFG(DSI_B, DSI_B),
+};
+
 #endif /* PINMUX_CONFIG_JETSON_TK1_H */
-- 
2.8.1

[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet

[Simon Glass]

On 21 April 2016 at 16:03, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This imports v11 of "Jetson TK1 Development Platform Pin Mux" from
> https://developer.nvidia.com/embedded/downloads.
>
> The new version defines the mux option for the MIPI pad ctrl selection.
> The OWR pin no longer has an entry in the configuration table because
> the only mux option it support is OWR, that feature isn't supported, and
> hence can't conflict with any other pin. This pin can only usefully be
> used as a GPIO.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Note that the cleanup series I sent on Tuesday accidentally depends on
> this being applied first. I'd expect this to have higher priority than
> the cleanup series and be applied earlier anyway.
>
>  board/nvidia/jetson-tk1/jetson-tk1.c               |  3 +++
>  board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 12 +++++++++++-
>  2 files changed, 14 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet

[Stephen Warren]

On 04/21/2016 04:03 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This imports v11 of "Jetson TK1 Development Platform Pin Mux" from
> https://developer.nvidia.com/embedded/downloads.
>
> The new version defines the mux option for the MIPI pad ctrl selection.
> The OWR pin no longer has an entry in the configuration table because
> the only mux option it support is OWR, that feature isn't supported, and
> hence can't conflict with any other pin. This pin can only usefully be
> used as a GPIO.

TomW, could this please also be applied in time for the upcoming release?

[U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet

[Tom Warren]

I'll take a look. Thanks.

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Wednesday, May 04, 2016 12:01 PM
> To: Tom Warren <TWarren@nvidia.com>
> Cc: u-boot at lists.denx.de; Simon Glass <sjg@chromium.org>; Stephen Warren
> <swarren@nvidia.com>
> Subject: Re: [U-Boot] [PATCH] ARM: tegra: import latest Jetson TK1 spreadsheet
> 
> On 04/21/2016 04:03 PM, Stephen Warren wrote:
> > From: Stephen Warren <swarren@nvidia.com>
> >
> > This imports v11 of "Jetson TK1 Development Platform Pin Mux" from
> > https://developer.nvidia.com/embedded/downloads.
> >
> > The new version defines the mux option for the MIPI pad ctrl selection.
> > The OWR pin no longer has an entry in the configuration table because
> > the only mux option it support is OWR, that feature isn't supported,
> > and hence can't conflict with any other pin. This pin can only
> > usefully be used as a GPIO.
> 
> TomW, could this please also be applied in time for the upcoming release?
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------