diff options
| author | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-17 15:19:27 -0700 |
|---|---|---|
| committer | Robert Winkler <robert.winkler@boundarydevices.com> | 2013-06-17 15:19:27 -0700 |
| commit | fffa05105aec80060f03704465f6490bc94bbd06 (patch) | |
| tree | 2950104bc62f171c765dd632fab2ef32ddfec626 | |
| parent | e805c39e0454fff8ff6dcfe2a4239db1fe368433 (diff) | |
oc/nit6xlite: fix WiFi/BT pads and GPs
Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
| -rw-r--r-- | board/boundary/nit6xlite/nit6xlite.c | 24 | ||||
| -rw-r--r-- | board/boundary/oc/oc.c | 24 |
2 files changed, 38 insertions, 10 deletions
diff --git a/board/boundary/nit6xlite/nit6xlite.c b/board/boundary/nit6xlite/nit6xlite.c index 998e02d547..9255416ae8 100644 --- a/board/boundary/nit6xlite/nit6xlite.c +++ b/board/boundary/nit6xlite/nit6xlite.c @@ -196,6 +196,22 @@ iomux_v3_cfg_t const enet_pads2[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +/* WiFi/BT pads */ +iomux_v3_cfg_t const wifi_pads[] = { + (MX6_PAD_NANDF_CS1__GPIO_6_14 & ~MUX_PAD_CTRL_MASK) + | MUX_PAD_CTRL(WEAK_PULLDOWN), + (MX6_PAD_NANDF_CS2__GPIO_6_15 & ~MUX_PAD_CTRL_MASK) + | MUX_PAD_CTRL(OUTPUT_40OHM), + (MX6_PAD_NANDF_CS3__GPIO_6_16 & ~MUX_PAD_CTRL_MASK) + | MUX_PAD_CTRL(OUTPUT_40OHM), + (MX6_PAD_NANDF_CLE__GPIO_6_7 & ~MUX_PAD_CTRL_MASK) + | MUX_PAD_CTRL(OUTPUT_40OHM), +}; +#define WIFI_WL_ENABLE_GP IMX_GPIO_NR(6, 7) +#define WIFI_WL_IRQ_GP IMX_GPIO_NR(6, 14) +#define WIFI_BT_REG_ON IMX_GPIO_NR(6, 15) +#define WIFI_BT_ENABLE_GP IMX_GPIO_NR(6, 16) + static void setup_iomux_enet(void) { gpio_direction_output(IMX_GPIO_NR(1, 27), 0); /* PHY rst */ @@ -683,6 +699,14 @@ int board_early_init_f(void) setup_iomux_uart(); + /* Disable WiFi/BT */ + gpio_direction_input(WIFI_WL_IRQ_GP); + gpio_direction_output(WIFI_WL_ENABLE_GP, 0); + gpio_direction_output(WIFI_BT_ENABLE_GP, 0); + gpio_direction_output(WIFI_BT_REG_ON, 0); + + imx_iomux_v3_setup_multiple_pads(wifi_pads, ARRAY_SIZE(wifi_pads)); + #if defined(CONFIG_VIDEO_IPUV3) setup_display(); #endif diff --git a/board/boundary/oc/oc.c b/board/boundary/oc/oc.c index a151412fe6..5693be4855 100644 --- a/board/boundary/oc/oc.c +++ b/board/boundary/oc/oc.c @@ -210,18 +210,21 @@ iomux_v3_cfg_t const enet_pads2[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; -/* wl1271 pads on nitrogen6x */ -iomux_v3_cfg_t const wl12xx_pads[] = { +/* WiFi/BT pads */ +iomux_v3_cfg_t const wifi_pads[] = { (MX6_PAD_NANDF_CS1__GPIO_6_14 & ~MUX_PAD_CTRL_MASK) | MUX_PAD_CTRL(WEAK_PULLDOWN), (MX6_PAD_NANDF_CS2__GPIO_6_15 & ~MUX_PAD_CTRL_MASK) | MUX_PAD_CTRL(OUTPUT_40OHM), (MX6_PAD_NANDF_CS3__GPIO_6_16 & ~MUX_PAD_CTRL_MASK) | MUX_PAD_CTRL(OUTPUT_40OHM), + (MX6_PAD_NANDF_CLE__GPIO_6_7 & ~MUX_PAD_CTRL_MASK) + | MUX_PAD_CTRL(OUTPUT_40OHM), }; -#define WL12XX_WL_IRQ_GP IMX_GPIO_NR(6, 14) -#define WL12XX_WL_ENABLE_GP IMX_GPIO_NR(6, 15) -#define WL12XX_BT_ENABLE_GP IMX_GPIO_NR(6, 16) +#define WIFI_WL_ENABLE_GP IMX_GPIO_NR(6, 7) +#define WIFI_WL_IRQ_GP IMX_GPIO_NR(6, 14) +#define WIFI_BT_REG_ON IMX_GPIO_NR(6, 15) +#define WIFI_BT_ENABLE_GP IMX_GPIO_NR(6, 16) static void setup_iomux_enet(void) { @@ -640,12 +643,13 @@ int board_early_init_f(void) setup_iomux_uart(); - /* Disable wl1271 */ - gpio_direction_input(WL12XX_WL_IRQ_GP); - gpio_direction_output(WL12XX_WL_ENABLE_GP, 0); - gpio_direction_output(WL12XX_BT_ENABLE_GP, 0); + /* Disable WiFi/BT */ + gpio_direction_input(WIFI_WL_IRQ_GP); + gpio_direction_output(WIFI_WL_ENABLE_GP, 0); + gpio_direction_output(WIFI_BT_ENABLE_GP, 0); + gpio_direction_output(WIFI_BT_REG_ON, 0); - imx_iomux_v3_setup_multiple_pads(wl12xx_pads, ARRAY_SIZE(wl12xx_pads)); + imx_iomux_v3_setup_multiple_pads(wifi_pads, ARRAY_SIZE(wifi_pads)); #if defined(CONFIG_VIDEO_IPUV3) setup_display(); |