提交 a23ade6d 编写于 作者: A Anatolij Gustschin 提交者: Stefano Babic

imx6: wandboard: convert to DM_GPIO and enable pinctrl driver

Enable DM_GPIO and pinctrl in defconfig and add gpio_request()
calls where required.
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
上级 4f115e3b
...@@ -131,12 +131,14 @@ static void setup_iomux_enet(void) ...@@ -131,12 +131,14 @@ static void setup_iomux_enet(void)
if (with_pmic) { if (with_pmic) {
SETUP_IOMUX_PADS(enet_ar8035_power_pads); SETUP_IOMUX_PADS(enet_ar8035_power_pads);
/* enable AR8035 POWER */ /* enable AR8035 POWER */
gpio_request(ETH_PHY_AR8035_POWER, "PHY_POWER");
gpio_direction_output(ETH_PHY_AR8035_POWER, 0); gpio_direction_output(ETH_PHY_AR8035_POWER, 0);
} }
/* wait until 3.3V of PHY and clock become stable */ /* wait until 3.3V of PHY and clock become stable */
mdelay(10); mdelay(10);
/* Reset AR8031 PHY */ /* Reset AR8031 PHY */
gpio_request(ETH_PHY_RESET, "PHY_RESET");
gpio_direction_output(ETH_PHY_RESET, 0); gpio_direction_output(ETH_PHY_RESET, 0);
mdelay(10); mdelay(10);
gpio_set_value(ETH_PHY_RESET, 1); gpio_set_value(ETH_PHY_RESET, 1);
...@@ -170,6 +172,11 @@ int board_mmc_init(bd_t *bis) ...@@ -170,6 +172,11 @@ int board_mmc_init(bd_t *bis)
int ret; int ret;
u32 index = 0; u32 index = 0;
#if !CONFIG_IS_ENABLED(DM_MMC)
gpio_request(USDHC1_CD_GPIO, "USDHC1_CD");
gpio_request(USDHC3_CD_GPIO, "USDHC3_CD");
#endif
/* /*
* Following map is done: * Following map is done:
* (U-Boot device node) (Physical Port) * (U-Boot device node) (Physical Port)
...@@ -356,6 +363,8 @@ static void enable_fwadapt_7wvga(struct display_info_t const *dev) ...@@ -356,6 +363,8 @@ static void enable_fwadapt_7wvga(struct display_info_t const *dev)
{ {
SETUP_IOMUX_PADS(fwadapt_7wvga_pads); SETUP_IOMUX_PADS(fwadapt_7wvga_pads);
gpio_request(IMX_GPIO_NR(2, 10), "DISP0_BKLEN");
gpio_request(IMX_GPIO_NR(2, 11), "DISP0_VDDEN");
gpio_direction_output(IMX_GPIO_NR(2, 10), 1); gpio_direction_output(IMX_GPIO_NR(2, 10), 1);
gpio_direction_output(IMX_GPIO_NR(2, 11), 1); gpio_direction_output(IMX_GPIO_NR(2, 11), 1);
} }
...@@ -418,6 +427,7 @@ static void setup_display(void) ...@@ -418,6 +427,7 @@ static void setup_display(void)
/* Disable LCD backlight */ /* Disable LCD backlight */
SETUP_IOMUX_PAD(PAD_DI0_PIN4__GPIO4_IO20); SETUP_IOMUX_PAD(PAD_DI0_PIN4__GPIO4_IO20);
gpio_request(IMX_GPIO_NR(4, 20), "LCD_BKLEN");
gpio_direction_input(IMX_GPIO_NR(4, 20)); gpio_direction_input(IMX_GPIO_NR(4, 20));
} }
#endif /* CONFIG_VIDEO_IPUV3 */ #endif /* CONFIG_VIDEO_IPUV3 */
...@@ -548,6 +558,8 @@ int board_init(void) ...@@ -548,6 +558,8 @@ int board_init(void)
int checkboard(void) int checkboard(void)
{ {
gpio_request(REV_DETECTION, "REV_DETECT");
if (is_revd1()) if (is_revd1())
puts("Board: Wandboard rev D1\n"); puts("Board: Wandboard rev D1\n");
else if (is_revc1()) else if (is_revc1())
......
...@@ -38,9 +38,12 @@ CONFIG_ENV_IS_IN_MMC=y ...@@ -38,9 +38,12 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_DWC_AHSATA=y CONFIG_DWC_AHSATA=y
CONFIG_DM_GPIO=y
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_DM_THERMAL=y CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册