Message ID | 1489420274-2691-4-git-send-email-tharvey@gateworks.com |
---|---|
State | Accepted |
Commit | 65da5c3b653c8ac63accc51194863bc8ff10b4e3 |
Delegated to: | Stefano Babic |
Headers | show |
On 13/03/2017 16:51, Tim Harvey wrote: > Signed-off-by: Tim Harvey <tharvey@gateworks.com> > --- > board/gateworks/gw_ventana/common.c | 35 +++++++++++++++++++++++++++++++++ > board/gateworks/gw_ventana/gw_ventana.c | 33 ------------------------------- > 2 files changed, 35 insertions(+), 33 deletions(-) > > diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c > index 4065c56..eb14cb7 100644 > --- a/board/gateworks/gw_ventana/common.c > +++ b/board/gateworks/gw_ventana/common.c > @@ -6,10 +6,12 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > +#include <asm/arch/clock.h> > #include <asm/arch/mx6-pins.h> > #include <asm/arch/sys_proto.h> > #include <asm/gpio.h> > #include <asm/imx-common/mxc_i2c.h> > +#include <fsl_esdhc.h> > #include <hwconfig.h> > #include <power/pmic.h> > #include <power/ltc3676_pmic.h> > @@ -35,6 +37,17 @@ void setup_iomux_uart(void) > SETUP_IOMUX_PADS(uart2_pads); > } > > +/* MMC */ > +static iomux_v3_cfg_t const usdhc3_pads[] = { > + IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > + IOMUX_PADS(PAD_SD3_DAT5__GPIO7_IO00 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > +}; > + > /* I2C1: GSC */ > static struct i2c_pads_info mx6q_i2c_pad_info0 = { > .scl = { > @@ -964,3 +977,25 @@ void setup_pmic(void) > } > } > } > + > +#ifdef CONFIG_FSL_ESDHC > +static struct fsl_esdhc_cfg usdhc_cfg = { USDHC3_BASE_ADDR }; > + > +int board_mmc_init(bd_t *bis) > +{ > + /* Only one USDHC controller on Ventana */ > + SETUP_IOMUX_PADS(usdhc3_pads); > + usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); > + usdhc_cfg.max_bus_width = 4; > + > + return fsl_esdhc_initialize(bis, &usdhc_cfg); > +} > + > +int board_mmc_getcd(struct mmc *mmc) > +{ > + /* Card Detect */ > + gpio_request(GP_SD3_CD, "sd_cd"); > + gpio_direction_input(GP_SD3_CD); > + return !gpio_get_value(GP_SD3_CD); > +} > +#endif /* CONFIG_FSL_ESDHC */ > diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c > index 5d871ce..ba648f5 100644 > --- a/board/gateworks/gw_ventana/gw_ventana.c > +++ b/board/gateworks/gw_ventana/gw_ventana.c > @@ -52,17 +52,6 @@ struct ventana_board_info ventana_info; > > static int board_type; > > -/* MMC */ > -static iomux_v3_cfg_t const usdhc3_pads[] = { > - IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > - IOMUX_PADS(PAD_SD3_DAT5__GPIO7_IO00 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), > -}; > - > /* ENET */ > static iomux_v3_cfg_t const enet_pads[] = { > IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)), > @@ -193,28 +182,6 @@ int board_ehci_power(int port, int on) > } > #endif /* CONFIG_USB_EHCI_MX6 */ > > -#ifdef CONFIG_FSL_ESDHC > -static struct fsl_esdhc_cfg usdhc_cfg = { USDHC3_BASE_ADDR }; > - > -int board_mmc_getcd(struct mmc *mmc) > -{ > - /* Card Detect */ > - gpio_request(GP_SD3_CD, "sd_cd"); > - gpio_direction_input(GP_SD3_CD); > - return !gpio_get_value(GP_SD3_CD); > -} > - > -int board_mmc_init(bd_t *bis) > -{ > - /* Only one USDHC controller on Ventana */ > - SETUP_IOMUX_PADS(usdhc3_pads); > - usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); > - usdhc_cfg.max_bus_width = 4; > - > - return fsl_esdhc_initialize(bis, &usdhc_cfg); > -} > -#endif /* CONFIG_FSL_ESDHC */ > - > #ifdef CONFIG_MXC_SPI > iomux_v3_cfg_t const ecspi1_pads[] = { > /* SS1 */ > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 4065c56..eb14cb7 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -6,10 +6,12 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include <asm/arch/clock.h> #include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/mxc_i2c.h> +#include <fsl_esdhc.h> #include <hwconfig.h> #include <power/pmic.h> #include <power/ltc3676_pmic.h> @@ -35,6 +37,17 @@ void setup_iomux_uart(void) SETUP_IOMUX_PADS(uart2_pads); } +/* MMC */ +static iomux_v3_cfg_t const usdhc3_pads[] = { + IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), + IOMUX_PADS(PAD_SD3_DAT5__GPIO7_IO00 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), +}; + /* I2C1: GSC */ static struct i2c_pads_info mx6q_i2c_pad_info0 = { .scl = { @@ -964,3 +977,25 @@ void setup_pmic(void) } } } + +#ifdef CONFIG_FSL_ESDHC +static struct fsl_esdhc_cfg usdhc_cfg = { USDHC3_BASE_ADDR }; + +int board_mmc_init(bd_t *bis) +{ + /* Only one USDHC controller on Ventana */ + SETUP_IOMUX_PADS(usdhc3_pads); + usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); + usdhc_cfg.max_bus_width = 4; + + return fsl_esdhc_initialize(bis, &usdhc_cfg); +} + +int board_mmc_getcd(struct mmc *mmc) +{ + /* Card Detect */ + gpio_request(GP_SD3_CD, "sd_cd"); + gpio_direction_input(GP_SD3_CD); + return !gpio_get_value(GP_SD3_CD); +} +#endif /* CONFIG_FSL_ESDHC */ diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 5d871ce..ba648f5 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -52,17 +52,6 @@ struct ventana_board_info ventana_info; static int board_type; -/* MMC */ -static iomux_v3_cfg_t const usdhc3_pads[] = { - IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT5__GPIO7_IO00 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), -}; - /* ENET */ static iomux_v3_cfg_t const enet_pads[] = { IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)), @@ -193,28 +182,6 @@ int board_ehci_power(int port, int on) } #endif /* CONFIG_USB_EHCI_MX6 */ -#ifdef CONFIG_FSL_ESDHC -static struct fsl_esdhc_cfg usdhc_cfg = { USDHC3_BASE_ADDR }; - -int board_mmc_getcd(struct mmc *mmc) -{ - /* Card Detect */ - gpio_request(GP_SD3_CD, "sd_cd"); - gpio_direction_input(GP_SD3_CD); - return !gpio_get_value(GP_SD3_CD); -} - -int board_mmc_init(bd_t *bis) -{ - /* Only one USDHC controller on Ventana */ - SETUP_IOMUX_PADS(usdhc3_pads); - usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg.max_bus_width = 4; - - return fsl_esdhc_initialize(bis, &usdhc_cfg); -} -#endif /* CONFIG_FSL_ESDHC */ - #ifdef CONFIG_MXC_SPI iomux_v3_cfg_t const ecspi1_pads[] = { /* SS1 */
Signed-off-by: Tim Harvey <tharvey@gateworks.com> --- board/gateworks/gw_ventana/common.c | 35 +++++++++++++++++++++++++++++++++ board/gateworks/gw_ventana/gw_ventana.c | 33 ------------------------------- 2 files changed, 35 insertions(+), 33 deletions(-)