* [PATCH v2] Add support HSMMC on Samsung SMDKV210
@ 2010-07-03 0:07 Kukjin Kim
2010-07-03 0:07 ` [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3 Kukjin Kim
2010-07-03 0:07 ` [PATCH v2 2/2] ARM: S5PV210: Add support HSMMC on SMDKV210 Kukjin Kim
0 siblings, 2 replies; 6+ messages in thread
From: Kukjin Kim @ 2010-07-03 0:07 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds support hsmmc on SMDKV210.
Changes since v1:
- Fixed wrong pin name in comments
- Adding missed call s5pv210_default_sdhci3() in s5pv210_map_io()
- Minor coding style fixes
[PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3
[PATCH v2 2/2] ARM: S5PV210: Add support HSMMC on SMDKV210
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3
2010-07-03 0:07 [PATCH v2] Add support HSMMC on Samsung SMDKV210 Kukjin Kim
@ 2010-07-03 0:07 ` Kukjin Kim
2010-07-03 0:17 ` Maurus Cuelenaere
2010-07-03 0:07 ` [PATCH v2 2/2] ARM: S5PV210: Add support HSMMC on SMDKV210 Kukjin Kim
1 sibling, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2010-07-03 0:07 UTC (permalink / raw)
To: linux-arm-kernel
From: Hyuk Lee <hyuk1.lee@samsung.com>
This patch adds hsmmc3 device definition in plat-samsung. Because now
S5PV210 can support 4 hsmmc such as hsmmc0, hsmmc1, hsmmc2 and hsmmc3
and that can be used in further Samsung SoCs.
Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
Changes since previous patch:
- coding style fixes
arch/arm/plat-samsung/Kconfig | 5 ++
arch/arm/plat-samsung/Makefile | 1 +
arch/arm/plat-samsung/dev-hsmmc3.c | 72 ++++++++++++++++++++++++++++
arch/arm/plat-samsung/include/plat/devs.h | 1 +
arch/arm/plat-samsung/include/plat/sdhci.h | 15 ++++++
5 files changed, 94 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 2753fb3..8efb012 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -160,6 +160,11 @@ config S3C_DEV_HSMMC2
help
Compile in platform device definitions for HSMMC channel 2
+config S3C_DEV_HSMMC3
+ bool
+ help
+ Compile in platform device definitions for HSMMC channel 3
+
config S3C_DEV_HWMON
bool
help
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index b1d82cc..c9abae5 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_S3C_ADC) += adc.o
obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o
obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o
+obj-$(CONFIG_S3C_DEV_HSMMC3) += dev-hsmmc3.o
obj-$(CONFIG_S3C_DEV_HWMON) += dev-hwmon.o
obj-y += dev-i2c0.o
obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c b/arch/arm/plat-samsung/dev-hsmmc3.c
new file mode 100644
index 0000000..57bd394
--- /dev/null
+++ b/arch/arm/plat-samsung/dev-hsmmc3.c
@@ -0,0 +1,72 @@
+/* linux/arch/arm/plat-samsung/dev-hsmmc3.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com
+ *
+ * Copyright (c) 2008 Simtec Electronics
+ * Ben Dooks <ben@simtec.co.uk>
+ * http://armlinux.simtec.co.uk/
+ *
+ * Based on arch/arm/plat-samsung/dev-hsmmc1.c
+ *
+ * Samsung device definition for hsmmc device 3
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/mmc/host.h>
+
+#include <mach/map.h>
+#include <plat/sdhci.h>
+#include <plat/devs.h>
+
+#define S3C_SZ_HSMMC (0x1000)
+
+static struct resource s3c_hsmmc3_resource[] = {
+ [0] = {
+ .start = S3C_PA_HSMMC3,
+ .end = S3C_PA_HSMMC3 + S3C_SZ_HSMMC - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = IRQ_MMC3,
+ .end = IRQ_MMC3,
+ .flags = IORESOURCE_IRQ,
+ }
+};
+
+static u64 s3c_device_hsmmc3_dmamask = 0xffffffffUL;
+
+struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata = {
+ .max_width = 4,
+ .host_caps = (MMC_CAP_4_BIT_DATA |
+ MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
+};
+
+struct platform_device s3c_device_hsmmc3 = {
+ .name = "s3c-sdhci",
+ .id = 3,
+ .num_resources = ARRAY_SIZE(s3c_hsmmc3_resource),
+ .resource = s3c_hsmmc3_resource,
+ .dev = {
+ .dma_mask = &s3c_device_hsmmc3_dmamask,
+ .coherent_dma_mask = 0xffffffffUL,
+ .platform_data = &s3c_hsmmc3_def_platdata,
+ },
+};
+
+void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd)
+{
+ struct s3c_sdhci_platdata *set = &s3c_hsmmc3_def_platdata;
+
+ set->max_width = pd->max_width;
+
+ if (pd->cfg_gpio)
+ set->cfg_gpio = pd->cfg_gpio;
+ if (pd->cfg_card)
+ set->cfg_card = pd->cfg_card;
+}
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index e6144e4..7842acd 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -54,6 +54,7 @@ extern struct platform_device s3c_device_hwmon;
extern struct platform_device s3c_device_hsmmc0;
extern struct platform_device s3c_device_hsmmc1;
extern struct platform_device s3c_device_hsmmc2;
+extern struct platform_device s3c_device_hsmmc3;
extern struct platform_device s3c_device_spi0;
extern struct platform_device s3c_device_spi1;
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index 98ebd50..1314ffa 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -58,6 +58,7 @@ struct s3c_sdhci_platdata {
extern void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd);
extern void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd);
extern void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd);
+extern void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd);
/* Default platform data, exported so that per-cpu initialisation can
* set the correct one when there are more than one cpu type selected.
@@ -66,6 +67,7 @@ extern void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd);
extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata;
extern struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata;
extern struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata;
+extern struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata;
/* Helper function availablity */
@@ -78,6 +80,7 @@ extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
extern void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
+extern void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
/* S3C6400 SDHCI setup */
@@ -264,10 +267,22 @@ static inline void s5pv210_default_sdhci2(void)
static inline void s5pv210_default_sdhci2(void) { }
#endif /* CONFIG_S3C_DEV_HSMMC2 */
+#ifdef CONFIG_S3C_DEV_HSMMC3
+static inline void s5pv210_default_sdhci3(void)
+{
+ s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
+ s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
+ s3c_hsmmc3_def_platdata.cfg_card = s5pv210_setup_sdhci_cfg_card;
+}
+#else
+static inline void s5pv210_default_sdhci3(void) { }
+#endif /* CONFIG_S3C_DEV_HSMMC3 */
+
#else
static inline void s5pv210_default_sdhci0(void) { }
static inline void s5pv210_default_sdhci1(void) { }
static inline void s5pv210_default_sdhci2(void) { }
+static inline void s5pv210_default_sdhci3(void) { }
#endif /* CONFIG_S5PC100_SETUP_SDHCI */
--
1.6.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: S5PV210: Add support HSMMC on SMDKV210
2010-07-03 0:07 [PATCH v2] Add support HSMMC on Samsung SMDKV210 Kukjin Kim
2010-07-03 0:07 ` [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3 Kukjin Kim
@ 2010-07-03 0:07 ` Kukjin Kim
1 sibling, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2010-07-03 0:07 UTC (permalink / raw)
To: linux-arm-kernel
From: Hyuk Lee <hyuk1.lee@samsung.com>
This patch adds support HSMMC on SMDKV210, and gpio configuration for
S5PV210 hsmmc3.
Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
Changes since previous patch:
- Fixed wrong pin name
- Adding missed call s5pv210_default_sdhci3() in s5pv210_map_io()
arch/arm/mach-s5pv210/Kconfig | 5 +++++
arch/arm/mach-s5pv210/cpu.c | 1 +
arch/arm/mach-s5pv210/include/mach/map.h | 1 +
arch/arm/mach-s5pv210/mach-smdkv210.c | 4 ++++
arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 20 ++++++++++++++++++++
5 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 0761eac..6aee967 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -72,9 +72,14 @@ config MACH_SMDKV210
select CPU_S5PV210
select ARCH_SPARSEMEM_ENABLE
select SAMSUNG_DEV_ADC
+ select S3C_DEV_HSMMC
+ select S3C_DEV_HSMMC1
+ select S3C_DEV_HSMMC2
+ select S3C_DEV_HSMMC3
select SAMSUNG_DEV_TS
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
+ select S5PV210_SETUP_SDHCI
help
Machine support for Samsung SMDKV210
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9..765034e 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -86,6 +86,7 @@ void __init s5pv210_map_io(void)
s5pv210_default_sdhci0();
s5pv210_default_sdhci1();
s5pv210_default_sdhci2();
+ s5pv210_default_sdhci3();
/* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c");
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 34eb168..fa9d7c2 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -97,6 +97,7 @@
#define S3C_PA_HSMMC0 S5PV210_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5PV210_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5PV210_PA_HSMMC(2)
+#define S3C_PA_HSMMC3 S5PV210_PA_HSMMC(3)
#define S3C_PA_IIC S5PV210_PA_IIC0
#define S3C_PA_IIC1 S5PV210_PA_IIC1
#define S3C_PA_IIC2 S5PV210_PA_IIC2
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 0d46279..b08f376 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -77,6 +77,10 @@ static struct platform_device *smdkv210_devices[] __initdata = {
&s5pv210_device_iis0,
&s5pv210_device_ac97,
&s3c_device_adc,
+ &s3c_device_hsmmc0,
+ &s3c_device_hsmmc1,
+ &s3c_device_hsmmc2,
+ &s3c_device_hsmmc3,
&s3c_device_ts,
&s3c_device_wdt,
};
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index fe7d86d..143bfec 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -102,3 +102,23 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
s3c_gpio_setpull(S5PV210_GPG2(2), S3C_GPIO_PULL_UP);
s3c_gpio_cfgpin(S5PV210_GPG2(2), S3C_GPIO_SFN(2));
}
+
+void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
+{
+ unsigned int gpio;
+
+ /* Set all the necessary GPG3[0:2] pins to special-function 2 */
+ for (gpio = S5PV210_GPG3(0); gpio < S5PV210_GPG3(2); gpio++) {
+ s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
+ s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+ }
+
+ /* Data pin GPG3[3:6] to special-function 2 */
+ for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++) {
+ s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
+ s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+ }
+
+ s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
+}
--
1.6.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3
2010-07-03 0:07 ` [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3 Kukjin Kim
@ 2010-07-03 0:17 ` Maurus Cuelenaere
2010-07-03 1:21 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Maurus Cuelenaere @ 2010-07-03 0:17 UTC (permalink / raw)
To: linux-arm-kernel
Op 03-07-10 02:07, Kukjin Kim schreef:
> From: Hyuk Lee <hyuk1.lee@samsung.com>
>
> This patch adds hsmmc3 device definition in plat-samsung. Because now
> S5PV210 can support 4 hsmmc such as hsmmc0, hsmmc1, hsmmc2 and hsmmc3
> and that can be used in further Samsung SoCs.
>
> Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> ---
> Changes since previous patch:
>
> - coding style fixes
>
> arch/arm/plat-samsung/Kconfig | 5 ++
> arch/arm/plat-samsung/Makefile | 1 +
> arch/arm/plat-samsung/dev-hsmmc3.c | 72 ++++++++++++++++++++++++++++
> arch/arm/plat-samsung/include/plat/devs.h | 1 +
> arch/arm/plat-samsung/include/plat/sdhci.h | 15 ++++++
> 5 files changed, 94 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c
>
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 2753fb3..8efb012 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -160,6 +160,11 @@ config S3C_DEV_HSMMC2
> help
> Compile in platform device definitions for HSMMC channel 2
>
> +config S3C_DEV_HSMMC3
> + bool
> + help
> + Compile in platform device definitions for HSMMC channel 3
> +
> config S3C_DEV_HWMON
> bool
> help
> diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
> index b1d82cc..c9abae5 100644
> --- a/arch/arm/plat-samsung/Makefile
> +++ b/arch/arm/plat-samsung/Makefile
> @@ -33,6 +33,7 @@ obj-$(CONFIG_S3C_ADC) += adc.o
> obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
> obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o
> obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o
> +obj-$(CONFIG_S3C_DEV_HSMMC3) += dev-hsmmc3.o
> obj-$(CONFIG_S3C_DEV_HWMON) += dev-hwmon.o
> obj-y += dev-i2c0.o
> obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
> diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c b/arch/arm/plat-samsung/dev-hsmmc3.c
> new file mode 100644
> index 0000000..57bd394
> --- /dev/null
> +++ b/arch/arm/plat-samsung/dev-hsmmc3.c
> @@ -0,0 +1,72 @@
> +/* linux/arch/arm/plat-samsung/dev-hsmmc3.c
> + *
> + * Copyright (c) 2010 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com
> + *
> + * Copyright (c) 2008 Simtec Electronics
> + * Ben Dooks <ben@simtec.co.uk>
> + * http://armlinux.simtec.co.uk/
> + *
> + * Based on arch/arm/plat-samsung/dev-hsmmc1.c
> + *
> + * Samsung device definition for hsmmc device 3
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/mmc/host.h>
> +
> +#include <mach/map.h>
> +#include <plat/sdhci.h>
> +#include <plat/devs.h>
> +
> +#define S3C_SZ_HSMMC (0x1000)
> +
> +static struct resource s3c_hsmmc3_resource[] = {
> + [0] = {
> + .start = S3C_PA_HSMMC3,
> + .end = S3C_PA_HSMMC3 + S3C_SZ_HSMMC - 1,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = {
> + .start = IRQ_MMC3,
> + .end = IRQ_MMC3,
> + .flags = IORESOURCE_IRQ,
> + }
> +};
> +
> +static u64 s3c_device_hsmmc3_dmamask = 0xffffffffUL;
> +
> +struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata = {
> + .max_width = 4,
> + .host_caps = (MMC_CAP_4_BIT_DATA |
> + MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
> +};
> +
> +struct platform_device s3c_device_hsmmc3 = {
> + .name = "s3c-sdhci",
> + .id = 3,
> + .num_resources = ARRAY_SIZE(s3c_hsmmc3_resource),
> + .resource = s3c_hsmmc3_resource,
> + .dev = {
> + .dma_mask = &s3c_device_hsmmc3_dmamask,
> + .coherent_dma_mask = 0xffffffffUL,
> + .platform_data = &s3c_hsmmc3_def_platdata,
> + },
> +};
> +
> +void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd)
> +{
> + struct s3c_sdhci_platdata *set = &s3c_hsmmc3_def_platdata;
> +
> + set->max_width = pd->max_width;
> +
> + if (pd->cfg_gpio)
> + set->cfg_gpio = pd->cfg_gpio;
> + if (pd->cfg_card)
> + set->cfg_card = pd->cfg_card;
> +}
> diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
> index e6144e4..7842acd 100644
> --- a/arch/arm/plat-samsung/include/plat/devs.h
> +++ b/arch/arm/plat-samsung/include/plat/devs.h
> @@ -54,6 +54,7 @@ extern struct platform_device s3c_device_hwmon;
> extern struct platform_device s3c_device_hsmmc0;
> extern struct platform_device s3c_device_hsmmc1;
> extern struct platform_device s3c_device_hsmmc2;
> +extern struct platform_device s3c_device_hsmmc3;
>
> extern struct platform_device s3c_device_spi0;
> extern struct platform_device s3c_device_spi1;
> diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
> index 98ebd50..1314ffa 100644
> --- a/arch/arm/plat-samsung/include/plat/sdhci.h
> +++ b/arch/arm/plat-samsung/include/plat/sdhci.h
> @@ -58,6 +58,7 @@ struct s3c_sdhci_platdata {
> extern void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd);
> extern void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd);
> extern void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd);
> +extern void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd);
>
> /* Default platform data, exported so that per-cpu initialisation can
> * set the correct one when there are more than one cpu type selected.
> @@ -66,6 +67,7 @@ extern void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd);
> extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata;
> extern struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata;
> extern struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata;
> +extern struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata;
>
> /* Helper function availablity */
>
> @@ -78,6 +80,7 @@ extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
> extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
> extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
> extern void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
> +extern void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
Shouldn't this be in PATCH 2/2?
>
> /* S3C6400 SDHCI setup */
>
> @@ -264,10 +267,22 @@ static inline void s5pv210_default_sdhci2(void)
> static inline void s5pv210_default_sdhci2(void) { }
> #endif /* CONFIG_S3C_DEV_HSMMC2 */
>
> +#ifdef CONFIG_S3C_DEV_HSMMC3
> +static inline void s5pv210_default_sdhci3(void)
> +{
> + s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
> + s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
> + s3c_hsmmc3_def_platdata.cfg_card = s5pv210_setup_sdhci_cfg_card;
> +}
> +#else
> +static inline void s5pv210_default_sdhci3(void) { }
> +#endif /* CONFIG_S3C_DEV_HSMMC3 */
This could be simplified by putting the #ifdef inside the function.
Also, same comment as above.
> +
> #else
> static inline void s5pv210_default_sdhci0(void) { }
> static inline void s5pv210_default_sdhci1(void) { }
> static inline void s5pv210_default_sdhci2(void) { }
> +static inline void s5pv210_default_sdhci3(void) { }
> #endif /* CONFIG_S5PC100_SETUP_SDHCI */
>
>
--
Maurus Cuelenaere
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3
2010-07-03 0:17 ` Maurus Cuelenaere
@ 2010-07-03 1:21 ` Kukjin Kim
2010-07-04 9:22 ` Maurus Cuelenaere
0 siblings, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2010-07-03 1:21 UTC (permalink / raw)
To: linux-arm-kernel
Maurus Cuelenaere wrote:
>
> Op 03-07-10 02:07, Kukjin Kim schreef:
> > From: Hyuk Lee <hyuk1.lee@samsung.com>
> >
> > This patch adds hsmmc3 device definition in plat-samsung. Because now
> > S5PV210 can support 4 hsmmc such as hsmmc0, hsmmc1, hsmmc2 and
> hsmmc3
> > and that can be used in further Samsung SoCs.
> >
> > Signed-off-by: Hyuk Lee <hyuk1.lee@samsung.com>
> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> > ---
> > Changes since previous patch:
> >
> > - coding style fixes
> >
> > arch/arm/plat-samsung/Kconfig | 5 ++
> > arch/arm/plat-samsung/Makefile | 1 +
> > arch/arm/plat-samsung/dev-hsmmc3.c | 72
> ++++++++++++++++++++++++++++
> > arch/arm/plat-samsung/include/plat/devs.h | 1 +
> > arch/arm/plat-samsung/include/plat/sdhci.h | 15 ++++++
> > 5 files changed, 94 insertions(+), 0 deletions(-)
> > create mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c
> >
> > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> > index 2753fb3..8efb012 100644
> > --- a/arch/arm/plat-samsung/Kconfig
> > +++ b/arch/arm/plat-samsung/Kconfig
> > @@ -160,6 +160,11 @@ config S3C_DEV_HSMMC2
> > help
> > Compile in platform device definitions for HSMMC channel 2
> >
> > +config S3C_DEV_HSMMC3
> > + bool
> > + help
> > + Compile in platform device definitions for HSMMC channel 3
> > +
> > config S3C_DEV_HWMON
> > bool
> > help
> > diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
> > index b1d82cc..c9abae5 100644
> > --- a/arch/arm/plat-samsung/Makefile
> > +++ b/arch/arm/plat-samsung/Makefile
> > @@ -33,6 +33,7 @@ obj-$(CONFIG_S3C_ADC) += adc.o
> > obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
> > obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o
> > obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o
> > +obj-$(CONFIG_S3C_DEV_HSMMC3) += dev-hsmmc3.o
> > obj-$(CONFIG_S3C_DEV_HWMON) += dev-hwmon.o
> > obj-y += dev-i2c0.o
> > obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
> > diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c b/arch/arm/plat-samsung/dev-
> hsmmc3.c
> > new file mode 100644
> > index 0000000..57bd394
> > --- /dev/null
> > +++ b/arch/arm/plat-samsung/dev-hsmmc3.c
> > @@ -0,0 +1,72 @@
> > +/* linux/arch/arm/plat-samsung/dev-hsmmc3.c
> > + *
> > + * Copyright (c) 2010 Samsung Electronics Co., Ltd.
> > + * http://www.samsung.com
> > + *
> > + * Copyright (c) 2008 Simtec Electronics
> > + * Ben Dooks <ben@simtec.co.uk>
> > + * http://armlinux.simtec.co.uk/
> > + *
> > + * Based on arch/arm/plat-samsung/dev-hsmmc1.c
> > + *
> > + * Samsung device definition for hsmmc device 3
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > +*/
> > +
> > +#include <linux/kernel.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/mmc/host.h>
> > +
> > +#include <mach/map.h>
> > +#include <plat/sdhci.h>
> > +#include <plat/devs.h>
> > +
> > +#define S3C_SZ_HSMMC (0x1000)
> > +
> > +static struct resource s3c_hsmmc3_resource[] = {
> > + [0] = {
> > + .start = S3C_PA_HSMMC3,
> > + .end = S3C_PA_HSMMC3 + S3C_SZ_HSMMC - 1,
> > + .flags = IORESOURCE_MEM,
> > + },
> > + [1] = {
> > + .start = IRQ_MMC3,
> > + .end = IRQ_MMC3,
> > + .flags = IORESOURCE_IRQ,
> > + }
> > +};
> > +
> > +static u64 s3c_device_hsmmc3_dmamask = 0xffffffffUL;
> > +
> > +struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata = {
> > + .max_width = 4,
> > + .host_caps = (MMC_CAP_4_BIT_DATA |
> > + MMC_CAP_MMC_HIGHSPEED |
> MMC_CAP_SD_HIGHSPEED),
> > +};
> > +
> > +struct platform_device s3c_device_hsmmc3 = {
> > + .name = "s3c-sdhci",
> > + .id = 3,
> > + .num_resources = ARRAY_SIZE(s3c_hsmmc3_resource),
> > + .resource = s3c_hsmmc3_resource,
> > + .dev = {
> > + .dma_mask = &s3c_device_hsmmc3_dmamask,
> > + .coherent_dma_mask = 0xffffffffUL,
> > + .platform_data = &s3c_hsmmc3_def_platdata,
> > + },
> > +};
> > +
> > +void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd)
> > +{
> > + struct s3c_sdhci_platdata *set = &s3c_hsmmc3_def_platdata;
> > +
> > + set->max_width = pd->max_width;
> > +
> > + if (pd->cfg_gpio)
> > + set->cfg_gpio = pd->cfg_gpio;
> > + if (pd->cfg_card)
> > + set->cfg_card = pd->cfg_card;
> > +}
> > diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-
> samsung/include/plat/devs.h
> > index e6144e4..7842acd 100644
> > --- a/arch/arm/plat-samsung/include/plat/devs.h
> > +++ b/arch/arm/plat-samsung/include/plat/devs.h
> > @@ -54,6 +54,7 @@ extern struct platform_device s3c_device_hwmon;
> > extern struct platform_device s3c_device_hsmmc0;
> > extern struct platform_device s3c_device_hsmmc1;
> > extern struct platform_device s3c_device_hsmmc2;
> > +extern struct platform_device s3c_device_hsmmc3;
> >
> > extern struct platform_device s3c_device_spi0;
> > extern struct platform_device s3c_device_spi1;
> > diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-
> samsung/include/plat/sdhci.h
> > index 98ebd50..1314ffa 100644
> > --- a/arch/arm/plat-samsung/include/plat/sdhci.h
> > +++ b/arch/arm/plat-samsung/include/plat/sdhci.h
> > @@ -58,6 +58,7 @@ struct s3c_sdhci_platdata {
> > extern void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd);
> > extern void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd);
> > extern void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd);
> > +extern void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd);
> >
> > /* Default platform data, exported so that per-cpu initialisation can
> > * set the correct one when there are more than one cpu type selected.
> > @@ -66,6 +67,7 @@ extern void s3c_sdhci2_set_platdata(struct
> s3c_sdhci_platdata *pd);
> > extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata;
> > extern struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata;
> > extern struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata;
> > +extern struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata;
> >
> > /* Helper function availablity */
> >
> > @@ -78,6 +80,7 @@ extern void s3c64xx_setup_sdhci2_cfg_gpio(struct
> platform_device *, int w);
> > extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
> > extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
> > extern void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
> > +extern void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
>
> Shouldn't this be in PATCH 2/2?
>
You're right, but I was thinking this is better to handle this.
...will move this into second.
> >
> > /* S3C6400 SDHCI setup */
> >
> > @@ -264,10 +267,22 @@ static inline void s5pv210_default_sdhci2(void)
> > static inline void s5pv210_default_sdhci2(void) { }
> > #endif /* CONFIG_S3C_DEV_HSMMC2 */
> >
> > +#ifdef CONFIG_S3C_DEV_HSMMC3
> > +static inline void s5pv210_default_sdhci3(void)
> > +{
> > + s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
> > + s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
> > + s3c_hsmmc3_def_platdata.cfg_card = s5pv210_setup_sdhci_cfg_card;
> > +}
> > +#else
> > +static inline void s5pv210_default_sdhci3(void) { }
> > +#endif /* CONFIG_S3C_DEV_HSMMC3 */
>
> This could be simplified by putting the #ifdef inside the function.
Yeah, you're right..but used same style with others in this file.
...so will modify it as your comment with others soon.
> Also, same comment as above.
>
OK.
> > +
> > #else
> > static inline void s5pv210_default_sdhci0(void) { }
> > static inline void s5pv210_default_sdhci1(void) { }
> > static inline void s5pv210_default_sdhci2(void) { }
> > +static inline void s5pv210_default_sdhci3(void) { }
> > #endif /* CONFIG_S5PC100_SETUP_SDHCI */
> >
> >
>
>
> --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3
2010-07-03 1:21 ` Kukjin Kim
@ 2010-07-04 9:22 ` Maurus Cuelenaere
0 siblings, 0 replies; 6+ messages in thread
From: Maurus Cuelenaere @ 2010-07-04 9:22 UTC (permalink / raw)
To: linux-arm-kernel
Op 03-07-10 03:21, Kukjin Kim schreef:
> Maurus Cuelenaere wrote:
>> Op 03-07-10 02:07, Kukjin Kim schreef:
>>
>>> /* S3C6400 SDHCI setup */
>>>
>>> @@ -264,10 +267,22 @@ static inline void s5pv210_default_sdhci2(void)
>>> static inline void s5pv210_default_sdhci2(void) { }
>>> #endif /* CONFIG_S3C_DEV_HSMMC2 */
>>>
>>> +#ifdef CONFIG_S3C_DEV_HSMMC3
>>> +static inline void s5pv210_default_sdhci3(void)
>>> +{
>>> + s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
>>> + s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
>>> + s3c_hsmmc3_def_platdata.cfg_card = s5pv210_setup_sdhci_cfg_card;
>>> +}
>>> +#else
>>> +static inline void s5pv210_default_sdhci3(void) { }
>>> +#endif /* CONFIG_S3C_DEV_HSMMC3 */
>> This could be simplified by putting the #ifdef inside the function.
> Yeah, you're right..but used same style with others in this file.
> ...so will modify it as your comment with others soon.
Hmm yes, I guess it's just a matter of personal taste.
--
Maurus Cuelenaere
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-04 9:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-03 0:07 [PATCH v2] Add support HSMMC on Samsung SMDKV210 Kukjin Kim
2010-07-03 0:07 ` [PATCH v2 1/2] ARM: SAMSUNG: Add device definition for HSMMC3 Kukjin Kim
2010-07-03 0:17 ` Maurus Cuelenaere
2010-07-03 1:21 ` Kukjin Kim
2010-07-04 9:22 ` Maurus Cuelenaere
2010-07-03 0:07 ` [PATCH v2 2/2] ARM: S5PV210: Add support HSMMC on SMDKV210 Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).