diff mbox

[U-Boot,v2,3/4] EXYNOS: mmc: support DesignWare Controller for Samsung-SoC

Message ID 4FF2A60C.4090703@samsung.com
State Changes Requested
Delegated to: Andy Fleming
Headers show

Commit Message

Jaehoon Chung July 3, 2012, 7:58 a.m. UTC
Support DesignWare MMC Controller for Samsung Specific.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Rajeshawari Shinde <rajeshwari.s@samsung.com>
---
 arch/arm/include/asm/arch-exynos/dwmmc.h |   36 ++++++++++++++++++
 drivers/mmc/exynos_dw_mmc.c              |   58 ++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-exynos/dwmmc.h
 create mode 100644 drivers/mmc/exynos_dw_mmc.c

Comments

Minkyu Kang Aug. 3, 2012, 4:26 a.m. UTC | #1
On 3 July 2012 16:58, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Support DesignWare MMC Controller for Samsung Specific.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Rajeshawari Shinde <rajeshwari.s@samsung.com>
> ---
>  arch/arm/include/asm/arch-exynos/dwmmc.h |   36 ++++++++++++++++++
>  drivers/mmc/exynos_dw_mmc.c              |   58 ++++++++++++++++++++++++++++++
>  2 files changed, 94 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/include/asm/arch-exynos/dwmmc.h
>  create mode 100644 drivers/mmc/exynos_dw_mmc.c
>
> diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/include/asm/arch-exynos/dwmmc.h
> new file mode 100644
> index 0000000..8acdf9b
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-exynos/dwmmc.h
> @@ -0,0 +1,36 @@
> +/*
> + * (C) Copyright 2012 SAMSUNG Electronics
> + * Jaehoon Chung <jh80.chung@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> + *
> + */
> +
> +#define DWMCI_CLKSEL           0x09C
> +#define DWMCI_SHIFT_0          0x0
> +#define DWMCI_SHIFT_1          0x1
> +#define DWMCI_SHIFT_2          0x2
> +#define DWMCI_SHIFT_3          0x3
> +#define DWMCI_SET_SAMPLE_CLK(x)        (x)
> +#define DWMCI_SET_DRV_CLK(x)   ((x) << 16)
> +#define DWMCI_SET_DIV_RATIO(x) ((x) << 24)
> +
> +int exynos_dwmci_init(u32 regbase, int bus_width, int index);
> +
> +static inline unsigned int exynos_dwmmc_init(int index, int bus_width)
> +{
> +       unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
> +       return exynos_dwmci_init(base, bus_width, index);
> +}
> diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
> new file mode 100644
> index 0000000..286a7df
> --- /dev/null
> +++ b/drivers/mmc/exynos_dw_mmc.c
> @@ -0,0 +1,58 @@
> +/*
> + * (C) Copyright 2012 SAMSUNG Electronics
> + * Jaehoon Chung <jh80.chung@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,  MA 02111-1307 USA
> + *
> + */
> +
> +#include <common.h>
> +#include <malloc.h>
> +#include <dwmmc.h>
> +#include <asm/arch/dwmmc.h>
> +#include <asm/arch/clk.h>
> +
> +static char *EXYNOS_NAME = "EXYNOS DWMMC";
> +
> +static void exynos_dwmci_clksel(struct dwmci_host *host)
> +{
> +       u32 val;
> +       val = DWMCI_SET_SAMPLE_CLK(DWMCI_SHIFT_0) |
> +               DWMCI_SET_DRV_CLK(DWMCI_SHIFT_0) | DWMCI_SET_DIV_RATIO(0);
> +
> +       dwmci_writel(host, DWMCI_CLKSEL, val);
> +}
> +
> +int exynos_dwmci_init(u32 regbase, int bus_width, int index)
> +{
> +       struct dwmci_host *host = NULL;
> +       host = (struct dwmci_host *)malloc(sizeof(struct dwmci_host));
> +       if (!host) {
> +               printf("dwmci_host malloc fail!\n");
> +               return 1;
> +       }
> +
> +       host->name = EXYNOS_NAME;
> +       host->ioaddr = (void *)regbase;
> +       host->buswidth = bus_width;
> +       host->clksel = exynos_dwmci_clksel;
> +       host->dev_index = index;
> +       host->mmc_clk = get_mmc_clk;
> +
> +       add_dwmci(host, 52000000, 400000, index);
> +
> +       return 0;
> +}
> +

remove this space.

Thanks.
Minkyu Kang.
Andy Fleming Aug. 30, 2012, 9:35 p.m. UTC | #2
On Tue, Jul 3, 2012 at 12:58 AM, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Support DesignWare MMC Controller for Samsung Specific.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Rajeshawari Shinde <rajeshwari.s@samsung.com>
> ---
>  arch/arm/include/asm/arch-exynos/dwmmc.h |   36 ++++++++++++++++++
>  drivers/mmc/exynos_dw_mmc.c              |   58 ++++++++++++++++++++++++++++++


> +int exynos_dwmci_init(u32 regbase, int bus_width, int index)
> +{
> +       struct dwmci_host *host = NULL;
> +       host = (struct dwmci_host *)malloc(sizeof(struct dwmci_host));


It is not necessary (or desirable) to cast the result of malloc.

Andy
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/include/asm/arch-exynos/dwmmc.h
new file mode 100644
index 0000000..8acdf9b
--- /dev/null
+++ b/arch/arm/include/asm/arch-exynos/dwmmc.h
@@ -0,0 +1,36 @@ 
+/*
+ * (C) Copyright 2012 SAMSUNG Electronics
+ * Jaehoon Chung <jh80.chung@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define DWMCI_CLKSEL		0x09C
+#define DWMCI_SHIFT_0		0x0
+#define DWMCI_SHIFT_1		0x1
+#define DWMCI_SHIFT_2		0x2
+#define DWMCI_SHIFT_3		0x3
+#define DWMCI_SET_SAMPLE_CLK(x)	(x)
+#define DWMCI_SET_DRV_CLK(x)	((x) << 16)
+#define DWMCI_SET_DIV_RATIO(x)	((x) << 24)
+
+int exynos_dwmci_init(u32 regbase, int bus_width, int index);
+
+static inline unsigned int exynos_dwmmc_init(int index, int bus_width)
+{
+	unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
+	return exynos_dwmci_init(base, bus_width, index);
+}
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
new file mode 100644
index 0000000..286a7df
--- /dev/null
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -0,0 +1,58 @@ 
+/*
+ * (C) Copyright 2012 SAMSUNG Electronics
+ * Jaehoon Chung <jh80.chung@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,  MA 02111-1307 USA
+ *
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <dwmmc.h>
+#include <asm/arch/dwmmc.h>
+#include <asm/arch/clk.h>
+
+static char *EXYNOS_NAME = "EXYNOS DWMMC";
+
+static void exynos_dwmci_clksel(struct dwmci_host *host)
+{
+	u32 val;
+	val = DWMCI_SET_SAMPLE_CLK(DWMCI_SHIFT_0) |
+		DWMCI_SET_DRV_CLK(DWMCI_SHIFT_0) | DWMCI_SET_DIV_RATIO(0);
+
+	dwmci_writel(host, DWMCI_CLKSEL, val);
+}
+
+int exynos_dwmci_init(u32 regbase, int bus_width, int index)
+{
+	struct dwmci_host *host = NULL;
+	host = (struct dwmci_host *)malloc(sizeof(struct dwmci_host));
+	if (!host) {
+		printf("dwmci_host malloc fail!\n");
+		return 1;
+	}
+
+	host->name = EXYNOS_NAME;
+	host->ioaddr = (void *)regbase;
+	host->buswidth = bus_width;
+	host->clksel = exynos_dwmci_clksel;
+	host->dev_index = index;
+	host->mmc_clk = get_mmc_clk;
+
+	add_dwmci(host, 52000000, 400000, index);
+
+	return 0;
+}
+