* [PATCH] ARM: shmobile: koelsch: Add DU device
@ 2013-12-02 0:31 Laurent Pinchart
2013-12-05 4:04 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2013-12-02 0:31 UTC (permalink / raw)
To: linux-sh
Only the LVDS output is currently supported.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/mach-shmobile/board-koelsch.c | 61 ++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index ec02054..e8431f1 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -27,6 +27,7 @@
#include <linux/phy.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/sh_eth.h>
#include <mach/common.h>
@@ -36,6 +37,57 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+/* DU */
+static struct rcar_du_encoder_data lager_du_encoders[] = {
+ {
+ .type = RCAR_DU_ENCODER_NONE,
+ .output = RCAR_DU_OUTPUT_LVDS0,
+ .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, 0x40000),
+ DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
+ DEFINE_RES_IRQ(gic_spi(256)),
+ DEFINE_RES_IRQ(gic_spi(268)),
+};
+
+static void __init koelsch_add_du_device(void)
+{
+ struct platform_device_info info = {
+ .name = "rcar-du-r8a7791",
+ .id = -1,
+ .res = du_resources,
+ .num_res = ARRAY_SIZE(du_resources),
+ .data = &lager_du_pdata,
+ .size_data = sizeof(lager_du_pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ platform_device_register_full(&info);
+}
+
/* Ether */
static const struct sh_eth_plat_data ether_pdata __initconst = {
.phy = 0x1,
@@ -96,6 +148,13 @@ static const struct gpio_keys_platform_data koelsch_keys_pdata __initconst = {
};
static const struct pinctrl_map koelsch_pinctrl_map[] = {
+ /* DU */
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
+ "du_rgb666", "du"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
+ "du_sync", "du"),
+ PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
+ "du_clk_out_0", "du"),
/* Ether */
PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7791",
"eth_link", "eth"),
@@ -128,6 +187,8 @@ static void __init koelsch_add_standard_devices(void)
platform_device_register_data(&platform_bus, "gpio-keys", -1,
&koelsch_keys_pdata,
sizeof(koelsch_keys_pdata));
+
+ koelsch_add_du_device();
}
/*
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: shmobile: koelsch: Add DU device
2013-12-02 0:31 [PATCH] ARM: shmobile: koelsch: Add DU device Laurent Pinchart
@ 2013-12-05 4:04 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2013-12-05 4:04 UTC (permalink / raw)
To: linux-sh
On Mon, Dec 02, 2013 at 01:31:55AM +0100, Laurent Pinchart wrote:
> Only the LVDS output is currently supported.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Hi Laurent,
this does not appear to apply cleanly.
Could you please rebase it on top of renesas-next-v3.13-rc1-20131202
(or a more recent tag if one exists when you get to this).
> ---
> arch/arm/mach-shmobile/board-koelsch.c | 61 ++++++++++++++++++++++++++++++++++
> 1 file changed, 61 insertions(+)
>
> diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
> index ec02054..e8431f1 100644
> --- a/arch/arm/mach-shmobile/board-koelsch.c
> +++ b/arch/arm/mach-shmobile/board-koelsch.c
> @@ -27,6 +27,7 @@
> #include <linux/phy.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/sh_eth.h>
> #include <mach/common.h>
> @@ -36,6 +37,57 @@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> +/* DU */
> +static struct rcar_du_encoder_data lager_du_encoders[] = {
> + {
> + .type = RCAR_DU_ENCODER_NONE,
> + .output = RCAR_DU_OUTPUT_LVDS0,
> + .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, 0x40000),
> + DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
> + DEFINE_RES_IRQ(gic_spi(256)),
> + DEFINE_RES_IRQ(gic_spi(268)),
> +};
> +
> +static void __init koelsch_add_du_device(void)
> +{
> + struct platform_device_info info = {
> + .name = "rcar-du-r8a7791",
> + .id = -1,
> + .res = du_resources,
> + .num_res = ARRAY_SIZE(du_resources),
> + .data = &lager_du_pdata,
> + .size_data = sizeof(lager_du_pdata),
> + .dma_mask = DMA_BIT_MASK(32),
> + };
> +
> + platform_device_register_full(&info);
> +}
> +
> /* Ether */
> static const struct sh_eth_plat_data ether_pdata __initconst = {
> .phy = 0x1,
> @@ -96,6 +148,13 @@ static const struct gpio_keys_platform_data koelsch_keys_pdata __initconst = {
> };
>
> static const struct pinctrl_map koelsch_pinctrl_map[] = {
> + /* DU */
> + PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
> + "du_rgb666", "du"),
> + PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
> + "du_sync", "du"),
> + PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
> + "du_clk_out_0", "du"),
> /* Ether */
> PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7791",
> "eth_link", "eth"),
> @@ -128,6 +187,8 @@ static void __init koelsch_add_standard_devices(void)
> platform_device_register_data(&platform_bus, "gpio-keys", -1,
> &koelsch_keys_pdata,
> sizeof(koelsch_keys_pdata));
> +
> + koelsch_add_du_device();
> }
>
> /*
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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] 2+ messages in thread
end of thread, other threads:[~2013-12-05 4:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-02 0:31 [PATCH] ARM: shmobile: koelsch: Add DU device Laurent Pinchart
2013-12-05 4:04 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).