summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2014-10-23 13:46:41 +0200
committerStefano Babic <sbabic@denx.de>2014-10-30 10:46:28 +0100
commit1199ddce9c3e5dd25acffe7d7e7999ff779ac832 (patch)
treecc2f528b0b7064a5999e1363a104c1a534e6534a
parent29fd5c289c6a95a37c26486ad1c02de9a8ec28da (diff)
downloadu-boot-imx-1199ddce9c3e5dd25acffe7d7e7999ff779ac832.zip
u-boot-imx-1199ddce9c3e5dd25acffe7d7e7999ff779ac832.tar.gz
u-boot-imx-1199ddce9c3e5dd25acffe7d7e7999ff779ac832.tar.bz2
ot1200: add feature pads
The older 'mr' variant and the generic variant of the OT1200 differ in some places. As the name suggests the generic variant supports more boot devices. In order to be compatible with the 'mr' variant we define some 'feature' GPIOs. On the 'mr' variant this pads are not connected so we define their state with the help of the internal pullups. On the generic variant this GPIOs are connected and represent the state of the hardware. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
-rw-r--r--board/bachmann/ot1200/ot1200.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index acf95cb..a2fb3cf 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -104,10 +104,25 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs)
return (bus == 2 && cs == 0) ? (IMX_GPIO_NR(1, 3)) : -1;
}
+static iomux_v3_cfg_t const feature_pads[] = {
+ /* SD card detect */
+ MX6_PAD_GPIO_4__GPIO1_IO04 | MUX_PAD_CTRL(PAD_CTL_PUS_100K_DOWN),
+
+ /* eMMC soldered? */
+ MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(PAD_CTL_PUS_100K_UP),
+};
+
+static void setup_iomux_features(void)
+{
+ imx_iomux_v3_setup_multiple_pads(feature_pads,
+ ARRAY_SIZE(feature_pads));
+}
+
int board_early_init_f(void)
{
setup_iomux_uart();
setup_iomux_spi();
+ setup_iomux_features();
return 0;
}