diff mbox

[U-Boot,v2,7/7] mx35: Add cpu_mmc_init()

Message ID 361544628.2524200.1345236228147.JavaMail.root@advansee.com
State Accepted
Commit 09bc3d04d95c7a2be965d4f173a5e2946ca903c3
Delegated to: Stefano Babic
Headers show

Commit Message

Benoît Thébaudeau Aug. 17, 2012, 8:43 p.m. UTC
Add cpu_mmc_init() function to make it easy to init a single eSDHC instance.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
---
Changes for v2:
 - Do not define cpu_mmc_init() if CONFIG_FSL_ESDHC is not defined.

 .../arch/arm/cpu/arm1136/mx35/generic.c            |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

Comments

Stefano Babic Aug. 17, 2012, 9:18 p.m. UTC | #1
On 17/08/2012 22:43, Benoît Thébaudeau wrote:
> Add cpu_mmc_init() function to make it easy to init a single eSDHC instance.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> Changes for v2:
>  - Do not define cpu_mmc_init() if CONFIG_FSL_ESDHC is not defined.
> 
>  .../arch/arm/cpu/arm1136/mx35/generic.c            |   15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> index 15a0098..8f61069 100644
> --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c
> +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> @@ -31,6 +31,9 @@
>  #include <asm/arch/crm_regs.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/sys_proto.h>
> +#ifdef CONFIG_FSL_ESDHC
> +#include <fsl_esdhc.h>
> +#endif
>  #include <netdev.h>
>  
>  #define CLK_CODE(arm, ahb, sel) (((arm) << 16) + ((ahb) << 8) + (sel))
> @@ -458,7 +461,6 @@ int print_cpuinfo(void)
>   * Initializes on-chip ethernet controllers.
>   * to override, implement board_eth_init()
>   */
> -
>  int cpu_eth_init(bd_t *bis)
>  {
>  	int rc = -ENODEV;
> @@ -470,6 +472,17 @@ int cpu_eth_init(bd_t *bis)
>  	return rc;
>  }
>  
> +#ifdef CONFIG_FSL_ESDHC
> +/*
> + * Initializes on-chip MMC controllers.
> + * to override, implement board_mmc_init()
> + */
> +int cpu_mmc_init(bd_t *bis)
> +{
> +	return fsl_esdhc_mmc_init(bis);
> +}
> +#endif
> +
>  int get_clocks(void)
>  {
>  #ifdef CONFIG_FSL_ESDHC
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Stefano Babic Aug. 20, 2012, 8:01 a.m. UTC | #2
On 17/08/2012 22:43, Benoît Thébaudeau wrote:
> Add cpu_mmc_init() function to make it easy to init a single eSDHC instance.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> Changes for v2:
>  - Do not define cpu_mmc_init() if CONFIG_FSL_ESDHC is not defined.
> 
>  .../arch/arm/cpu/arm1136/mx35/generic.c            |   15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> index 15a0098..8f61069 100644
> --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c
> +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> @@ -31,6 +31,9 @@
>  #include <asm/arch/crm_regs.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/sys_proto.h>
> +#ifdef CONFIG_FSL_ESDHC
> +#include <fsl_esdhc.h>
> +#endif
>  #include <netdev.h>
>  
>  #define CLK_CODE(arm, ahb, sel) (((arm) << 16) + ((ahb) << 8) + (sel))
> @@ -458,7 +461,6 @@ int print_cpuinfo(void)
>   * Initializes on-chip ethernet controllers.
>   * to override, implement board_eth_init()
>   */
> -
>  int cpu_eth_init(bd_t *bis)
>  {
>  	int rc = -ENODEV;
> @@ -470,6 +472,17 @@ int cpu_eth_init(bd_t *bis)
>  	return rc;
>  }
>  
> +#ifdef CONFIG_FSL_ESDHC
> +/*
> + * Initializes on-chip MMC controllers.
> + * to override, implement board_mmc_init()
> + */
> +int cpu_mmc_init(bd_t *bis)
> +{
> +	return fsl_esdhc_mmc_init(bis);
> +}
> +#endif
> +
>  int get_clocks(void)
>  {
>  #ifdef CONFIG_FSL_ESDHC
> 

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
index 15a0098..8f61069 100644
--- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c
+++ u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
@@ -31,6 +31,9 @@ 
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#ifdef CONFIG_FSL_ESDHC
+#include <fsl_esdhc.h>
+#endif
 #include <netdev.h>
 
 #define CLK_CODE(arm, ahb, sel) (((arm) << 16) + ((ahb) << 8) + (sel))
@@ -458,7 +461,6 @@  int print_cpuinfo(void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-
 int cpu_eth_init(bd_t *bis)
 {
 	int rc = -ENODEV;
@@ -470,6 +472,17 @@  int cpu_eth_init(bd_t *bis)
 	return rc;
 }
 
+#ifdef CONFIG_FSL_ESDHC
+/*
+ * Initializes on-chip MMC controllers.
+ * to override, implement board_mmc_init()
+ */
+int cpu_mmc_init(bd_t *bis)
+{
+	return fsl_esdhc_mmc_init(bis);
+}
+#endif
+
 int get_clocks(void)
 {
 #ifdef CONFIG_FSL_ESDHC