summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/toradex/colibri_t20/colibri_t20.dts3
-rw-r--r--drivers/gpio/tegra_gpio.c3
-rw-r--r--drivers/video/tegra.c4
3 files changed, 9 insertions, 1 deletions
diff --git a/board/toradex/colibri_t20/colibri_t20.dts b/board/toradex/colibri_t20/colibri_t20.dts
index 48e0d192462..92705575400 100644
--- a/board/toradex/colibri_t20/colibri_t20.dts
+++ b/board/toradex/colibri_t20/colibri_t20.dts
@@ -87,7 +87,8 @@
*/
/* Parameter 3 bit 0:1=output, 0=input; bit 1:1=high, 0=low */
- backlight-enable = <&gpio 156 1>; /* PT4 - SODIMM 71: BL_ON */
+ backlight-enable = <&gpio 156 1>; /* PT4 - SODIMM 71: BL_ON,
+ requires manual untristating respective pin group! */
lvds-shutdown = <&gpio 255 1>;
backlight-vdd = <&gpio 255 1>;
panel-vdd = <&gpio 255 1>;
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 0268c61020c..c706affaa32 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -298,4 +298,7 @@ U_BOOT_CMD(
" - using 'offset', set port:bit as output and drive low or high\n"
" input offset\n"
" - using 'offset', set port:bit as input and read value"
+#ifdef CONFIG_TEGRA2
+ "\nNote: GPIO pins require manual untristating respective pin group!\n"
+#endif
);
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 9eea1ca62f2..90ad31e6bf9 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -264,6 +264,10 @@ static int handle_stage(const void *blob)
#if defined(CONFIG_TEGRA2)
/* TODO: put pinmux into the FDT */
pinmux_config_table(pinmux_cros_1, ARRAY_SIZE(pinmux_cros_1));
+
+ /* Hack: manually untristate BL_ON (PT4 - SODIMM 71)
+ as specified through device-tree */
+ pinmux_tristate_disable(PINGRP_DTA);
#endif
fdt_setup_gpio(&config.panel_vdd);