| Message ID | cover.1375174556.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
Hello. On 30-07-2013 13:00, Simon Horman wrote: > From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Add support for SDHI0 and SDHI1 on APE6EVM in PIO mode only. > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/board-ape6evm.c | 50 +++++++++++++++++++++++++++++++++- > 1 file changed, 49 insertions(+), 1 deletion(-) > diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c > index 8c7529c..ccf8b04 100644 > --- a/arch/arm/mach-shmobile/board-ape6evm.c > +++ b/arch/arm/mach-shmobile/board-ape6evm.c [...] > @@ -75,6 +82,29 @@ static struct resource mmcif0_resources[] = { > DEFINE_RES_IRQ(gic_spi(169)), > }; > > +/* SDHI0 */ > +static struct sh_mobile_sdhi_info sdhi0_pdata = { > + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, > + .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, > +}; > + > +static struct resource sdhi0_resources[] = { > + DEFINE_RES_MEM_NAMED(0xee100000, 0x100, "SDHI0"), > + DEFINE_RES_IRQ(gic_spi(165)), > +}; > + > +/* SDHI1 */ > +static struct sh_mobile_sdhi_info sdhi1_pdata = { > + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, > + .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | > + MMC_CAP_NEEDS_POLL, > +}; > + > +static struct resource sdhi1_resources[] = { > + DEFINE_RES_MEM_NAMED(0xee120000, 0x100, "SDHI1"), > + DEFINE_RES_IRQ(gic_spi(166)), > +}; > + All of the above are lacking '__initdata' annothation (the resources and platform data will be kmemdup()'ed when registering the platform devices). Too bad I've noticed this too late... > @@ -124,6 +166,12 @@ static void __init ape6evm_add_standard_devices(void) > platform_device_register_resndata(&platform_bus, "sh_mmcif", 0, > mmcif0_resources, ARRAY_SIZE(mmcif0_resources), > &mmcif0_pdata, sizeof(mmcif0_pdata)); > + platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0, > + sdhi0_resources, ARRAY_SIZE(sdhi0_resources), > + &sdhi0_pdata, sizeof(sdhi0_pdata)); > + platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1, > + sdhi1_resources, ARRAY_SIZE(sdhi1_resources), > + &sdhi1_pdata, sizeof(sdhi1_pdata)); > } WBR, Sergei
Hello. On 30-07-2013 13:00, Simon Horman wrote: > From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Add MMCIF support to the APE6EVM board in PIO mode only. Power supply is > fixed for now, eventually support for the tps80032 regulator, also > supplying both VDD and VccQ to the MMCIF slot should be added to APE6EVM. > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > Acked-by: Magnus Damm <damm@opensource.se> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/board-ape6evm.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c > index af6dd39..8c7529c 100644 > --- a/arch/arm/mach-shmobile/board-ape6evm.c > +++ b/arch/arm/mach-shmobile/board-ape6evm.c [...] > @@ -54,6 +56,25 @@ static const struct smsc911x_platform_config lan9220_data = { [...] > +/* MMCIF */ > +static struct sh_mmcif_plat_data mmcif0_pdata = { > + .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, > +}; > + > +static struct resource mmcif0_resources[] = { > + DEFINE_RES_MEM_NAMED(0xee200000, 0x100, "MMCIF0"), > + DEFINE_RES_IRQ(gic_spi(169)), > +}; > + The above needed '__initdata' too. And I have only noticed... > static const struct pinctrl_map ape6evm_pinctrl_map[] = { > /* SCIFA0 console */ > PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", [...] > @@ -93,6 +119,11 @@ static void __init ape6evm_add_standard_devices(void) > platform_device_register_resndata(&platform_bus, "smsc911x", -1, > lan9220_res, ARRAY_SIZE(lan9220_res), > &lan9220_data, sizeof(lan9220_data)); > + regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers, > + ARRAY_SIZE(fixed3v3_power_consumers), 3300000); > + platform_device_register_resndata(&platform_bus, "sh_mmcif", 0, > + mmcif0_resources, ARRAY_SIZE(mmcif0_resources), > + &mmcif0_pdata, sizeof(mmcif0_pdata)); > } WBR, Sergei
On Tue, Jul 30, 2013 at 04:57:06PM +0400, Sergei Shtylyov wrote: > Hello. > > On 30-07-2013 13:00, Simon Horman wrote: > > >From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > >Add support for SDHI0 and SDHI1 on APE6EVM in PIO mode only. > > >Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > >Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >--- > > arch/arm/mach-shmobile/board-ape6evm.c | 50 +++++++++++++++++++++++++++++++++- > > 1 file changed, 49 insertions(+), 1 deletion(-) > > >diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c > >index 8c7529c..ccf8b04 100644 > >--- a/arch/arm/mach-shmobile/board-ape6evm.c > >+++ b/arch/arm/mach-shmobile/board-ape6evm.c > [...] > >@@ -75,6 +82,29 @@ static struct resource mmcif0_resources[] = { > > DEFINE_RES_IRQ(gic_spi(169)), > > }; > > > >+/* SDHI0 */ > >+static struct sh_mobile_sdhi_info sdhi0_pdata = { > >+ .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, > >+ .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, > >+}; > >+ > >+static struct resource sdhi0_resources[] = { > >+ DEFINE_RES_MEM_NAMED(0xee100000, 0x100, "SDHI0"), > >+ DEFINE_RES_IRQ(gic_spi(165)), > >+}; > >+ > >+/* SDHI1 */ > >+static struct sh_mobile_sdhi_info sdhi1_pdata = { > >+ .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, > >+ .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | > >+ MMC_CAP_NEEDS_POLL, > >+}; > >+ > >+static struct resource sdhi1_resources[] = { > >+ DEFINE_RES_MEM_NAMED(0xee120000, 0x100, "SDHI1"), > >+ DEFINE_RES_IRQ(gic_spi(166)), > >+}; > >+ > > All of the above are lacking '__initdata' annothation (the > resources and platform data will be kmemdup()'ed when registering > the platform devices). Too bad I've noticed this too late... Thanks Sergei. Guennadi, as I have already queued-up this patch could you please make an incremental patch that adds __initdata to the above structures? > > >@@ -124,6 +166,12 @@ static void __init ape6evm_add_standard_devices(void) > > platform_device_register_resndata(&platform_bus, "sh_mmcif", 0, > > mmcif0_resources, ARRAY_SIZE(mmcif0_resources), > > &mmcif0_pdata, sizeof(mmcif0_pdata)); > >+ platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0, > >+ sdhi0_resources, ARRAY_SIZE(sdhi0_resources), > >+ &sdhi0_pdata, sizeof(sdhi0_pdata)); > >+ platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1, > >+ sdhi1_resources, ARRAY_SIZE(sdhi1_resources), > >+ &sdhi1_pdata, sizeof(sdhi1_pdata)); > > } > > WBR, Sergei > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On Tue, Jul 30, 2013 at 04:59:28PM +0400, Sergei Shtylyov wrote: > Hello. > > On 30-07-2013 13:00, Simon Horman wrote: > > >From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > >Add MMCIF support to the APE6EVM board in PIO mode only. Power supply is > >fixed for now, eventually support for the tps80032 regulator, also > >supplying both VDD and VccQ to the MMCIF slot should be added to APE6EVM. > > >Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > >Acked-by: Magnus Damm <damm@opensource.se> > >Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >--- > > arch/arm/mach-shmobile/board-ape6evm.c | 31 +++++++++++++++++++++++++++++++ > > 1 file changed, 31 insertions(+) > > >diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c > >index af6dd39..8c7529c 100644 > >--- a/arch/arm/mach-shmobile/board-ape6evm.c > >+++ b/arch/arm/mach-shmobile/board-ape6evm.c > [...] > >@@ -54,6 +56,25 @@ static const struct smsc911x_platform_config lan9220_data = { > [...] > >+/* MMCIF */ > >+static struct sh_mmcif_plat_data mmcif0_pdata = { > >+ .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, > >+}; > >+ > >+static struct resource mmcif0_resources[] = { > >+ DEFINE_RES_MEM_NAMED(0xee200000, 0x100, "MMCIF0"), > >+ DEFINE_RES_IRQ(gic_spi(169)), > >+}; > >+ > > The above needed '__initdata' too. And I have only noticed... Thanks again Sergei. Guennadi, as I have already queued-up this patch could you please make an incremental patch that adds __initdata to the above structures? > > static const struct pinctrl_map ape6evm_pinctrl_map[] = { > > /* SCIFA0 console */ > > PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", > [...] > >@@ -93,6 +119,11 @@ static void __init ape6evm_add_standard_devices(void) > > platform_device_register_resndata(&platform_bus, "smsc911x", -1, > > lan9220_res, ARRAY_SIZE(lan9220_res), > > &lan9220_data, sizeof(lan9220_data)); > >+ regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers, > >+ ARRAY_SIZE(fixed3v3_power_consumers), 3300000); > >+ platform_device_register_resndata(&platform_bus, "sh_mmcif", 0, > >+ mmcif0_resources, ARRAY_SIZE(mmcif0_resources), > >+ &mmcif0_pdata, sizeof(mmcif0_pdata)); > > } > > WBR, Sergei > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On Tue, Jul 30, 2013 at 06:00:41PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider these Renesas ARM-based SoC board updates for v3.12. > This pull-request is based on renesas-soc-for-v3.12 which I have previously > sent a pull-request for. > > The following changes since commit 81b9d5351fa96caad4accc6711bc1b9342927d4a: > > ARM: shmobile: Setup r8a7790 arch timer based on MD pins (2013-07-17 14:26:56 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards Hi, can I get a tag for this please? Also, your subject says [PATCH 0/5], which might make me miss it. Please label it [GIT PULL] if you don't mind? -Olof
On Sun, Aug 04, 2013 at 01:31:31PM -0700, Olof Johansson wrote: > On Tue, Jul 30, 2013 at 06:00:41PM +0900, Simon Horman wrote: > > Hi Olof, Hi Arnd, > > > > please consider these Renesas ARM-based SoC board updates for v3.12. > > This pull-request is based on renesas-soc-for-v3.12 which I have previously > > sent a pull-request for. > > > > The following changes since commit 81b9d5351fa96caad4accc6711bc1b9342927d4a: > > > > ARM: shmobile: Setup r8a7790 arch timer based on MD pins (2013-07-17 14:26:56 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards > > Hi, can I get a tag for this please? Sorry for not posing that the first time around. It is renesas-boards-for-v3.12. > Also, your subject says [PATCH 0/5], which might make me miss it. Please > label it [GIT PULL] if you don't mind? Sure, will do.
On Mon, Aug 05, 2013 at 10:39:16AM +0900, Simon Horman wrote: > On Sun, Aug 04, 2013 at 01:31:31PM -0700, Olof Johansson wrote: > > On Tue, Jul 30, 2013 at 06:00:41PM +0900, Simon Horman wrote: > > > Hi Olof, Hi Arnd, > > > > > > please consider these Renesas ARM-based SoC board updates for v3.12. > > > This pull-request is based on renesas-soc-for-v3.12 which I have previously > > > sent a pull-request for. > > > > > > The following changes since commit 81b9d5351fa96caad4accc6711bc1b9342927d4a: > > > > > > ARM: shmobile: Setup r8a7790 arch timer based on MD pins (2013-07-17 14:26:56 +0900) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards > > > > Hi, can I get a tag for this please? > > Sorry for not posing that the first time around. > It is renesas-boards-for-v3.12. Pulled. -Olof
Hi Olof, Hi Arnd, please consider these Renesas ARM-based SoC board updates for v3.12. This pull-request is based on renesas-soc-for-v3.12 which I have previously sent a pull-request for. The following changes since commit 81b9d5351fa96caad4accc6711bc1b9342927d4a: ARM: shmobile: Setup r8a7790 arch timer based on MD pins (2013-07-17 14:26:56 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards for you to fetch changes up to f79d68da510bf1b95beff4d556b78d06801f11dc: ARM: shmobile: ape6evm: add SDHI interfaces (2013-07-25 14:46:38 +0900) ---------------------------------------------------------------- Renesas ARM-based SoC board updates for v3.12 * ape6evm: Add SDHI and MMCIF support * lager: Add MMCIF support * armadillo800eva: Add DMA support for MMCIF ---------------------------------------------------------------- Guennadi Liakhovetski (4): ARM: shmobile: armadillo800eva: add DMA support to MMCIF ARM: shmobile: lager: add MMCIF support ARM: shmobile: ape6evm: add MMCIF support ARM: shmobile: ape6evm: add SDHI interfaces Kuninori Morimoto (1): ARM: shmobile: select the fixed regulator driver on BockW arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/board-ape6evm.c | 79 ++++++++++++++++++++++++++ arch/arm/mach-shmobile/board-armadillo800eva.c | 2 + arch/arm/mach-shmobile/board-lager.c | 31 ++++++++++ 4 files changed, 113 insertions(+)