[PATCH 1/2] sh: fix SD / MMC configuration dependencies on ecovec

[PATCH 1/2] sh: fix SD / MMC configuration dependencies on ecovec

[Guennadi Liakhovetski]

Update CONFIG_MMC_TMIO to the new CONFIG_MMC_SDHI symbol and fix
MMCIF to also function in modular builds for ecovec.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <damm@opensource.se>
---
 arch/sh/boards/mach-ecovec24/setup.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 86a0d56..bb13d0e 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -482,7 +482,7 @@ static struct i2c_board_info ts_i2c_clients = {
 	.irq		= IRQ0,
 };
 
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 /* SDHI0 */
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
@@ -522,7 +522,7 @@ static struct platform_device sdhi0_device = {
 	},
 };
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SDHI1 */
 static void sdhi1_set_pwr(struct platform_device *pdev, int state)
 {
@@ -836,7 +836,7 @@ static struct platform_device vou_device = {
 	},
 };
 
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SH_MMCIF */
 static void mmcif_set_pwr(struct platform_device *pdev, int state)
 {
@@ -898,9 +898,9 @@ static struct platform_device *ecovec_devices[] __initdata = {
 	&ceu0_device,
 	&ceu1_device,
 	&keysc_device,
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 	&sdhi0_device,
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 	&sdhi1_device,
 #endif
 #else
@@ -912,7 +912,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
 	&fsi_device,
 	&irda_device,
 	&vou_device,
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 	&sh_mmcif_device,
 #endif
 };
@@ -1180,7 +1180,7 @@ static int __init arch_setup(void)
 	gpio_direction_input(GPIO_PTR5);
 	gpio_direction_input(GPIO_PTR6);
 
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 	/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
 	gpio_request(GPIO_FN_SDHI0CD,  NULL);
 	gpio_request(GPIO_FN_SDHI0WP,  NULL);
@@ -1193,7 +1193,7 @@ static int __init arch_setup(void)
 	gpio_request(GPIO_PTB6, NULL);
 	gpio_direction_output(GPIO_PTB6, 0);
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 	/* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */
 	gpio_request(GPIO_FN_SDHI1CD,  NULL);
 	gpio_request(GPIO_FN_SDHI1WP,  NULL);
@@ -1284,7 +1284,7 @@ static int __init arch_setup(void)
 	gpio_request(GPIO_PTU5, NULL);
 	gpio_direction_output(GPIO_PTU5, 0);
 
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 	/* enable MMCIF (needs DS2.6,7 set to OFF,ON) */
 	gpio_request(GPIO_FN_MMC_D7, NULL);
 	gpio_request(GPIO_FN_MMC_D6, NULL);
-- 
1.7.2.5

[PATCH 2/2] sh: update SDHI configuration symbols in defconfigs

[Guennadi Liakhovetski]

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <damm@opensource.se>
---
 arch/sh/configs/ecovec24_defconfig  |    2 +-
 arch/sh/configs/sh7757lcr_defconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index 8d13e8a..911e30c 100644
--- a/arch/sh/configs/ecovec24_defconfig
+++ b/arch/sh/configs/ecovec24_defconfig
@@ -115,7 +115,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_FILE_STORAGE=m
 CONFIG_MMC=y
 CONFIG_MMC_SPI=y
-CONFIG_MMC_TMIO=y
+CONFIG_MMC_SDHI=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_RS5C372=y
 CONFIG_UIO=y
diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig
index fa0ecf8..33ddb13 100644
--- a/arch/sh/configs/sh7757lcr_defconfig
+++ b/arch/sh/configs/sh7757lcr_defconfig
@@ -70,7 +70,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
-CONFIG_MMC_TMIO=y
+CONFIG_MMC_SDHI=y
 CONFIG_MMC_SH_MMCIF=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-- 
1.7.2.5

[PATCH] ALSA: add a module alias to the FSI driver

[Guennadi Liakhovetski]

This patch enables FSI driver autoloading on sh-mobile systems.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 sound/soc/sh/fsi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0c9997e..88b669c 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1321,3 +1321,4 @@ module_exit(fsi_mobile_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SuperH onchip FSI audio driver");
 MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
+MODULE_ALIAS("platform:fsi-pcm-audio");
-- 
1.7.2.5

[PATCH] i2c: add a module alias to the sh-mobile driver

[Guennadi Liakhovetski]

This patch enables I2C driver autoloading on sh-mobile systems.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <damm@opensource.se>
---
 drivers/i2c/busses/i2c-sh_mobile.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 2707f5e..81ccd78 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -729,3 +729,4 @@ module_exit(sh_mobile_i2c_adap_exit);
 MODULE_DESCRIPTION("SuperH Mobile I2C Bus Controller driver");
 MODULE_AUTHOR("Magnus Damm");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:i2c-sh_mobile");
-- 
1.7.2.5

Re: [PATCH 1/2] sh: fix SD / MMC configuration dependencies on

[Simon Horman]

On Fri, Apr 15, 2011 at 08:03:17PM +0200, Guennadi Liakhovetski wrote:
> Update CONFIG_MMC_TMIO to the new CONFIG_MMC_SDHI symbol and fix
> MMCIF to also function in modular builds for ecovec.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <damm@opensource.se>

Acked-by: Simon Horman <horms@verge.net.au>

It is curious that these config options are only used by ecovec.
Is it because SDHI support is unconditional on other platforms - eg ap4evb?

Re: [PATCH 2/2] sh: update SDHI configuration symbols in defconfigs

[Simon Horman]

On Fri, Apr 15, 2011 at 08:04:12PM +0200, Guennadi Liakhovetski wrote:
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <damm@opensource.se>
> ---
>  arch/sh/configs/ecovec24_defconfig  |    2 +-
>  arch/sh/configs/sh7757lcr_defconfig |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

MMC_TMIO is also present in arch/arm/configs/eseries_pxa_defconfig
Should that also be updated?

Re: [PATCH 1/2] sh: fix SD / MMC configuration dependencies on ecovec

[Guennadi Liakhovetski]

On Sat, 16 Apr 2011, Simon Horman wrote:

> On Fri, Apr 15, 2011 at 08:03:17PM +0200, Guennadi Liakhovetski wrote:
> > Update CONFIG_MMC_TMIO to the new CONFIG_MMC_SDHI symbol and fix
> > MMCIF to also function in modular builds for ecovec.
> > 
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > Cc: Simon Horman <horms@verge.net.au>
> > Cc: Magnus Damm <damm@opensource.se>
> 
> Acked-by: Simon Horman <horms@verge.net.au>
> 
> It is curious that these config options are only used by ecovec.
> Is it because SDHI support is unconditional on other platforms - eg ap4evb?

Yes, other platforms just happen to use other methods to enable and 
disable different platform devices.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 2/2] sh: update SDHI configuration symbols in defconfigs

[Guennadi Liakhovetski]

On Sat, 16 Apr 2011, Simon Horman wrote:

> On Fri, Apr 15, 2011 at 08:04:12PM +0200, Guennadi Liakhovetski wrote:
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > Cc: Simon Horman <horms@verge.net.au>
> > Cc: Magnus Damm <damm@opensource.se>
> > ---
> >  arch/sh/configs/ecovec24_defconfig  |    2 +-
> >  arch/sh/configs/sh7757lcr_defconfig |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> MMC_TMIO is also present in arch/arm/configs/eseries_pxa_defconfig
> Should that also be updated?

No, rather not;) If you look in Kconfig, you'll see, that CONFIG_MMC_TMIO 
is still there, it just means something _slightly_ different now: it means 
now an MFD-based TMIO MMC implementation. So, it is still the correct 
symbol to be used on all platforms, except SH / SH-Mobile SDHI-based.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 1/2] sh: fix SD / MMC configuration dependencies on

[Simon Horman]

On Mon, Apr 18, 2011 at 08:43:03AM +0200, Guennadi Liakhovetski wrote:
> On Sat, 16 Apr 2011, Simon Horman wrote:
> 
> > On Fri, Apr 15, 2011 at 08:03:17PM +0200, Guennadi Liakhovetski wrote:
> > > Update CONFIG_MMC_TMIO to the new CONFIG_MMC_SDHI symbol and fix
> > > MMCIF to also function in modular builds for ecovec.
> > > 
> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > Cc: Simon Horman <horms@verge.net.au>
> > > Cc: Magnus Damm <damm@opensource.se>
> > 
> > Acked-by: Simon Horman <horms@verge.net.au>
> > 
> > It is curious that these config options are only used by ecovec.
> > Is it because SDHI support is unconditional on other platforms - eg ap4evb?
> 
> Yes, other platforms just happen to use other methods to enable and 
> disable different platform devices.

Thanks for the confirmation.

Re: [PATCH 2/2] sh: update SDHI configuration symbols in defconfigs

[Simon Horman]

On Mon, Apr 18, 2011 at 08:49:50AM +0200, Guennadi Liakhovetski wrote:
> On Sat, 16 Apr 2011, Simon Horman wrote:
> 
> > On Fri, Apr 15, 2011 at 08:04:12PM +0200, Guennadi Liakhovetski wrote:
> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > Cc: Simon Horman <horms@verge.net.au>
> > > Cc: Magnus Damm <damm@opensource.se>
> > > ---
> > >  arch/sh/configs/ecovec24_defconfig  |    2 +-
> > >  arch/sh/configs/sh7757lcr_defconfig |    2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > MMC_TMIO is also present in arch/arm/configs/eseries_pxa_defconfig
> > Should that also be updated?
> 
> No, rather not;) If you look in Kconfig, you'll see, that CONFIG_MMC_TMIO 
> is still there, it just means something _slightly_ different now: it means 
> now an MFD-based TMIO MMC implementation. So, it is still the correct 
> symbol to be used on all platforms, except SH / SH-Mobile SDHI-based.

Thanks, I understand now.

Acked-by: Simon Horman <horms@verge.net.au>

Re: [PATCH] ALSA: add a module alias to the FSI driver

[Simon Horman]

On Fri, Apr 15, 2011 at 08:17:34PM +0200, Guennadi Liakhovetski wrote:
> This patch enables FSI driver autoloading on sh-mobile systems.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

This appears correct to me.

Reviewed-by: Simon Horman <horms@verge.net.au>

> ---
>  sound/soc/sh/fsi.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index 0c9997e..88b669c 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -1321,3 +1321,4 @@ module_exit(fsi_mobile_exit);
>  MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("SuperH onchip FSI audio driver");
>  MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
> +MODULE_ALIAS("platform:fsi-pcm-audio");
> -- 
> 1.7.2.5
> 

Re: [PATCH] i2c: add a module alias to the sh-mobile driver

[Simon Horman]

On Fri, Apr 15, 2011 at 08:18:57PM +0200, Guennadi Liakhovetski wrote:
> This patch enables I2C driver autoloading on sh-mobile systems.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <damm@opensource.se>

This appears correct to me.

Reviewed-by: Simon Horman <horms@verge.net.au>

Re: [PATCH] ALSA: add a module alias to the FSI driver

[Liam Girdwood]

On Fri, 2011-04-15 at 20:17 +0200, Guennadi Liakhovetski wrote:
> This patch enables FSI driver autoloading on sh-mobile systems.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>  sound/soc/sh/fsi.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index 0c9997e..88b669c 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -1321,3 +1321,4 @@ module_exit(fsi_mobile_exit);
>  MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("SuperH onchip FSI audio driver");
>  MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
> +MODULE_ALIAS("platform:fsi-pcm-audio");

Acked-by: Liam Girdwood <lrg@ti.com>

Re: [PATCH 1/2] sh: fix SD / MMC configuration dependencies on ecovec

[Paul Mundt]

On Fri, Apr 15, 2011 at 08:03:17PM +0200, Guennadi Liakhovetski wrote:
> Update CONFIG_MMC_TMIO to the new CONFIG_MMC_SDHI symbol and fix
> MMCIF to also function in modular builds for ecovec.

On Fri, Apr 15, 2011 at 08:04:12PM +0200, Guennadi Liakhovetski wrote:
>  arch/sh/configs/ecovec24_defconfig  |    2 +-
>  arch/sh/configs/sh7757lcr_defconfig |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

On Fri, Apr 15, 2011 at 08:17:34PM +0200, Guennadi Liakhovetski wrote:
> This patch enables FSI driver autoloading on sh-mobile systems.

On Fri, Apr 15, 2011 at 08:18:57PM +0200, Guennadi Liakhovetski wrote:
> This patch enables I2C driver autoloading on sh-mobile systems.

All applied, thanks.

Re: [PATCH] ALSA: add a module alias to the FSI driver

[Mark Brown]

On Fri, Apr 15, 2011 at 08:17:34PM +0200, Guennadi Liakhovetski wrote:
> This patch enables FSI driver autoloading on sh-mobile systems.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Applied, thanks.  Please try to make sure your commit subjects match the
subsystem you're sending patches for.