From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chin Liang See <clsee@altera.com>
Date: Tue, 1 Dec 2015 13:24:51 +0800
Subject: [U-Boot] [PATCH 2/3] mmc: dwmmc: socfpga: Convert to DM
In-Reply-To: <1448912890-11522-2-git-send-email-marex@denx.de>
References: <1448912890-11522-1-git-send-email-marex@denx.de>
 <1448912890-11522-2-git-send-email-marex@denx.de>
Message-ID: <1448947491.2132.3.camel@altera.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Marek,

On Mon, 2015-11-30 at 20:48 +0100, Marek Vasut wrote:
> Convert the SoCFPGA shim for registering the DWMMC driver to DM.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Tom Rini <trini@konsulko.com>
> ---
>  drivers/mmc/socfpga_dw_mmc.c | 119 ++++++++++++++++++++-------------


I cannot applied this successfully to u-boot-socfpga.git. I tried git
am and also patch -1.


> ----------
>  1 file changed, 56 insertions(+), 63 deletions(-)
> 
> diff --git a/drivers/mmc/socfpga_dw_mmc.c
> b/drivers/mmc/socfpga_dw_mmc.c
> index 8076761..dd2b30a 100644
> --- a/drivers/mmc/socfpga_dw_mmc.c
> +++ b/drivers/mmc/socfpga_dw_mmc.c
> @@ -5,20 +5,28 @@
>   */
>  
>  #include <common.h>
> -#include <malloc.h>
> -#include <fdtdec.h>
> -#include <libfdt.h>
> -#include <dwmmc.h>
> -#include <errno.h>
> -#include <asm/arch/dwmmc.h>
>  #include <asm/arch/clock_manager.h>
> +#include <asm/arch/dwmmc.h>
>  #include <asm/arch/system_manager.h>
> +#include <dm.h>
> +#include <dwmmc.h>
> +#include <errno.h>
> +#include <fdtdec.h>
> +#include <libfdt.h>
> +#include <linux/err.h>
> +#include <malloc.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
>  
>  static const struct socfpga_clock_manager *clock_manager_base =
>  		(void *)SOCFPGA_CLKMGR_ADDRESS;
>  static const struct socfpga_system_manager *system_manager_base =
>  		(void *)SOCFPGA_SYSMGR_ADDRESS;
>  
> +struct socfpga_dwmmc_priv {
> +	struct dwmci_host	host;
> +};
> +

There is a new structure added when we add the dts support for drvsel
and smplsel. It's not reflected here.

Thanks
Chin Liang