* [PATCH 01/10] ARM: shmobile: r8a7740: Enable PMU
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 02/10] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman
` (11 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
This patch enables PMU for r8a7740.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/armadillo800eva_defconfig | 1 +
arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index f78d259..3d76407 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT\x16
# CONFIG_IPC_NS is not set
# CONFIG_PID_NS is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 11bb1d9..1e032cb 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -590,6 +590,21 @@ static struct platform_device i2c1_device = {
.num_resources = ARRAY_SIZE(i2c1_resources),
};
+static struct resource pmu_resources[] = {
+ [0] = {
+ .start = evt2irq(0x19a0),
+ .end = evt2irq(0x19a0),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device pmu_device = {
+ .name = "arm-pmu",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(pmu_resources),
+ .resource = pmu_resources,
+};
+
static struct platform_device *r8a7740_late_devices[] __initdata = {
&i2c0_device,
&i2c1_device,
@@ -597,6 +612,7 @@ static struct platform_device *r8a7740_late_devices[] __initdata = {
&dma1_device,
&dma2_device,
&usb_dma_device,
+ &pmu_device,
};
/*
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 02/10] ARM: shmobile: kzm9g: enable magnetometer ak8975.
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
2012-10-17 4:39 ` [PATCH 01/10] ARM: shmobile: r8a7740: Enable PMU Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 03/10] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman
` (10 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
This patch enables magnetometer ak8975.
I checked ak8975_probe() returns successfully.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9g_defconfig | 2 ++
arch/arm/mach-shmobile/board-kzm9g.c | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index c88b578..1404b04 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -119,6 +119,8 @@ CONFIG_DMADEVICES=y
CONFIG_SH_DMAE=y
CONFIG_ASYNC_TX_DMA=y
CONFIG_STAGING=y
+CONFIG_SENSORS_AK8975=y
+CONFIG_IIO=y
# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY_USER=y
CONFIG_VFAT_FS=y
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 0a43f31..a37da78 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -557,7 +557,11 @@ static struct i2c_board_info i2c0_devices[] = {
},
{
I2C_BOARD_INFO("r2025sd", 0x32),
- }
+ },
+ {
+ I2C_BOARD_INFO("ak8975", 0x0c),
+ .irq = intcs_evt2irq(0x3380), /* IRQ28 */
+ },
};
static struct i2c_board_info i2c1_devices[] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 03/10] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
2012-10-17 4:39 ` [PATCH 01/10] ARM: shmobile: r8a7740: Enable PMU Simon Horman
2012-10-17 4:39 ` [PATCH 02/10] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 04/10] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman
` (9 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
This patch enables three-axis digital accelerometer ADXL345.
Test:
sudo cat /dev/input/event2
then tip up the board. You get something from /dev/input/event2.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9g_defconfig | 2 ++
arch/arm/mach-shmobile/board-kzm9g.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 1404b04..ce99e3e 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -74,6 +74,8 @@ CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ST1232=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_ADXL34X=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=9
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index a37da78..1a46422 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -562,6 +562,10 @@ static struct i2c_board_info i2c0_devices[] = {
I2C_BOARD_INFO("ak8975", 0x0c),
.irq = intcs_evt2irq(0x3380), /* IRQ28 */
},
+ {
+ I2C_BOARD_INFO("adxl34x", 0x1d),
+ .irq = intcs_evt2irq(0x3340), /* IRQ26 */
+ },
};
static struct i2c_board_info i2c1_devices[] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 04/10] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (2 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 03/10] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman
` (8 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
This patch enables DMAEngine on SHDI0 and SDHI2 for kzm9g.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
---
arch/arm/mach-shmobile/board-kzm9g.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 1a46422..f63f2ee 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -384,6 +384,8 @@ static struct regulator_consumer_supply fixed2v8_power_consumers[]
/* SDHI */
static struct sh_mobile_sdhi_info sdhi0_info = {
+ .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX,
+ .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX,
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT,
.tmio_caps = MMC_CAP_SD_HIGHSPEED,
.tmio_ocr_mask = MMC_VDD_27_28 | MMC_VDD_28_29,
@@ -424,6 +426,8 @@ static struct platform_device sdhi0_device = {
/* Micro SD */
static struct sh_mobile_sdhi_info sdhi2_info = {
+ .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX,
+ .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX,
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT |
TMIO_MMC_USE_GPIO_CD |
TMIO_MMC_WRPROTECT_DISABLE,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (3 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 04/10] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 06/10] ARM: shmobile: armadillo800eva: enable restart Simon Horman
` (7 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Bastian Hecht <hechtb@googlemail.com>
SH7372 can use DMA with the FLCTL flash controller. Add required slave
IDs and slave descriptors.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index eb98b45..d65fbbe 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -452,6 +452,10 @@ enum {
SHDMA_SLAVE_SCIF5_RX,
SHDMA_SLAVE_SCIF6_TX,
SHDMA_SLAVE_SCIF6_RX,
+ SHDMA_SLAVE_FLCTL0_TX,
+ SHDMA_SLAVE_FLCTL0_RX,
+ SHDMA_SLAVE_FLCTL1_TX,
+ SHDMA_SLAVE_FLCTL1_RX,
SHDMA_SLAVE_SDHI0_RX,
SHDMA_SLAVE_SDHI0_TX,
SHDMA_SLAVE_SDHI1_RX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index a07954f..a360111 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -408,6 +408,26 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {
.chcr = CHCR_RX(XMIT_SZ_8BIT),
.mid_rid = 0x3e,
}, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_TX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_RX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_TX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_RX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
.slave_id = SHDMA_SLAVE_SDHI0_TX,
.addr = 0xe6850030,
.chcr = CHCR_TX(XMIT_SZ_16BIT),
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 06/10] ARM: shmobile: armadillo800eva: enable restart
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (4 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 07/10] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman
` (6 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Masahiro Nakai <nakai@atmark-techno.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2912eab..fe27d7e 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1229,6 +1229,13 @@ static void __init eva_add_early_devices(void)
shmobile_timer.init = eva_earlytimer_init;
}
+#define RESCNT2 IOMEM(0xe6188020)
+static void eva_restart(char mode, const char *cmd)
+{
+ /* Do soft power on reset */
+ writel((1 << 31), RESCNT2);
+}
+
static const char *eva_boards_compat_dt[] __initdata = {
"renesas,armadillo800eva",
NULL,
@@ -1243,4 +1250,5 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
.init_late = shmobile_init_late,
.timer = &shmobile_timer,
.dt_compat = eva_boards_compat_dt,
+ .restart = eva_restart,
MACHINE_END
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 07/10] ARM: shmobile: r8a7779: add HSPI clock support
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (5 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 06/10] ARM: shmobile: armadillo800eva: enable restart Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 08/10] ARM: shmobile: r8a7779: add I2C " Simon Horman
` (5 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 3cafb6a..90d717b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -89,6 +89,7 @@ static struct clk div4_clks[DIV4_NR] = {
enum { MSTP323, MSTP322, MSTP321, MSTP320,
MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
MSTP016, MSTP015, MSTP014,
+ MSTP007,
MSTP_NR };
static struct clk mstp_clks[MSTP_NR] = {
@@ -105,6 +106,7 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP016] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 16, 0), /* TMU0 */
[MSTP015] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 15, 0), /* TMU1 */
[MSTP014] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 14, 0), /* TMU2 */
+ [MSTP007] = SH_CLK_MSTP32(&div4_clks[DIV4_S], MSTPCR0, 7, 0), /* HSPI */
};
static unsigned long mul4_recalc(struct clk *clk)
@@ -154,6 +156,9 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
+ CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
+ CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
+ CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 08/10] ARM: shmobile: r8a7779: add I2C clock support
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (6 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 07/10] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 09/10] ARM: shmobile: r8a7779: add I2C driver support Simon Horman
` (4 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch is required from R-Car I2C driver
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 90d717b..24f5a84 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -87,7 +87,8 @@ static struct clk div4_clks[DIV4_NR] = {
};
enum { MSTP323, MSTP322, MSTP321, MSTP320,
- MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
+ MSTP030,
+ MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
MSTP016, MSTP015, MSTP014,
MSTP007,
MSTP_NR };
@@ -97,6 +98,10 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */
[MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */
[MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */
+ [MSTP030] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 30, 0), /* I2C0 */
+ [MSTP029] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 29, 0), /* I2C1 */
+ [MSTP028] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 28, 0), /* I2C2 */
+ [MSTP027] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 27, 0), /* I2C3 */
[MSTP026] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 26, 0), /* SCIF0 */
[MSTP025] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 25, 0), /* SCIF1 */
[MSTP024] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 24, 0), /* SCIF2 */
@@ -150,6 +155,10 @@ static struct clk_lookup lookups[] = {
/* MSTP32 clocks */
CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */
CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */
+ CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
+ CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */
+ CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */
+ CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 09/10] ARM: shmobile: r8a7779: add I2C driver support
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (7 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 08/10] ARM: shmobile: r8a7779: add I2C " Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-10-17 4:39 ` [PATCH 10/10] ARM: shmobile: marzen: add HSPI support Simon Horman
` (3 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch enable R-Car I2C driver
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 2 +
arch/arm/mach-shmobile/setup-r8a7779.c | 77 ++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 53382b6..f79b55c 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -69,6 +69,8 @@ CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
CONFIG_SERIAL_SH_SCI_CONSOLE=y
# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_RCAR=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 2917668..63de5cb 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -229,6 +229,79 @@ static struct platform_device tmu01_device = {
.num_resources = ARRAY_SIZE(tmu01_resources),
};
+/* I2C */
+static struct resource rcar_i2c0_res[] = {
+ {
+ .start = 0xffc70000,
+ .end = 0xffc70fff,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = gic_spi(79),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device i2c0_device = {
+ .name = "i2c-rcar",
+ .id = 0,
+ .resource = rcar_i2c0_res,
+ .num_resources = ARRAY_SIZE(rcar_i2c0_res),
+};
+
+static struct resource rcar_i2c1_res[] = {
+ {
+ .start = 0xffc71000,
+ .end = 0xffc71fff,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = gic_spi(82),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device i2c1_device = {
+ .name = "i2c-rcar",
+ .id = 1,
+ .resource = rcar_i2c1_res,
+ .num_resources = ARRAY_SIZE(rcar_i2c1_res),
+};
+
+static struct resource rcar_i2c2_res[] = {
+ {
+ .start = 0xffc72000,
+ .end = 0xffc72fff,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = gic_spi(80),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device i2c2_device = {
+ .name = "i2c-rcar",
+ .id = 2,
+ .resource = rcar_i2c2_res,
+ .num_resources = ARRAY_SIZE(rcar_i2c2_res),
+};
+
+static struct resource rcar_i2c3_res[] = {
+ {
+ .start = 0xffc73000,
+ .end = 0xffc73fff,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = gic_spi(81),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device i2c3_device = {
+ .name = "i2c-rcar",
+ .id = 3,
+ .resource = rcar_i2c3_res,
+ .num_resources = ARRAY_SIZE(rcar_i2c3_res),
+};
+
static struct platform_device *r8a7779_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
@@ -238,6 +311,10 @@ static struct platform_device *r8a7779_early_devices[] __initdata = {
&scif5_device,
&tmu00_device,
&tmu01_device,
+ &i2c0_device,
+ &i2c1_device,
+ &i2c2_device,
+ &i2c3_device,
};
static struct platform_device *r8a7779_late_devices[] __initdata = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 10/10] ARM: shmobile: marzen: add HSPI support
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (8 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 09/10] ARM: shmobile: r8a7779: add I2C driver support Simon Horman
@ 2012-10-17 4:39 ` Simon Horman
2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
` (2 subsequent siblings)
12 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-10-17 4:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 2 ++
arch/arm/mach-shmobile/board-marzen.c | 25 +++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index f79b55c..5b8215f 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -71,6 +71,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_RCAR=y
+CONFIG_SPI=y
+CONFIG_SPI_SH_HSPI=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index b8a7525..69f7f46 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/spi/spi.h>
+#include <linux/spi/sh_hspi.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
#include <mach/hardware.h>
@@ -126,10 +128,27 @@ static struct platform_device thermal_device = {
.num_resources = ARRAY_SIZE(thermal_resources),
};
+/* HSPI */
+static struct resource hspi_resources[] = {
+ [0] = {
+ .start = 0xFFFC7000,
+ .end = 0xFFFC7018 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device hspi_device = {
+ .name = "sh-hspi",
+ .id = 0,
+ .resource = hspi_resources,
+ .num_resources = ARRAY_SIZE(hspi_resources),
+};
+
static struct platform_device *marzen_devices[] __initdata = {
ð_device,
&sdhi0_device,
&thermal_device,
+ &hspi_device,
};
static void __init marzen_init(void)
@@ -163,6 +182,12 @@ static void __init marzen_init(void)
gpio_request(GPIO_FN_SD0_CD, NULL);
gpio_request(GPIO_FN_SD0_WP, NULL);
+ /* HSPI 0 */
+ gpio_request(GPIO_FN_HSPI_CLK0, NULL);
+ gpio_request(GPIO_FN_HSPI_CS0, NULL);
+ gpio_request(GPIO_FN_HSPI_TX0, NULL);
+ gpio_request(GPIO_FN_HSPI_RX0, NULL);
+
r8a7779_add_standard_devices();
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (9 preceding siblings ...)
2012-10-17 4:39 ` [PATCH 10/10] ARM: shmobile: marzen: add HSPI support Simon Horman
@ 2012-11-07 8:40 ` Simon Horman
2012-11-07 8:40 ` [PATCH 1/3] ARM: shmobile: marzen: add USB phy support Simon Horman
` (2 more replies)
2012-11-19 1:24 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
12 siblings, 3 replies; 35+ messages in thread
From: Simon Horman @ 2012-11-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following board enhancements for 3.8.
* This pull-request is based on an earlier request which I
posted on the 1st and was merged yesterday: [GIT PULL v3] Renesas
ARM-based SoC boards for v3.8
* Patch #2 of this series has a build-time dependency on
the soc pull request that I sent a few minutes ago:
[GIT PULL] Renesas ARM-based SoC for v3.8 #2
In particular, "ARM: shmobile: marzen: add USB EHCI driver support"
depends on "[PATCH 1/7] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx"
----------------------------------------------------------------
The following changes since commit 631a7b5d958d2ef2c2333b105794c693642f0641:
ARM: shmobile: Remove G4EVM machine support (2012-10-30 15:25:59 +0800)
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 17eada911c88304005bc0acfdd5ae673fb1f2952:
ARM: shmobile: marzen: add USB OHCI driver support (2012-11-07 17:15:29 +0900)
----------------------------------------------------------------
Kuninori Morimoto (3):
ARM: shmobile: marzen: add USB phy support
ARM: shmobile: marzen: add USB EHCI driver support
ARM: shmobile: marzen: add USB OHCI driver support
arch/arm/configs/marzen_defconfig | 14 ++-
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/board-marzen.c | 186 ++++++++++++++++++++++++++++++++-
3 files changed, 198 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 1/3] ARM: shmobile: marzen: add USB phy support
2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
@ 2012-11-07 8:40 ` Simon Horman
2012-11-07 8:40 ` [PATCH 2/3] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
2012-11-07 8:40 ` [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI " Simon Horman
2 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-11-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 3 ++-
arch/arm/mach-shmobile/board-marzen.c | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 5b8215f..8a861b7 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -78,7 +78,8 @@ CONFIG_GPIO_SYSFS=y
CONFIG_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_SSB=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB=y
+CONFIG_USB_RCAR_PHY=y
CONFIG_MMC=y
CONFIG_MMC_SDHI=y
CONFIG_UIO=y
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 69f7f46..74c7f0b 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -144,11 +144,32 @@ static struct platform_device hspi_device = {
.num_resources = ARRAY_SIZE(hspi_resources),
};
+/* USB PHY */
+static struct resource usb_phy_resources[] = {
+ [0] = {
+ .start = 0xffe70000,
+ .end = 0xffe70900 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = 0xfff70000,
+ .end = 0xfff70900 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device usb_phy_device = {
+ .name = "rcar_usb_phy",
+ .resource = usb_phy_resources,
+ .num_resources = ARRAY_SIZE(usb_phy_resources),
+};
+
static struct platform_device *marzen_devices[] __initdata = {
ð_device,
&sdhi0_device,
&thermal_device,
&hspi_device,
+ &usb_phy_device,
};
static void __init marzen_init(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 2/3] ARM: shmobile: marzen: add USB EHCI driver support
2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-07 8:40 ` [PATCH 1/3] ARM: shmobile: marzen: add USB phy support Simon Horman
@ 2012-11-07 8:40 ` Simon Horman
2012-11-07 8:40 ` [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI " Simon Horman
2 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-11-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch supports CN21/CN22 USB 2.0 (port 0/1/2),
and enable USB momery on defconfig
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 6 ++
arch/arm/mach-shmobile/Kconfig | 1 +
arch/arm/mach-shmobile/board-marzen.c | 108 ++++++++++++++++++++++++++++++++-
3 files changed, 114 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 8a861b7..6540dfb 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -47,6 +47,8 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -82,6 +84,10 @@ CONFIG_USB=y
CONFIG_USB_RCAR_PHY=y
CONFIG_MMC=y
CONFIG_MMC_SDHI=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
CONFIG_UIO=y
CONFIG_UIO_PDRV_GENIRQ=y
# CONFIG_IOMMU_SUPPORT is not set
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f58c3ea..c03aeec 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -41,6 +41,7 @@ config ARCH_R8A7779
select ARM_GIC
select CPU_V7
select SH_CLK_CPG
+ select USB_ARCH_HAS_EHCI
config ARCH_EMEV2
bool "Emma Mobile EV2"
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 74c7f0b..707b3bd 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -34,6 +34,9 @@
#include <linux/spi/sh_hspi.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/ehci_pdriver.h>
+#include <linux/pm_runtime.h>
#include <mach/hardware.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
@@ -172,6 +175,101 @@ static struct platform_device *marzen_devices[] __initdata = {
&usb_phy_device,
};
+/* USB */
+static struct usb_phy *phy;
+static int usb_power_on(struct platform_device *pdev)
+{
+ if (!phy)
+ return -EIO;
+
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_get_sync(&pdev->dev);
+
+ usb_phy_init(phy);
+
+ return 0;
+}
+
+static void usb_power_off(struct platform_device *pdev)
+{
+ if (!phy)
+ return;
+
+ usb_phy_shutdown(phy);
+
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+}
+
+static struct usb_ehci_pdata ehcix_pdata = {
+ .power_on = usb_power_on,
+ .power_off = usb_power_off,
+ .power_suspend = usb_power_off,
+};
+
+static struct resource ehci0_resources[] = {
+ [0] = {
+ .start = 0xffe70000,
+ .end = 0xffe70400 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = gic_spi(44),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ehci0_device = {
+ .name = "ehci-platform",
+ .id = 0,
+ .dev = {
+ .dma_mask = &ehci0_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &ehcix_pdata,
+ },
+ .num_resources = ARRAY_SIZE(ehci0_resources),
+ .resource = ehci0_resources,
+};
+
+static struct resource ehci1_resources[] = {
+ [0] = {
+ .start = 0xfff70000,
+ .end = 0xfff70400 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = gic_spi(45),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ehci1_device = {
+ .name = "ehci-platform",
+ .id = 1,
+ .dev = {
+ .dma_mask = &ehci1_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &ehcix_pdata,
+ },
+ .num_resources = ARRAY_SIZE(ehci1_resources),
+ .resource = ehci1_resources,
+};
+
+static struct platform_device *marzen_late_devices[] __initdata = {
+ &ehci0_device,
+ &ehci1_device,
+};
+
+void __init marzen_init_late(void)
+{
+ /* get usb phy */
+ phy = usb_get_phy(USB_PHY_TYPE_USB2);
+
+ shmobile_init_late();
+ platform_add_devices(marzen_late_devices,
+ ARRAY_SIZE(marzen_late_devices));
+}
+
static void __init marzen_init(void)
{
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
@@ -209,6 +307,14 @@ static void __init marzen_init(void)
gpio_request(GPIO_FN_HSPI_TX0, NULL);
gpio_request(GPIO_FN_HSPI_RX0, NULL);
+ /* USB (CN21) */
+ gpio_request(GPIO_FN_USB_OVC0, NULL);
+ gpio_request(GPIO_FN_USB_OVC1, NULL);
+ gpio_request(GPIO_FN_USB_OVC2, NULL);
+
+ /* USB (CN22) */
+ gpio_request(GPIO_FN_USB_PENC2, NULL);
+
r8a7779_add_standard_devices();
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
}
@@ -221,6 +327,6 @@ MACHINE_START(MARZEN, "marzen")
.init_irq = r8a7779_init_irq,
.handle_irq = gic_handle_irq,
.init_machine = marzen_init,
- .init_late = shmobile_init_late,
+ .init_late = marzen_init_late,
.timer = &shmobile_timer,
MACHINE_END
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI driver support
2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-07 8:40 ` [PATCH 1/3] ARM: shmobile: marzen: add USB phy support Simon Horman
2012-11-07 8:40 ` [PATCH 2/3] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
@ 2012-11-07 8:40 ` Simon Horman
2 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-11-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch supports CN21/CN22 USB 1.x (port 0/1/2),
and enable input event on defconfig
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/marzen_defconfig | 5 +--
arch/arm/mach-shmobile/Kconfig | 1 +
arch/arm/mach-shmobile/board-marzen.c | 57 +++++++++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 6540dfb..728a43c 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -61,9 +61,8 @@ CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
@@ -86,6 +85,8 @@ CONFIG_MMC=y
CONFIG_MMC_SDHI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_STORAGE=y
CONFIG_UIO=y
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index c03aeec..64db252 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -42,6 +42,7 @@ config ARCH_R8A7779
select CPU_V7
select SH_CLK_CPG
select USB_ARCH_HAS_EHCI
+ select USB_ARCH_HAS_OHCI
config ARCH_EMEV2
bool "Emma Mobile EV2"
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 707b3bd..449f928 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -36,6 +36,7 @@
#include <linux/mfd/tmio.h>
#include <linux/usb/otg.h>
#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
#include <mach/hardware.h>
#include <mach/r8a7779.h>
@@ -255,9 +256,65 @@ static struct platform_device ehci1_device = {
.resource = ehci1_resources,
};
+static struct usb_ohci_pdata ohcix_pdata = {
+ .power_on = usb_power_on,
+ .power_off = usb_power_off,
+ .power_suspend = usb_power_off,
+};
+
+static struct resource ohci0_resources[] = {
+ [0] = {
+ .start = 0xffe70400,
+ .end = 0xffe70800 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = gic_spi(44),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ohci0_device = {
+ .name = "ohci-platform",
+ .id = 0,
+ .dev = {
+ .dma_mask = &ohci0_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &ohcix_pdata,
+ },
+ .num_resources = ARRAY_SIZE(ohci0_resources),
+ .resource = ohci0_resources,
+};
+
+static struct resource ohci1_resources[] = {
+ [0] = {
+ .start = 0xfff70400,
+ .end = 0xfff70800 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = gic_spi(45),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device ohci1_device = {
+ .name = "ohci-platform",
+ .id = 1,
+ .dev = {
+ .dma_mask = &ohci1_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = 0xffffffff,
+ .platform_data = &ohcix_pdata,
+ },
+ .num_resources = ARRAY_SIZE(ohci1_resources),
+ .resource = ohci1_resources,
+};
+
static struct platform_device *marzen_late_devices[] __initdata = {
&ehci0_device,
&ehci1_device,
+ &ohci0_device,
+ &ohci1_device,
};
void __init marzen_init_late(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (10 preceding siblings ...)
2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
@ 2012-11-19 1:24 ` Simon Horman
2012-11-19 1:24 ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
12 siblings, 1 reply; 35+ messages in thread
From: Simon Horman @ 2012-11-19 1:24 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
Please consider the following board fix for 3.8.
Also, please let me know if you would prefer me to supply
this as a fixes branch as we are now in the 3.7-rc6 timeframe
where I understand that non-fix commits are no longer allowed for 3.8.
This commit is based on the renesas/boards2 branch of the arm-soc tree.
----------------------------------------------------------------
The following changes since commit 12818d82ccad9868a820dbb193b4f9b797cd02d4:
ARM: shmobile: use FSI driver's audio clock on ap4evb (2012-11-08 17:52:05 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards3
for you to fetch changes up to d01f4b82fbee516b4d3f03b086333fc4a127983c:
ARM: shmobile: mackerel: Add FLCTL IRQ resource (2012-11-19 10:08:20 +0900)
----------------------------------------------------------------
Bastian Hecht (1):
ARM: shmobile: mackerel: Add FLCTL IRQ resource
arch/arm/mach-shmobile/board-mackerel.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource
2012-11-19 1:24 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
@ 2012-11-19 1:24 ` Simon Horman
2012-11-19 12:30 ` Sergei Shtylyov
0 siblings, 1 reply; 35+ messages in thread
From: Simon Horman @ 2012-11-19 1:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Bastian Hecht <hechtb@gmail.com>
Since commit 3c7ea4eccfd2e the sh_flctl driver requires the error IRQ line to
signal failed transactions between the flash controller and the NAND chip.
This information is mandatory - else the driver refuses to start up. We
provide it here for the board mackerel.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/board-mackerel.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index bf2bcb9..3f56e70 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -950,7 +950,11 @@ static struct resource nand_flash_resources[] = {
.start = 0xe6a30000,
.end = 0xe6a3009b,
.flags = IORESOURCE_MEM,
- }
+ },
+ [1] = {
+ .start = evt2irq(0x0d80), /* flstei: status error irq */
+ .flags = IORESOURCE_IRQ,
+ },
};
static struct sh_flctl_platform_data nand_flash_data = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource
2012-11-19 1:24 ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman
@ 2012-11-19 12:30 ` Sergei Shtylyov
2012-11-20 0:03 ` Simon Horman
0 siblings, 1 reply; 35+ messages in thread
From: Sergei Shtylyov @ 2012-11-19 12:30 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 19-11-2012 5:24, Simon Horman wrote:
> From: Bastian Hecht <hechtb@gmail.com>
> Since commit 3c7ea4eccfd2e
Please also specify that commit summary in parens.
> the sh_flctl driver requires the error IRQ line to
> signal failed transactions between the flash controller and the NAND chip.
> This information is mandatory - else the driver refuses to start up. We
> provide it here for the board mackerel.
> Signed-off-by: Bastian Hecht <hechtb@gmail.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
WBR, Sergei
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource
2012-11-19 12:30 ` Sergei Shtylyov
@ 2012-11-20 0:03 ` Simon Horman
0 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2012-11-20 0:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 19, 2012 at 04:30:59PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 19-11-2012 5:24, Simon Horman wrote:
>
> >From: Bastian Hecht <hechtb@gmail.com>
>
> >Since commit 3c7ea4eccfd2e
>
> Please also specify that commit summary in parens.
Thanks, I will fix this and re-post.
> >the sh_flctl driver requires the error IRQ line to
> >signal failed transactions between the flash controller and the NAND chip.
> >This information is mandatory - else the driver refuses to start up. We
> >provide it here for the board mackerel.
>
> >Signed-off-by: Bastian Hecht <hechtb@gmail.com>
> >Signed-off-by: Simon Horman <horms@verge.net.au>
>
> 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
>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [GIT PULL] Renesas ARM-based SoC boards for v3.9
2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
` (11 preceding siblings ...)
2012-11-19 1:24 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 1/7] ARM: mackerel: include the correct .dtsi file Simon Horman
` (7 more replies)
12 siblings, 8 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following board enhancements for 3.9.
----------------------------------------------------------------
The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
Linux 3.8-rc3 (2013-01-09 18:59:55 -0800)
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 42dd581bc4dba82e8756bb881fa974742250b4c6:
ARM: shmobile: Include sh73a0 DTSI in kzm9g (2013-01-25 09:26:33 +0900)
----------------------------------------------------------------
Guennadi Liakhovetski (1):
ARM: mackerel: include the correct .dtsi file
Kuninori Morimoto (3):
ARM: shmobile: fix sample amixer settings for mackerel
ARM: shmobile: add sample amixer settings for ap4evb
ARM: shmobile: add sample amixer settings for armadillo800eva
Laurent Pinchart (2):
ARM: shmobile: kzm9g: Use of_machine_is_compatible()
ARM: shmobile: Include sh73a0 DTSI in kzm9g
Nobuhiro Iwamatsu (1):
ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
arch/arm/mach-shmobile/board-ap4evb.c | 4 ++++
arch/arm/mach-shmobile/board-armadillo800eva.c | 8 ++++++++
arch/arm/mach-shmobile/board-kzm9g.c | 2 +-
arch/arm/mach-shmobile/board-mackerel.c | 4 +---
7 files changed, 17 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 1/7] ARM: mackerel: include the correct .dtsi file
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 2/7] ARM: shmobile: fix sample amixer settings for mackerel Simon Horman
` (6 subsequent siblings)
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Mackerel's .dts Device Tree description file should derive from the SoC's
.dtsi, not from skeleton.dtsi directly.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts
index 286f0ca..2ede70d 100644
--- a/arch/arm/boot/dts/sh7372-mackerel.dts
+++ b/arch/arm/boot/dts/sh7372-mackerel.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "skeleton.dtsi"
+/include/ "sh7372.dtsi"
/ {
model = "Mackerel (AP4 EVM 2nd)";
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 2/7] ARM: shmobile: fix sample amixer settings for mackerel
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
2013-01-25 2:17 ` [PATCH 1/7] ARM: mackerel: include the correct .dtsi file Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 3/7] ARM: shmobile: add sample amixer settings for ap4evb Simon Horman
` (5 subsequent siblings)
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch updates FSI-AK4643 amixer setting
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-mackerel.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 2fed62f..002eaf6 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -202,9 +202,7 @@
*
* it needs amixer settings for playing
*
- * amixer set "Headphone" on
- * amixer set "HPOUTL Mixer DACH" on
- * amixer set "HPOUTR Mixer DACH" on
+ * amixer set "Headphone Enable" on
*/
/* Fixed 3.3V and 1.8V regulators to be used by multiple devices */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 3/7] ARM: shmobile: add sample amixer settings for ap4evb
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
2013-01-25 2:17 ` [PATCH 1/7] ARM: mackerel: include the correct .dtsi file Simon Horman
2013-01-25 2:17 ` [PATCH 2/7] ARM: shmobile: fix sample amixer settings for mackerel Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 4/7] ARM: shmobile: add sample amixer settings for armadillo800eva Simon Horman
` (4 subsequent siblings)
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
FSI2A-AK4643 needs amixer setting to use it.
This patch adds quick setting guide
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-ap4evb.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 99ef190..70d287c 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -143,6 +143,10 @@
*
* SW41 : ON : SH-Mobile AP4 Audio Mode
* : OFF : Bluetooth Audio Mode
+ *
+ * it needs amixer settings for playing
+ *
+ * amixer set "Headphone Enable" on
*/
/*
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 4/7] ARM: shmobile: add sample amixer settings for armadillo800eva
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
` (2 preceding siblings ...)
2013-01-25 2:17 ` [PATCH 3/7] ARM: shmobile: add sample amixer settings for ap4evb Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 5/7] ARM: shmobile: kzm9g: Use of_machine_is_compatible() Simon Horman
` (3 subsequent siblings)
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
wm8978 codec requires amixer settings for capture.
This patch adds sample amixer settings on comment area.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 5353adf..5f179e1 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -124,6 +124,14 @@
* this command is required when playback.
*
* # amixer set "Headphone" 50
+ *
+ * this command is required when capture.
+ *
+ * # amixer set "Input PGA" 15
+ * # amixer set "Left Input Mixer MicP" on
+ * # amixer set "Left Input Mixer MicN" on
+ * # amixer set "Right Input Mixer MicN" on
+ * # amixer set "Right Input Mixer MicP" on
*/
/*
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 5/7] ARM: shmobile: kzm9g: Use of_machine_is_compatible()
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
` (3 preceding siblings ...)
2013-01-25 2:17 ` [PATCH 4/7] ARM: shmobile: add sample amixer settings for armadillo800eva Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 6/7] ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva Simon Horman
` (2 subsequent siblings)
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The machine number is hardcoded to ~0 on DT-enabled machines, making
machine_is_*() always fail when support for more than one machine is
compiled into the kernel. Replace the machine_is_kzm9g() call with
of_machine_is_compatible("renesas,kzm9g").
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-kzm9g.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index c02448d..eadf309 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -623,7 +623,7 @@ static int __init as3711_enable_lcdc_backlight(void)
0x45, 0xf0,
};
- if (!machine_is_kzm9g())
+ if (!of_machine_is_compatible("renesas,kzm9g"))
return 0;
if (!a)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 6/7] ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
` (4 preceding siblings ...)
2013-01-25 2:17 ` [PATCH 5/7] ARM: shmobile: kzm9g: Use of_machine_is_compatible() Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-25 2:17 ` [PATCH 7/7] ARM: shmobile: Include sh73a0 DTSI in kzm9g Simon Horman
2013-01-29 17:03 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Olof Johansson
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index a7505a9..a8e7bd9 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "skeleton.dtsi"
+/include/ "r8a7740.dtsi"
/ {
model = "armadillo 800 eva";
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [PATCH 7/7] ARM: shmobile: Include sh73a0 DTSI in kzm9g
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
` (5 preceding siblings ...)
2013-01-25 2:17 ` [PATCH 6/7] ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva Simon Horman
@ 2013-01-25 2:17 ` Simon Horman
2013-01-29 17:03 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Olof Johansson
7 siblings, 0 replies; 35+ messages in thread
From: Simon Horman @ 2013-01-25 2:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index bcb9119..7b37901 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "skeleton.dtsi"
+/include/ "sh73a0.dtsi"
/ {
model = "KZM-A9-GT";
--
1.7.10.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [GIT PULL] Renesas ARM-based SoC boards for v3.9
2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
` (6 preceding siblings ...)
2013-01-25 2:17 ` [PATCH 7/7] ARM: shmobile: Include sh73a0 DTSI in kzm9g Simon Horman
@ 2013-01-29 17:03 ` Olof Johansson
7 siblings, 0 replies; 35+ messages in thread
From: Olof Johansson @ 2013-01-29 17:03 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 25, 2013 at 11:17:26AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> please consider the following board enhancements for 3.9.
>
> ----------------------------------------------------------------
> The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
>
> Linux 3.8-rc3 (2013-01-09 18:59:55 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 35+ messages in thread