Hello,
The DU driver has lost support for platform data, resulting in a compilation breakage for the legacy Marzen and Lager board files that managed to keep under the radar until now.
As the multiplatform boards should be used instead, drop support for DU in the legacy Marzen and Lager boards.
Simon, this is required to fix a compilation breakage in the drm-next branch. I'm sorry for not catching it earlier :-/ How would you like this to go in ? Could the patches be applied to the DRM tree ? They seem to apply cleanly to both drm-next and your latest devel branch.
Laurent Pinchart (2): ARM: shmobile: lager: Remove DU platform device ARM: shmobile: marzen: Remove DU platform device
arch/arm/mach-shmobile/board-lager.c | 58 ----------------------------------- arch/arm/mach-shmobile/board-marzen.c | 58 ----------------------------------- 2 files changed, 116 deletions(-)
Platform data support has been removed from the DU driver, drop DU support from the legacy Lager board file. The multiplatform DT-based Lager support should be used instead.
Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- arch/arm/mach-shmobile/board-lager.c | 58 ------------------------------------ 1 file changed, 58 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index b47262afb240..f8197eb6e566 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -32,7 +32,6 @@ #include <linux/pinctrl/machine.h> #include <linux/platform_data/camera-rcar.h> #include <linux/platform_data/gpio-rcar.h> -#include <linux/platform_data/rcar-du.h> #include <linux/platform_data/usb-rcar-gen2-phy.h> #include <linux/platform_device.h> #include <linux/phy.h> @@ -83,61 +82,6 @@ * */
-/* 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 = { - .pixelclock = 65000000, - .hactive = 1024, - .hfront_porch = 20, - .hback_porch = 160, - .hsync_len = 136, - .vactive = 768, - .vfront_porch = 3, - .vback_porch = 29, - .vsync_len = 6, - }, - }, - }, -}; - -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 = &lager_du_pdata, - .size_data = sizeof(lager_du_pdata), - .dma_mask = DMA_BIT_MASK(32), - }; - - platform_device_register_full(&info); -} - /* LEDS */ static struct gpio_led lager_leds[] = { { @@ -800,8 +744,6 @@ static void __init lager_add_standard_devices(void)
platform_device_register_full(ðer_info);
- lager_add_du_device(); - platform_device_register_resndata(NULL, "qspi", 0, qspi_resources, ARRAY_SIZE(qspi_resources),
Platform data support has been removed from the DU driver, drop DU support from the legacy Marzen board file. The multiplatform DT-based Marzen support should be used instead.
Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- arch/arm/mach-shmobile/board-marzen.c | 58 ----------------------------------- 1 file changed, 58 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 994dc7d86ae2..598f704f76ae 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -27,7 +27,6 @@ #include <linux/pinctrl/machine.h> #include <linux/platform_data/camera-rcar.h> #include <linux/platform_data/gpio-rcar.h> -#include <linux/platform_data/rcar-du.h> #include <linux/platform_data/usb-rcar-phy.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> @@ -171,62 +170,6 @@ 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 = { - .pixelclock = 65000000, - .hactive = 1024, - .hfront_porch = 20, - .hback_porch = 160, - .hsync_len = 136, - .vactive = 768, - .vfront_porch = 3, - .vback_porch = 29, - .vsync_len = 6, - }, - }, - }, -}; - -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[] = { { @@ -385,7 +328,6 @@ static void __init marzen_init(void) platform_device_register_full(&vin1_info); platform_device_register_full(&vin3_info); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); - marzen_add_du_device(); }
static const char *marzen_boards_compat_dt[] __initdata = {
[CCed Magnus, ARM SoC maintainers]
On Thu, Nov 27, 2014 at 05:19:11PM +0200, Laurent Pinchart wrote:
Hello,
The DU driver has lost support for platform data, resulting in a compilation breakage for the legacy Marzen and Lager board files that managed to keep under the radar until now.
As the multiplatform boards should be used instead, drop support for DU in the legacy Marzen and Lager boards.
Simon, this is required to fix a compilation breakage in the drm-next branch. I'm sorry for not catching it earlier :-/ How would you like this to go in ? Could the patches be applied to the DRM tree ? They seem to apply cleanly to both drm-next and your latest devel branch.
Laurent Pinchart (2): ARM: shmobile: lager: Remove DU platform device ARM: shmobile: marzen: Remove DU platform device
arch/arm/mach-shmobile/board-lager.c | 58 ----------------------------------- arch/arm/mach-shmobile/board-marzen.c | 58 -----------------------------------
Yes, I think that should be fine as these fines are in maintenance mode and the only recent change I see to them is to modify the FSF address, which seems far away from the hunks in this patch-set.
In other words, I think the chance of conflicts is small and I am fine with these changes going through the DRM tree if that is where the breakage manifests.
Acked-by: Simon Horman horms+renesas@verge.net.au
I am of course, happy to take them if the DRM maintainer(s) prefer me to.
[CCing Dave]
On Friday 28 November 2014 09:18:46 Simon Horman wrote:
[CCed Magnus, ARM SoC maintainers]
On Thu, Nov 27, 2014 at 05:19:11PM +0200, Laurent Pinchart wrote:
Hello,
The DU driver has lost support for platform data, resulting in a compilation breakage for the legacy Marzen and Lager board files that managed to keep under the radar until now.
As the multiplatform boards should be used instead, drop support for DU in the legacy Marzen and Lager boards.
Simon, this is required to fix a compilation breakage in the drm-next branch. I'm sorry for not catching it earlier :-/ How would you like this to go in ? Could the patches be applied to the DRM tree ? They seem to apply cleanly to both drm-next and your latest devel branch.
Laurent Pinchart (2): ARM: shmobile: lager: Remove DU platform device ARM: shmobile: marzen: Remove DU platform device
arch/arm/mach-shmobile/board-lager.c | 58 ------------------------------ arch/arm/mach-shmobile/board-marzen.c | 58 ------------------------------
Yes, I think that should be fine as these fines are in maintenance mode and the only recent change I see to them is to modify the FSF address, which seems far away from the hunks in this patch-set.
In other words, I think the chance of conflicts is small and I am fine with these changes going through the DRM tree if that is where the breakage manifests.
Acked-by: Simon Horman horms+renesas@verge.net.au
I am of course, happy to take them if the DRM maintainer(s) prefer me to.
Dave, how would you prefer to handle this ?
On Friday 28 November 2014 10:17:33 Laurent Pinchart wrote:
On Friday 28 November 2014 09:18:46 Simon Horman wrote:
[CCed Magnus, ARM SoC maintainers]
On Thu, Nov 27, 2014 at 05:19:11PM +0200, Laurent Pinchart wrote:
Hello,
The DU driver has lost support for platform data, resulting in a compilation breakage for the legacy Marzen and Lager board files that managed to keep under the radar until now.
As the multiplatform boards should be used instead, drop support for DU in the legacy Marzen and Lager boards.
Simon, this is required to fix a compilation breakage in the drm-next branch. I'm sorry for not catching it earlier :-/ How would you like this to go in ? Could the patches be applied to the DRM tree ? They seem to apply cleanly to both drm-next and your latest devel branch.
Laurent Pinchart (2): ARM: shmobile: lager: Remove DU platform device ARM: shmobile: marzen: Remove DU platform device
arch/arm/mach-shmobile/board-lager.c | 58 ------------------------------ arch/arm/mach-shmobile/board-marzen.c | 58 ------------------------------
Yes, I think that should be fine as these fines are in maintenance mode and the only recent change I see to them is to modify the FSF address, which seems far away from the hunks in this patch-set.
In other words, I think the chance of conflicts is small and I am fine with these changes going through the DRM tree if that is where the breakage manifests.
Acked-by: Simon Horman horms+renesas@verge.net.au
I am of course, happy to take them if the DRM maintainer(s) prefer me to.
Dave, how would you prefer to handle this ?
If you want to pick it up, you can also add my
Acked-by: Arnd Bergmann arnd@arndb.de
Otherwise we can merge it through arm-soc, but that would cause a larger bisection problem.
dri-devel@lists.freedesktop.org
-
Arnd Bergmann -
Laurent Pinchart -
Laurent Pinchart -
Simon Horman