* [PATCH 1/5] ARM: shmobile: marzen: Add Display Unit support
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
@ 2013-08-28 1:37 ` Simon Horman
2013-08-28 1:37 ` [PATCH 2/5] ARM: shmobile: lager: Constify platform data and resources Simon Horman
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Support the DU0 VGA and DU1 LVDS outputs. DU1 is connected to a
Mitsubishi AA104XD12 panel (10.4" XGA).
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen.c | 72 +++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index a7d1010..4fa32cc 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -29,6 +29,7 @@
#include <linux/dma-mapping.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_data/gpio-rcar.h>
+#include <linux/platform_data/rcar-du.h>
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
#include <linux/smsc911x.h>
@@ -148,6 +149,63 @@ static struct platform_device hspi_device = {
.num_resources = ARRAY_SIZE(hspi_resources),
};
+/*
+ * DU
+ *
+ * The panel only specifies the [hv]display and [hv]total values. The position
+ * and width of the sync pulses don't matter, they're copied from VESA timings.
+ */
+static struct rcar_du_encoder_data du_encoders[] = {
+ {
+ .type = RCAR_DU_ENCODER_VGA,
+ .output = RCAR_DU_OUTPUT_DPAD0,
+ }, {
+ .type = RCAR_DU_ENCODER_LVDS,
+ .output = RCAR_DU_OUTPUT_DPAD1,
+ .connector.lvds.panel = {
+ .width_mm = 210,
+ .height_mm = 158,
+ .mode = {
+ .clock = 65000,
+ .hdisplay = 1024,
+ .hsync_start = 1048,
+ .hsync_end = 1184,
+ .htotal = 1344,
+ .vdisplay = 768,
+ .vsync_start = 771,
+ .vsync_end = 777,
+ .vtotal = 806,
+ .flags = 0,
+ },
+ },
+ },
+};
+
+static const struct rcar_du_platform_data du_pdata __initconst = {
+ .encoders = du_encoders,
+ .num_encoders = ARRAY_SIZE(du_encoders),
+};
+
+static const struct resource du_resources[] __initconst = {
+ DEFINE_RES_MEM(0xfff80000, 0x40000),
+ DEFINE_RES_IRQ(gic_iid(0x3f)),
+};
+
+static void __init marzen_add_du_device(void)
+{
+ struct platform_device_info info = {
+ .name = "rcar-du-r8a7779",
+ .id = -1,
+ .res = du_resources,
+ .num_res = ARRAY_SIZE(du_resources),
+ .data = &du_pdata,
+ .size_data = sizeof(du_pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ platform_device_register_full(&info);
+}
+
/* LEDS */
static struct gpio_led marzen_leds[] = {
{
@@ -187,6 +245,19 @@ static struct platform_device *marzen_devices[] __initdata = {
};
static const struct pinctrl_map marzen_pinctrl_map[] = {
+ /* DU (CN10: ARGB0, CN13: LVDS) */
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du0_rgb888", "du0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du0_sync_1", "du0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du0_clk_out_0", "du0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du1_rgb666", "du1"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du1_sync_1", "du1"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
+ "du1_clk_out", "du1"),
/* HSPI0 */
PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
"hspi0", "hspi0"),
@@ -236,6 +307,7 @@ static void __init marzen_init(void)
r8a7779_add_standard_devices();
r8a7779_add_usb_phy_device(&usb_phy_platform_data);
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
+ marzen_add_du_device();
}
MACHINE_START(MARZEN, "marzen")
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] ARM: shmobile: lager: Constify platform data and resources
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-08-28 1:37 ` [PATCH 1/5] ARM: shmobile: marzen: Add Display Unit support Simon Horman
@ 2013-08-28 1:37 ` Simon Horman
2013-08-28 1:37 ` [PATCH 3/5] ARM: shmobile: lager: Add Display Unit support Simon Horman
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Platform data and resources for Lager devices are kmemdup()ed when the
corresponding devices are registered and can thus be declared as const.
Do so.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index b161379..9806ca0 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -55,7 +55,7 @@ static struct gpio_led lager_leds[] = {
},
};
-static __initdata struct gpio_led_platform_data lager_leds_pdata = {
+static const struct gpio_led_platform_data lager_leds_pdata __initconst = {
.leds = lager_leds,
.num_leds = ARRAY_SIZE(lager_leds),
};
@@ -71,7 +71,7 @@ static __initdata struct gpio_keys_button gpio_buttons[] = {
GPIO_KEY(KEY_1, RCAR_GP_PIN(1, 14), "SW2-pin1"),
};
-static __initdata struct gpio_keys_platform_data lager_keys_pdata = {
+static const struct gpio_keys_platform_data lager_keys_pdata __initconst = {
.buttons = gpio_buttons,
.nbuttons = ARRAY_SIZE(gpio_buttons),
};
@@ -83,17 +83,17 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] =
};
/* MMCIF */
-static struct sh_mmcif_plat_data mmcif1_pdata __initdata = {
+static const struct sh_mmcif_plat_data mmcif1_pdata __initconst = {
.caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
};
-static struct resource mmcif1_resources[] __initdata = {
+static const struct resource mmcif1_resources[] __initconst = {
DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),
DEFINE_RES_IRQ(gic_spi(170)),
};
/* Ether */
-static struct sh_eth_plat_data ether_pdata __initdata = {
+static const struct sh_eth_plat_data ether_pdata __initconst = {
.phy = 0x1,
.edmac_endian = EDMAC_LITTLE_ENDIAN,
.register_type = SH_ETH_REG_FAST_RCAR,
@@ -101,7 +101,7 @@ static struct sh_eth_plat_data ether_pdata __initdata = {
.ether_link_active_low = 1,
};
-static struct resource ether_resources[] __initdata = {
+static const struct resource ether_resources[] __initconst = {
DEFINE_RES_MEM(0xee700000, 0x400),
DEFINE_RES_IRQ(gic_spi(162)),
};
@@ -156,7 +156,7 @@ static void __init lager_add_standard_devices(void)
ðer_pdata, sizeof(ether_pdata));
}
-static const char *lager_boards_compat_dt[] __initdata = {
+static const char * const lager_boards_compat_dt[] __initconst = {
"renesas,lager",
NULL,
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] ARM: shmobile: lager: Add Display Unit support
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-08-28 1:37 ` [PATCH 1/5] ARM: shmobile: marzen: Add Display Unit support Simon Horman
2013-08-28 1:37 ` [PATCH 2/5] ARM: shmobile: lager: Constify platform data and resources Simon Horman
@ 2013-08-28 1:37 ` Simon Horman
2013-08-28 1:37 ` [PATCH 4/5] ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators Simon Horman
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Only the VGA output is currently supported.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager.c | 66 ++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 9806ca0..5facfc9 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -28,6 +28,7 @@
#include <linux/mmc/sh_mmcif.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_data/gpio-rcar.h>
+#include <linux/platform_data/rcar-du.h>
#include <linux/platform_device.h>
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
@@ -38,6 +39,62 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+/* DU */
+static struct rcar_du_encoder_data lager_du_encoders[] = {
+ {
+ .type = RCAR_DU_ENCODER_VGA,
+ .output = RCAR_DU_OUTPUT_DPAD0,
+ }, {
+ .type = RCAR_DU_ENCODER_NONE,
+ .output = RCAR_DU_OUTPUT_LVDS1,
+ .connector.lvds.panel = {
+ .width_mm = 210,
+ .height_mm = 158,
+ .mode = {
+ .clock = 65000,
+ .hdisplay = 1024,
+ .hsync_start = 1048,
+ .hsync_end = 1184,
+ .htotal = 1344,
+ .vdisplay = 768,
+ .vsync_start = 771,
+ .vsync_end = 777,
+ .vtotal = 806,
+ .flags = 0,
+ },
+ },
+ },
+};
+
+static const struct rcar_du_platform_data lager_du_pdata __initconst = {
+ .encoders = lager_du_encoders,
+ .num_encoders = ARRAY_SIZE(lager_du_encoders),
+};
+
+static const struct resource du_resources[] __initconst = {
+ DEFINE_RES_MEM(0xfeb00000, 0x70000),
+ DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
+ DEFINE_RES_MEM_NAMED(0xfeb94000, 0x1c, "lvds.1"),
+ DEFINE_RES_IRQ(gic_spi(256)),
+ DEFINE_RES_IRQ(gic_spi(268)),
+ DEFINE_RES_IRQ(gic_spi(269)),
+};
+
+static void __init lager_add_du_device(void)
+{
+ struct platform_device_info info = {
+ .name = "rcar-du-r8a7790",
+ .id = -1,
+ .res = du_resources,
+ .num_res = ARRAY_SIZE(du_resources),
+ .data = &du_resources,
+ .size_data = sizeof(du_resources),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ platform_device_register_full(&info);
+}
+
/* LEDS */
static struct gpio_led lager_leds[] = {
{
@@ -107,6 +164,13 @@ static const struct resource ether_resources[] __initconst = {
};
static const struct pinctrl_map lager_pinctrl_map[] = {
+ /* DU (CN10: ARGB0, CN13: LVDS) */
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
+ "du_rgb666", "du"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
+ "du_sync_1", "du"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
+ "du_clk_out_0", "du"),
/* SCIF0 (CN19: DEBUG SERIAL0) */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
"scif0_data", "scif0"),
@@ -154,6 +218,8 @@ static void __init lager_add_standard_devices(void)
ether_resources,
ARRAY_SIZE(ether_resources),
ðer_pdata, sizeof(ether_pdata));
+
+ lager_add_du_device();
}
static const char * const lager_boards_compat_dt[] __initconst = {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (2 preceding siblings ...)
2013-08-28 1:37 ` [PATCH 3/5] ARM: shmobile: lager: Add Display Unit support Simon Horman
@ 2013-08-28 1:37 ` Simon Horman
2013-08-28 1:37 ` [PATCH 5/5] ARM: shmobile: lager: Fix Display Unit platform data Simon Horman
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Currently a dummy fixed always-on regulator is used for all 3 SD/MMC
interfaces on ape6evm. This patch updates the board to use correct supplies
for MMC0, SDHI0 and SDHI1 VDD. SDHI0 VccQ supply regulator should be
implemented in a separate patch.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-ape6evm.c | 54 +++++++++++++++++++++++++++++-----
1 file changed, 46 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 38c6c73..cc951b1 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -113,16 +113,49 @@ static const struct smsc911x_platform_config lan9220_data __initconst = {
};
/*
- * 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. 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.
+ * MMC0 power supplies:
+ * Both Vcc and VccQ to eMMC on APE6EVM are supplied by a tps80032 voltage
+ * regulator. Until support for it is added to this file we simulate the
+ * Vcc supply by a fixed always-on regulator
*/
-static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+static struct regulator_consumer_supply vcc_mmc0_consumers[] =
{
REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+};
+
+/*
+ * SDHI0 power supplies:
+ * Vcc to SDHI0 on APE6EVM is supplied by a GPIO-switchable regulator. VccQ is
+ * provided by the same tps80032 regulator as both MMC0 voltages - see comment
+ * above
+ */
+static struct regulator_consumer_supply vcc_sdhi0_consumers[] =
+{
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+};
+
+static struct regulator_init_data vcc_sdhi0_init_data = {
+ .constraints = {
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = ARRAY_SIZE(vcc_sdhi0_consumers),
+ .consumer_supplies = vcc_sdhi0_consumers,
+};
+
+static const struct fixed_voltage_config vcc_sdhi0_info __initconst = {
+ .supply_name = "SDHI0 Vcc",
+ .microvolts = 3300000,
+ .gpio = 76,
+ .enable_high = 1,
+ .init_data = &vcc_sdhi0_init_data,
+};
+
+/*
+ * SDHI1 power supplies:
+ * Vcc and VccQ to SDHI1 on APE6EVM are both fixed at 3.3V
+ */
+static struct regulator_consumer_supply vcc_sdhi1_consumers[] =
+{
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
};
@@ -215,14 +248,19 @@ 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);
+
+ regulator_register_always_on(1, "MMC0 Vcc", vcc_mmc0_consumers,
+ ARRAY_SIZE(vcc_mmc0_consumers), 2800000);
platform_device_register_resndata(&platform_bus, "sh_mmcif", 0,
mmcif0_resources, ARRAY_SIZE(mmcif0_resources),
&mmcif0_pdata, sizeof(mmcif0_pdata));
+ platform_device_register_data(&platform_bus, "reg-fixed-voltage", 2,
+ &vcc_sdhi0_info, sizeof(vcc_sdhi0_info));
platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
&sdhi0_pdata, sizeof(sdhi0_pdata));
+ regulator_register_always_on(3, "SDHI1 Vcc", vcc_sdhi1_consumers,
+ ARRAY_SIZE(vcc_sdhi1_consumers), 3300000);
platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
&sdhi1_pdata, sizeof(sdhi1_pdata));
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] ARM: shmobile: lager: Fix Display Unit platform data
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (3 preceding siblings ...)
2013-08-28 1:37 ` [PATCH 4/5] ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators Simon Horman
@ 2013-08-28 1:37 ` Simon Horman
2013-08-28 1:44 ` [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-08-29 23:59 ` Olof Johansson
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The DU device erroneously receives the DU resources array as platform
data instead of the DU platform data structure. Fix it.
This problem was introduced by f631fa0 ("ARM: shmobile: lager: Add Display
Unit support").
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 5facfc9..bfca58b 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -87,8 +87,8 @@ static void __init lager_add_du_device(void)
.id = -1,
.res = du_resources,
.num_res = ARRAY_SIZE(du_resources),
- .data = &du_resources,
- .size_data = sizeof(du_resources),
+ .data = &lager_du_pdata,
+ .size_data = sizeof(lager_du_pdata),
.dma_mask = DMA_BIT_MASK(32),
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (4 preceding siblings ...)
2013-08-28 1:37 ` [PATCH 5/5] ARM: shmobile: lager: Fix Display Unit platform data Simon Horman
@ 2013-08-28 1:44 ` Simon Horman
2013-08-29 23:59 ` Olof Johansson
6 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-28 1:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 28, 2013 at 10:37:40AM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
>
> please consider this third round of Renesas ARM based SoC board
> updates for v3.12.
I inadvertently sent this email twice.
Sorry for any confusion that may cause.
The contents should be identical.
>
> It is based on a merge of:
>
> * renesas-boards2-for-v3.12
> ("Second Round of ARM based SoC board updates for v3.12")
> which you have previously pulled.
>
> * renesas-boards-cleanup-for-v3.12
> ("ARM based SoC board cleanups updates for v3.12")
> which you have previously pulled.
>
> * git://people.freedesktop.Org/~airlied/linux drm-rcar-for-v3.12
> Which is in turn based on v3.11-rc3.
> This was provided by Dave Airlie to provide dependencies
> for the Display Unit changes in this series.
>
> I encountered a minor merge conflict when I merged this branch into
> my own next branch. My resolution is available in the renesas-next-20130823
> tag of my renesas tree.
>
> I apologise that this and other pull requests that I will send today
> are rather later in the cycle than I would like. This is primarily due
> to a combination of my summer vacation and wanting to let the patches
> sit in next for a while.
>
>
> The following changes since commit 3ddace5bccc5094a1d135fe4a9e555ef1d40006c:
>
> Merge branch 'drm-rcar-for-v3.12' of git://people.freedesktop.Org/~airlied/linux into boards3 (2013-08-22 11:11:55 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards3-for-v3.12
>
> for you to fetch changes up to 8034dc4a1d615c84932c74633b7399603f7cc2a4:
>
> ARM: shmobile: lager: Fix Display Unit platform data (2013-08-23 09:14:16 +0900)
>
> ----------------------------------------------------------------
> Third round of Renesas ARM-based SoC board updates for v3.12
>
> * Add Display Unit support to lager and marzen boards
> * Constify platform data and resources of lager board
> * Correct regulators of MMC0, SDHI0 and SDHI1 on ape6evm board
>
> ----------------------------------------------------------------
> Guennadi Liakhovetski (1):
> ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators
>
> Laurent Pinchart (4):
> ARM: shmobile: marzen: Add Display Unit support
> ARM: shmobile: lager: Constify platform data and resources
> ARM: shmobile: lager: Add Display Unit support
> ARM: shmobile: lager: Fix Display Unit platform data
>
> arch/arm/mach-shmobile/board-ape6evm.c | 54 +++++++++++++++++++----
> arch/arm/mach-shmobile/board-lager.c | 80 +++++++++++++++++++++++++++++++---
> arch/arm/mach-shmobile/board-marzen.c | 72 ++++++++++++++++++++++++++++++
> 3 files changed, 191 insertions(+), 15 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12
2013-08-28 1:37 [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
` (5 preceding siblings ...)
2013-08-28 1:44 ` [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
@ 2013-08-29 23:59 ` Olof Johansson
2013-08-30 0:19 ` Simon Horman
6 siblings, 1 reply; 9+ messages in thread
From: Olof Johansson @ 2013-08-29 23:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Wed, Aug 28, 2013 at 10:37:40AM +0900, Simon Horman wrote:
> please consider this third round of Renesas ARM based SoC board
> updates for v3.12.
It's time to start closing down the tree, so please hold these (and the other
branches you sent pull requests for on the 28th) for right after -rc1. We'll of
course be happy to take fixes to things before then, but cleanups and new code
should wait.
That will also simplify a lot of the dependencies on these late branches. :)
Thanks,
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 0/5] Third round of Renesas ARM-based SoC board updates for v3.12
2013-08-29 23:59 ` Olof Johansson
@ 2013-08-30 0:19 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-08-30 0:19 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Aug 29, 2013 at 04:59:58PM -0700, Olof Johansson wrote:
> Hi Simon,
>
> On Wed, Aug 28, 2013 at 10:37:40AM +0900, Simon Horman wrote:
> > please consider this third round of Renesas ARM based SoC board
> > updates for v3.12.
>
> It's time to start closing down the tree, so please hold these (and the other
> branches you sent pull requests for on the 28th) for right after -rc1. We'll of
> course be happy to take fixes to things before then, but cleanups and new code
> should wait.
>
> That will also simplify a lot of the dependencies on these late branches. :)
Understood. I'll hold these requests off for the next cycle and
only send fixes for the rest of this cycle.
^ permalink raw reply [flat|nested] 9+ messages in thread