* [PATCH 1/5] ARM: shmobile: armadillo800eva: add DMA support to MMCIF
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
@ 2013-07-30 9:00 ` Simon Horman
2013-07-30 9:00 ` [PATCH 2/5] ARM: shmobile: lager: add MMCIF support Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-07-30 9:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add DMA slave IDs to MMCIF Tx and Rx channels.
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-armadillo800eva.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 66cfd56..4432f05 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -779,6 +779,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
.caps = MMC_CAP_4_BIT_DATA |
MMC_CAP_8_BIT_DATA |
MMC_CAP_NONREMOVABLE,
+ .slave_id_tx = SHDMA_SLAVE_MMCIF_TX,
+ .slave_id_rx = SHDMA_SLAVE_MMCIF_RX,
};
static struct resource sh_mmcif_resources[] = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/5] ARM: shmobile: lager: add MMCIF support
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-07-30 9:00 ` [PATCH 1/5] ARM: shmobile: armadillo800eva: add DMA support to MMCIF Simon Horman
@ 2013-07-30 9:00 ` Simon Horman
2013-07-30 9:00 ` [PATCH 3/5] ARM: shmobile: select the fixed regulator driver on BockW Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-07-30 9:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Add support for the MMCIF1 interface on Lager.
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-lager.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index d0da052..3c67b2a 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -24,10 +24,15 @@
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/leds.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_data/gpio-rcar.h>
#include <linux/platform_device.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include <mach/r8a7790.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -70,6 +75,22 @@ static __initdata struct gpio_keys_platform_data lager_keys_pdata = {
.nbuttons = ARRAY_SIZE(gpio_buttons),
};
+/* Fixed 3.3V regulator to be used by MMCIF */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+ REGULATOR_SUPPLY("vmmc", "sh_mmcif.1"),
+};
+
+/* MMCIF */
+static struct sh_mmcif_plat_data mmcif1_pdata = {
+ .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+};
+
+static struct resource mmcif1_resources[] = {
+ DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),
+ DEFINE_RES_IRQ(gic_spi(170)),
+};
+
static const struct pinctrl_map lager_pinctrl_map[] = {
/* SCIF0 (CN19: DEBUG SERIAL0) */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
@@ -77,6 +98,11 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
/* SCIF1 (CN20: DEBUG SERIAL1) */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7790",
"scif1_data", "scif1"),
+ /* MMCIF1 */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
+ "mmc1_data8", "mmc1"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
+ "mmc1_ctrl", "mmc1"),
};
static void __init lager_add_standard_devices(void)
@@ -94,6 +120,11 @@ static void __init lager_add_standard_devices(void)
platform_device_register_data(&platform_bus, "gpio-keys", -1,
&lager_keys_pdata,
sizeof(lager_keys_pdata));
+ regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+ ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+ platform_device_register_resndata(&platform_bus, "sh_mmcif", 1,
+ mmcif1_resources, ARRAY_SIZE(mmcif1_resources),
+ &mmcif1_pdata, sizeof(mmcif1_pdata));
}
static const char *lager_boards_compat_dt[] __initdata = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/5] ARM: shmobile: select the fixed regulator driver on BockW
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-07-30 9:00 ` [PATCH 1/5] ARM: shmobile: armadillo800eva: add DMA support to MMCIF Simon Horman
2013-07-30 9:00 ` [PATCH 2/5] ARM: shmobile: lager: add MMCIF support Simon Horman
@ 2013-07-30 9:00 ` Simon Horman
2013-07-30 9:00 ` [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-07-30 9:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
34767f8dccc326026f97cd63f759dd36bd83502d
(ARM: mach-shmobile: select the fixed regulator driver on several boards)
decided to select fixed regulator driver on Kconfig.
BockW follows same style.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms+renesas at verge.net.au: Change mach-shmobile to shmobile in changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index dd80f21..f76fca6 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -124,6 +124,7 @@ config MACH_BOCKW
depends on ARCH_R8A7778
select ARCH_REQUIRE_GPIOLIB
select RENESAS_INTC_IRQPIN
+ select REGULATOR_FIXED_VOLTAGE if REGULATOR
select USE_OF
config MACH_MARZEN
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (2 preceding siblings ...)
2013-07-30 9:00 ` [PATCH 3/5] ARM: shmobile: select the fixed regulator driver on BockW Simon Horman
@ 2013-07-30 9:00 ` Simon Horman
2013-07-30 12:59 ` Sergei Shtylyov
2013-07-30 9:00 ` [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces Simon Horman
2013-08-04 20:31 ` [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Olof Johansson
5 siblings, 1 reply; 13+ messages in thread
From: Simon Horman @ 2013-07-30 9:00 UTC (permalink / raw)
To: linux-arm-kernel
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
@@ -21,6 +21,8 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/regulator/fixed.h>
@@ -54,6 +56,25 @@ static const struct smsc911x_platform_config lan9220_data = {
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
};
+/*
+ * On APE6EVM power is supplied to MMCIF by a tps80032 regulator. For now we
+ * model a VDD supply to MMCIF, using a fixed 3.3V regulator.
+ */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+ REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+};
+
+/* 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)),
+};
+
static const struct pinctrl_map ape6evm_pinctrl_map[] = {
/* SCIFA0 console */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4",
@@ -61,6 +82,11 @@ static const struct pinctrl_map ape6evm_pinctrl_map[] = {
/* SMSC */
PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a73a4",
"irqc_irq40", "irqc"),
+ /* MMCIF0 */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a73a4",
+ "mmc0_data8", "mmc0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a73a4",
+ "mmc0_ctrl", "mmc0"),
};
static void __init ape6evm_add_standard_devices(void)
@@ -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));
}
static const char *ape6evm_boards_compat_dt[] __initdata = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support
2013-07-30 9:00 ` [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support Simon Horman
@ 2013-07-30 12:59 ` Sergei Shtylyov
2013-07-31 0:30 ` Simon Horman
0 siblings, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2013-07-30 12:59 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support
2013-07-30 12:59 ` Sergei Shtylyov
@ 2013-07-31 0:30 ` Simon Horman
0 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-07-31 0:30 UTC (permalink / raw)
To: linux-arm-kernel
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 at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (3 preceding siblings ...)
2013-07-30 9:00 ` [PATCH 4/5] ARM: shmobile: ape6evm: add MMCIF support Simon Horman
@ 2013-07-30 9:00 ` Simon Horman
2013-07-30 12:57 ` Sergei Shtylyov
2013-08-04 20:31 ` [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Olof Johansson
5 siblings, 1 reply; 13+ messages in thread
From: Simon Horman @ 2013-07-30 9:00 UTC (permalink / raw)
To: linux-arm-kernel
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
@@ -21,8 +21,10 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
+#include <linux/mfd/tmio.h>
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/regulator/fixed.h>
@@ -58,11 +60,16 @@ static const struct smsc911x_platform_config lan9220_data = {
/*
* On APE6EVM power is supplied to MMCIF by a tps80032 regulator. For now we
- * model a VDD supply to MMCIF, using a fixed 3.3V regulator.
+ * model a VDD supply to MMCIF, using a fixed 3.3V regulator. Also use the
+ * static power supply for SDHI0 and SDHI1, whereas SDHI0's VccQ is also
+ * supplied by the same tps80032 regulator and thus can also be adjusted
+ * dynamically.
*/
static struct regulator_consumer_supply fixed3v3_power_consumers[] =
{
REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+ REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+ REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
};
/* MMCIF */
@@ -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)),
+};
+
static const struct pinctrl_map ape6evm_pinctrl_map[] = {
/* SCIFA0 console */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4",
@@ -87,6 +117,18 @@ static const struct pinctrl_map ape6evm_pinctrl_map[] = {
"mmc0_data8", "mmc0"),
PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a73a4",
"mmc0_ctrl", "mmc0"),
+ /* SDHI0: uSD: no WP */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+ "sdhi0_data4", "sdhi0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+ "sdhi0_ctrl", "sdhi0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+ "sdhi0_cd", "sdhi0"),
+ /* SDHI1 */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a73a4",
+ "sdhi1_data4", "sdhi1"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a73a4",
+ "sdhi1_ctrl", "sdhi1"),
};
static void __init ape6evm_add_standard_devices(void)
@@ -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));
}
static const char *ape6evm_boards_compat_dt[] __initdata = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces
2013-07-30 9:00 ` [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces Simon Horman
@ 2013-07-30 12:57 ` Sergei Shtylyov
2013-07-31 0:29 ` Simon Horman
0 siblings, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2013-07-30 12:57 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces
2013-07-30 12:57 ` Sergei Shtylyov
@ 2013-07-31 0:29 ` Simon Horman
0 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2013-07-31 0:29 UTC (permalink / raw)
To: linux-arm-kernel
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 at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12
2013-07-30 9:00 [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (4 preceding siblings ...)
2013-07-30 9:00 ` [PATCH 5/5] ARM: shmobile: ape6evm: add SDHI interfaces Simon Horman
@ 2013-08-04 20:31 ` Olof Johansson
2013-08-05 1:39 ` Simon Horman
5 siblings, 1 reply; 13+ messages in thread
From: Olof Johansson @ 2013-08-04 20:31 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12
2013-08-04 20:31 ` [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12 Olof Johansson
@ 2013-08-05 1:39 ` Simon Horman
2013-08-14 7:55 ` Olof Johansson
0 siblings, 1 reply; 13+ messages in thread
From: Simon Horman @ 2013-08-05 1:39 UTC (permalink / raw)
To: linux-arm-kernel
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.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 0/5] Renesas ARM-based SoC board updates for v3.12
2013-08-05 1:39 ` Simon Horman
@ 2013-08-14 7:55 ` Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-08-14 7:55 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread