* [PATCH 2/2] marzen: add SDHI0 support
@ 2012-07-17 11:53 Phil Edworthy
2012-08-02 3:02 ` Kuninori Morimoto
2012-08-06 8:51 ` phil.edworthy
0 siblings, 2 replies; 3+ messages in thread
From: Phil Edworthy @ 2012-07-17 11:53 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
---
arch/arm/mach-shmobile/board-marzen.c | 48 +++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 3a528cf..3c54a2f 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -30,6 +30,8 @@
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
#include <linux/smsc911x.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mfd/tmio.h>
#include <mach/hardware.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
@@ -75,8 +77,44 @@ static struct platform_device eth_device = {
.num_resources = ARRAY_SIZE(smsc911x_resources),
};
+/* Fixed 3.3V regulator to be used by SDHI0 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] +{
+ REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+ REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+};
+
+static struct resource sdhi0_resources[] = {
+ [0] = {
+ .name = "sdhi0",
+ .start = 0xffe4c000,
+ .end = 0xffe4c0ff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = gic_spi(104),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct sh_mobile_sdhi_info sdhi0_platform_data = {
+ .tmio_flags = (TMIO_MMC_WRPROTECT_DISABLE
+ | TMIO_MMC_HAS_IDLE_WAIT),
+ .tmio_caps = MMC_CAP_SD_HIGHSPEED,
+};
+
+static struct platform_device sdhi0_device = {
+ .name = "sh_mobile_sdhi",
+ .num_resources = ARRAY_SIZE(sdhi0_resources),
+ .resource = sdhi0_resources,
+ .id = 0,
+ .dev = {
+ .platform_data = &sdhi0_platform_data,
+ }
+};
static struct platform_device *marzen_devices[] __initdata = {
ð_device,
+ &sdhi0_device,
};
static void __init marzen_init(void)
@@ -97,6 +135,16 @@ static void __init marzen_init(void)
gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */
gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */
+ /* SD0 (CN20) */
+ gpio_request(GPIO_FN_SD0_CLK, NULL);
+ gpio_request(GPIO_FN_SD0_CMD, NULL);
+ gpio_request(GPIO_FN_SD0_DAT0, NULL);
+ gpio_request(GPIO_FN_SD0_DAT1, NULL);
+ gpio_request(GPIO_FN_SD0_DAT2, NULL);
+ gpio_request(GPIO_FN_SD0_DAT3, NULL);
+ gpio_request(GPIO_FN_SD0_CD, NULL);
+ gpio_request(GPIO_FN_SD0_WP, NULL);
+
r8a7779_add_standard_devices();
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] marzen: add SDHI0 support
2012-07-17 11:53 [PATCH 2/2] marzen: add SDHI0 support Phil Edworthy
@ 2012-08-02 3:02 ` Kuninori Morimoto
2012-08-06 8:51 ` phil.edworthy
1 sibling, 0 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2012-08-02 3:02 UTC (permalink / raw)
To: linux-sh
Hi phil
I tested this patch, and it works well.
But this is small comment from me.
> ---
> arch/arm/mach-shmobile/board-marzen.c | 48 +++++++++++++++++++++++++++++++++
> 1 files changed, 48 insertions(+), 0 deletions(-)
it is better if this patch update defconfig
> diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
> index 3a528cf..3c54a2f 100644
> --- a/arch/arm/mach-shmobile/board-marzen.c
> +++ b/arch/arm/mach-shmobile/board-marzen.c
> @@ -30,6 +30,8 @@
> #include <linux/regulator/fixed.h>
> #include <linux/regulator/machine.h>
> #include <linux/smsc911x.h>
> +#include <linux/mmc/sh_mobile_sdhi.h>
> +#include <linux/mfd/tmio.h>
> #include <mach/hardware.h>
> #include <mach/r8a7779.h>
> #include <mach/common.h>
> @@ -75,8 +77,44 @@ static struct platform_device eth_device = {
> .num_resources = ARRAY_SIZE(smsc911x_resources),
> };
>
> +/* Fixed 3.3V regulator to be used by SDHI0 */
> +static struct regulator_consumer_supply fixed3v3_power_consumers[] > +{
> + REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
> + REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
> +};
I got warning
${LINUX}/arch/arm/mach-shmobile/board-marzen.c:81:41: \
warning: 'fixed3v3_power_consumers' defined but not used [-Wunused-variable]
> +
> +static struct resource sdhi0_resources[] = {
> + [0] = {
> + .name = "sdhi0",
> + .start = 0xffe4c000,
> + .end = 0xffe4c0ff,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = {
> + .start = gic_spi(104),
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> +static struct sh_mobile_sdhi_info sdhi0_platform_data = {
> + .tmio_flags = (TMIO_MMC_WRPROTECT_DISABLE
> + | TMIO_MMC_HAS_IDLE_WAIT),
.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE |
TMIO_MMC_HAS_IDLE_WAIT,
is readable for me.
> + .tmio_caps = MMC_CAP_SD_HIGHSPEED,
> +};
> +
> +static struct platform_device sdhi0_device = {
> + .name = "sh_mobile_sdhi",
> + .num_resources = ARRAY_SIZE(sdhi0_resources),
> + .resource = sdhi0_resources,
> + .id = 0,
> + .dev = {
> + .platform_data = &sdhi0_platform_data,
> + }
> +};
> static struct platform_device *marzen_devices[] __initdata = {
> ð_device,
> + &sdhi0_device,
> };
>
> static void __init marzen_init(void)
> @@ -97,6 +135,16 @@ static void __init marzen_init(void)
> gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */
> gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */
>
> + /* SD0 (CN20) */
> + gpio_request(GPIO_FN_SD0_CLK, NULL);
> + gpio_request(GPIO_FN_SD0_CMD, NULL);
> + gpio_request(GPIO_FN_SD0_DAT0, NULL);
> + gpio_request(GPIO_FN_SD0_DAT1, NULL);
> + gpio_request(GPIO_FN_SD0_DAT2, NULL);
> + gpio_request(GPIO_FN_SD0_DAT3, NULL);
> + gpio_request(GPIO_FN_SD0_CD, NULL);
> + gpio_request(GPIO_FN_SD0_WP, NULL);
> +
> r8a7779_add_standard_devices();
> platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
> }
> --
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] marzen: add SDHI0 support
2012-07-17 11:53 [PATCH 2/2] marzen: add SDHI0 support Phil Edworthy
2012-08-02 3:02 ` Kuninori Morimoto
@ 2012-08-06 8:51 ` phil.edworthy
1 sibling, 0 replies; 3+ messages in thread
From: phil.edworthy @ 2012-08-06 8:51 UTC (permalink / raw)
To: linux-sh
Hi Morimoto-san,
> I tested this patch, and it works well.
> But this is small comment from me.
Thanks for testing.
> > ---
> > arch/arm/mach-shmobile/board-marzen.c | 48 ++++++++++++++++++++
> +++++++++++++
> > 1 files changed, 48 insertions(+), 0 deletions(-)
>
> it is better if this patch update defconfig
Ok, will do.
> > diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/
> mach-shmobile/board-marzen.c
> > index 3a528cf..3c54a2f 100644
> > --- a/arch/arm/mach-shmobile/board-marzen.c
> > +++ b/arch/arm/mach-shmobile/board-marzen.c
> > @@ -30,6 +30,8 @@
> > #include <linux/regulator/fixed.h>
> > #include <linux/regulator/machine.h>
> > #include <linux/smsc911x.h>
> > +#include <linux/mmc/sh_mobile_sdhi.h>
> > +#include <linux/mfd/tmio.h>
> > #include <mach/hardware.h>
> > #include <mach/r8a7779.h>
> > #include <mach/common.h>
> > @@ -75,8 +77,44 @@ static struct platform_device eth_device = {
> > .num_resources = ARRAY_SIZE(smsc911x_resources),
> > };
> >
> > +/* Fixed 3.3V regulator to be used by SDHI0 */
> > +static struct regulator_consumer_supply fixed3v3_power_consumers[] > > +{
> > + REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
> > + REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
> > +};
>
> I got warning
>
> ${LINUX}/arch/arm/mach-shmobile/board-marzen.c:81:41: \
> warning: 'fixed3v3_power_consumers' defined but not used [-
> Wunused-variable]
I missed the setup of the regulator, I'll fix this.
<snip>
> > +static struct sh_mobile_sdhi_info sdhi0_platform_data = {
> > + .tmio_flags = (TMIO_MMC_WRPROTECT_DISABLE
> > + | TMIO_MMC_HAS_IDLE_WAIT),
>
> .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE |
> TMIO_MMC_HAS_IDLE_WAIT,
>
> is readable for me.
Ok, I'll fix.
Thanks
Phil
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-06 8:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-17 11:53 [PATCH 2/2] marzen: add SDHI0 support Phil Edworthy
2012-08-02 3:02 ` Kuninori Morimoto
2012-08-06 8:51 ` phil.edworthy
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).