| Message ID | 1565724701-17344-4-git-send-email-eajames@linux.ibm.com |
|---|---|
| State | Superseded |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | ARM: aspeed: Add SD host controller driver | expand |
On 13/08/2019 21:31, Eddie James wrote: > Initialize the MMC subsystem on the ast2500 board. Compile MMC and the > Aspeed SD controller on the ast2500 EVB. > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > --- > arch/arm/include/asm/gpio.h | 3 ++- > arch/arm/mach-aspeed/ast2500-board.c | 3 +++ > configs/evb-ast2500_defconfig | 6 ++++++ > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h > index 370031f..38a5922 100644 > --- a/arch/arm/include/asm/gpio.h > +++ b/arch/arm/include/asm/gpio.h > @@ -1,6 +1,7 @@ > #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \ > !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) && \ > - !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) > + !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) && \ > + !defined(CONFIG_ARCH_ASPEED) > #include <asm/arch/gpio.h> > #endif > #include <asm-generic/gpio.h> > diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c > index e7edd54..52a4e05 100644 > --- a/arch/arm/mach-aspeed/ast2500-board.c > +++ b/arch/arm/mach-aspeed/ast2500-board.c > @@ -4,6 +4,7 @@ > */ > #include <common.h> > #include <dm.h> > +#include <mmc.h> > #include <ram.h> > #include <timer.h> > #include <asm/io.h> > @@ -55,6 +56,8 @@ int board_init(void) > { > gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > > + mmc_initialize(gd->bd); > + isn't that called automatically by board_init_r() already ? C. > return 0; > } > > diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig > index 59d41cb..bfa6b32 100644 > --- a/configs/evb-ast2500_defconfig > +++ b/configs/evb-ast2500_defconfig > @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y > CONFIG_CMD_I2C=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > +CONFIG_CMD_MMC=y > CONFIG_CMD_PING=y > CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" > CONFIG_NET_RANDOM_ETHADDR=y > @@ -36,3 +37,8 @@ CONFIG_SYS_NS16550=y > CONFIG_SYSRESET=y > CONFIG_TIMER=y > CONFIG_WDT=y > +CONFIG_MMC=y > +CONFIG_DM_MMC=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_ASPEED=y > +CONFIG_MMC_VERBOSE=y >
On 8/14/19 10:23 AM, Cédric Le Goater wrote: > On 13/08/2019 21:31, Eddie James wrote: >> Initialize the MMC subsystem on the ast2500 board. Compile MMC and the >> Aspeed SD controller on the ast2500 EVB. >> >> Signed-off-by: Eddie James <eajames@linux.ibm.com> >> --- >> arch/arm/include/asm/gpio.h | 3 ++- >> arch/arm/mach-aspeed/ast2500-board.c | 3 +++ >> configs/evb-ast2500_defconfig | 6 ++++++ >> 3 files changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h >> index 370031f..38a5922 100644 >> --- a/arch/arm/include/asm/gpio.h >> +++ b/arch/arm/include/asm/gpio.h >> @@ -1,6 +1,7 @@ >> #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \ >> !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) && \ >> - !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) >> + !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) && \ >> + !defined(CONFIG_ARCH_ASPEED) >> #include <asm/arch/gpio.h> >> #endif >> #include <asm-generic/gpio.h> >> diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c >> index e7edd54..52a4e05 100644 >> --- a/arch/arm/mach-aspeed/ast2500-board.c >> +++ b/arch/arm/mach-aspeed/ast2500-board.c >> @@ -4,6 +4,7 @@ >> */ >> #include <common.h> >> #include <dm.h> >> +#include <mmc.h> >> #include <ram.h> >> #include <timer.h> >> #include <asm/io.h> >> @@ -55,6 +56,8 @@ int board_init(void) >> { >> gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; >> >> + mmc_initialize(gd->bd); >> + > isn't that called automatically by board_init_r() already ? You are correct, I will drop this. Thanks, Eddie > > C. > >> return 0; >> } >> >> diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig >> index 59d41cb..bfa6b32 100644 >> --- a/configs/evb-ast2500_defconfig >> +++ b/configs/evb-ast2500_defconfig >> @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y >> CONFIG_CMD_I2C=y >> CONFIG_CMD_DHCP=y >> CONFIG_CMD_MII=y >> +CONFIG_CMD_MMC=y >> CONFIG_CMD_PING=y >> CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" >> CONFIG_NET_RANDOM_ETHADDR=y >> @@ -36,3 +37,8 @@ CONFIG_SYS_NS16550=y >> CONFIG_SYSRESET=y >> CONFIG_TIMER=y >> CONFIG_WDT=y >> +CONFIG_MMC=y >> +CONFIG_DM_MMC=y >> +CONFIG_MMC_SDHCI=y >> +CONFIG_MMC_SDHCI_ASPEED=y >> +CONFIG_MMC_VERBOSE=y >>
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 370031f..38a5922 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,6 +1,7 @@ #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \ !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) && \ - !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) + !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) && \ + !defined(CONFIG_ARCH_ASPEED) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c index e7edd54..52a4e05 100644 --- a/arch/arm/mach-aspeed/ast2500-board.c +++ b/arch/arm/mach-aspeed/ast2500-board.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <dm.h> +#include <mmc.h> #include <ram.h> #include <timer.h> #include <asm/io.h> @@ -55,6 +56,8 @@ int board_init(void) { gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + mmc_initialize(gd->bd); + return 0; } diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 59d41cb..bfa6b32 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +CONFIG_CMD_MMC=y CONFIG_CMD_PING=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_NET_RANDOM_ETHADDR=y @@ -36,3 +37,8 @@ CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y CONFIG_TIMER=y CONFIG_WDT=y +CONFIG_MMC=y +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ASPEED=y +CONFIG_MMC_VERBOSE=y
Initialize the MMC subsystem on the ast2500 board. Compile MMC and the Aspeed SD controller on the ast2500 EVB. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- arch/arm/include/asm/gpio.h | 3 ++- arch/arm/mach-aspeed/ast2500-board.c | 3 +++ configs/evb-ast2500_defconfig | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-)