Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
On Tuesday 09 April 2013, Stephen Rothwell wrote:
>
> - #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> -static void __init sdp2430_display_init(void)
> -{
> - int r;
> -
> - static struct gpio gpios[] __initdata = {
> - { SDP2430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
> - "LCD reset" },
> - { SDP2430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW,
> - "LCD Backlight" },
> - };
> -
> - r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
> - if (r) {
> - pr_err("Cannot request LCD GPIOs, error %d\n", r);
> - return;
> - }
> -
> - omap_display_init(&sdp2430_dss_data);
> -}
> -
> + #if IS_ENABLED(CONFIG_SMC91X)
Looks good, thanks!
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-2430sdp.c between commit 3b4ece75b9e9 ("arm:
omap: board-2430: use generic dpi panel's gpio handling") from the
omap_dss2 tree and commit 5b6513d27775 ("ARM: OMAP: fix typo
"CONFIG_SMC91x_MODULE"") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-2430sdp.c
index e551aae,cb0596b..000
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -135,7 -146,27 +135,7 @@@ static struct omap_dss_board_info sdp24
.default_device = &sdp2430_lcd_device,
};
- #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
-static void __init sdp2430_display_init(void)
-{
- int r;
-
- static struct gpio gpios[] __initdata = {
- { SDP2430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
- "LCD reset" },
- { SDP2430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW,
- "LCD Backlight" },
- };
-
- r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
- if (r) {
- pr_err("Cannot request LCD GPIOs, error %d\n", r);
- return;
- }
-
- omap_display_init(&sdp2430_dss_data);
-}
-
+ #if IS_ENABLED(CONFIG_SMC91X)
static struct omap_smc91x_platform_data board_smc91x_data = {
.cs = 5,
pgpEi4gKLQvNj.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/media/platform/omap/omap_vout.c between commit 950e2fb420d5
("[media] omap_vout: use omapdss's version instead of cpu_is_*") from the
omap_dss2 tree and commit 45c3eb7d3a07 ("ARM: OMAP: Move
plat-omap/dma-omap.h to include/linux/omap-dma.h") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/media/platform/omap/omap_vout.c
index 718e5f6,9935040..000
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@@ -44,6 -44,8 +44,7 @@@
#include
#include
-#include
+ #include
#include
#include
pgppTW9fYTyiV.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-davinci/devices-da8xx.c between commit 3b43ad201dea
("da8xx-fb: cleanup LCDC configurations") from the omap_dss2 tree and
commit 8e0d72d2c7a6 ("ARM: davinci: da8xx: add DA850 PRUSS support") from
the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-davinci/devices-da8xx.c
index fcb30d3,46c9a0c..000
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@@ -518,9 -520,98 +520,78 @@@ void __init da8xx_register_mcasp(int id
}
}
+ static struct resource da8xx_pruss_resources[] = {
+ {
+ .start = DA8XX_PRUSS_MEM_BASE,
+ .end= DA8XX_PRUSS_MEM_BASE + 0x,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT0,
+ .end= IRQ_DA8XX_EVTOUT0,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT1,
+ .end= IRQ_DA8XX_EVTOUT1,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT2,
+ .end= IRQ_DA8XX_EVTOUT2,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT3,
+ .end= IRQ_DA8XX_EVTOUT3,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT4,
+ .end= IRQ_DA8XX_EVTOUT4,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT5,
+ .end= IRQ_DA8XX_EVTOUT5,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT6,
+ .end= IRQ_DA8XX_EVTOUT6,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_DA8XX_EVTOUT7,
+ .end= IRQ_DA8XX_EVTOUT7,
+ .flags = IORESOURCE_IRQ,
+ },
+ };
+
+ static struct uio_pruss_pdata da8xx_uio_pruss_pdata = {
+ .pintc_base = 0x4000,
+ };
+
+ static struct platform_device da8xx_uio_pruss_dev = {
+ .name = "pruss_uio",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(da8xx_pruss_resources),
+ .resource = da8xx_pruss_resources,
+ .dev= {
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &da8xx_uio_pruss_pdata,
+ }
+ };
+
+ int __init da8xx_register_uio_pruss(void)
+ {
+ da8xx_uio_pruss_pdata.sram_pool = sram_get_gen_pool();
+ return platform_device_register(&da8xx_uio_pruss_dev);
+ }
+
-static const struct display_panel disp_panel = {
- QVGA,
- 16,
- 16,
- COLOR_ACTIVE,
-};
-
static struct lcd_ctrl_config lcd_cfg = {
- &disp_panel,
- .ac_bias= 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
+ .panel_shade= COLOR_ACTIVE,
.bpp= 16,
- .fdd= 255,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
- .fifo_th= 6,
};
struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
pgpaS8kDFOjUX.pgp
Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
* Stephen Rothwell [121126 02:58]:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
> remove init call to vram") from the omap_dss2 tree and commit
> f583f0f2c720 ("ARM: OMAP2+: Move omap_reserve() locally to mach-omap2")
> from the arm-soc tree.
>
> I fixed it up (by deleting the file and adding the following patch) and
> can carry the fix as necessary (no action is required).
Thanks this is the correct fix.
Tony
> From 523f2987a07f97c946c63e0be4558b8332b46e8f Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell
> Date: Mon, 26 Nov 2012 21:51:20 +1100
> Subject: [PATCH] OMAP: common.c: remove init call to vram fixup
>
> Signed-off-by: Stephen Rothwell
> ---
> arch/arm/mach-omap2/common.c |3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
> index 5c2fd48..2dabb9e 100644
> --- a/arch/arm/mach-omap2/common.c
> +++ b/arch/arm/mach-omap2/common.c
> @@ -16,8 +16,6 @@
> #include
> #include
>
> -#include
> -
> #include "common.h"
> #include "omap-secure.h"
>
> @@ -32,7 +30,6 @@ int __weak omap_secure_ram_reserve_memblock(void)
>
> void __init omap_reserve(void)
> {
> - omap_vram_reserve_sdram_memblock();
> omap_dsp_reserve_sdram_memblock();
> omap_secure_ram_reserve_memblock();
> omap_barrier_reserve_memblock();
> --
> 1.7.10.280.gaa39
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
remove init call to vram") from the omap_dss2 tree and commit
f583f0f2c720 ("ARM: OMAP2+: Move omap_reserve() locally to mach-omap2")
from the arm-soc tree.
I fixed it up (by deleting the file and adding the following patch) and
can carry the fix as necessary (no action is required).
From 523f2987a07f97c946c63e0be4558b8332b46e8f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell
Date: Mon, 26 Nov 2012 21:51:20 +1100
Subject: [PATCH] OMAP: common.c: remove init call to vram fixup
Signed-off-by: Stephen Rothwell
---
arch/arm/mach-omap2/common.c |3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 5c2fd48..2dabb9e 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -16,8 +16,6 @@
#include
#include
-#include
-
#include "common.h"
#include "omap-secure.h"
@@ -32,7 +30,6 @@ int __weak omap_secure_ram_reserve_memblock(void)
void __init omap_reserve(void)
{
- omap_vram_reserve_sdram_memblock();
omap_dsp_reserve_sdram_memblock();
omap_secure_ram_reserve_memblock();
omap_barrier_reserve_memblock();
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpoQ4gFqDDjd.pgp
Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
* Tomi Valkeinen [120924 06:12]:
> Hi Arnd,
>
> On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
> > On Monday 24 September 2012, Stephen Rothwell wrote:
> > > Today's linux-next merge of the arm-soc tree got a conflict in
> > > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> > > remove unnecessary includes") from the tree and commit e27e35ec735f
> > > ("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
> > > tree.
> > >
> > > The latter removed a superset of the former (as far as include files is
> > > concerned), so I used that and can carry the fix as necessary (no action
> > > is required).
> > >
> >
> > Hi Stephen,
> >
> > I looked at all your reports and your fixes are looking good to me.
> >
> > I'm already building all ARM defconfigs now and have fixup patches for the
> > instances that went wrong or introduced new warnings, I'll do that again
> > on top of today's linux-next tree.
> >
> > The merge window is going to be fun with all those conflicts, but I don't
> > have a better idea either.
>
> If there's a stable branch for the OMAP platform changes, I could merge
> it to omapdss tree and fix the conflicts. But if I've understood right,
> Linus doesn't really like merges just for the sake of fixing conflicts.
>
> So far all the omapdss conflicts seem trivial, though.
Trivial ones should be OK, but maybe you find something
minimal with the following to find tags that you can pull
into your branch make things easier:
$ git log --pretty=oneline --merges v3.6-rc7..arm-soc/for-next
arch/arm/*omap*/* | grep "Merge tag" | grep omap
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi Arnd,
On Mon, 2012-09-24 at 12:43 +, Arnd Bergmann wrote:
> On Monday 24 September 2012, Stephen Rothwell wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> > remove unnecessary includes") from the tree and commit e27e35ec735f
> > ("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
> > tree.
> >
> > The latter removed a superset of the former (as far as include files is
> > concerned), so I used that and can carry the fix as necessary (no action
> > is required).
> >
>
> Hi Stephen,
>
> I looked at all your reports and your fixes are looking good to me.
>
> I'm already building all ARM defconfigs now and have fixup patches for the
> instances that went wrong or introduced new warnings, I'll do that again
> on top of today's linux-next tree.
>
> The merge window is going to be fun with all those conflicts, but I don't
> have a better idea either.
If there's a stable branch for the OMAP platform changes, I could merge
it to omapdss tree and fix the conflicts. But if I've understood right,
Linus doesn't really like merges just for the sake of fixing conflicts.
So far all the omapdss conflicts seem trivial, though.
Tomi
signature.asc
Description: This is a digitally signed message part
Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
On Monday 24 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> remove unnecessary includes") from the tree and commit e27e35ec735f
> ("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
> tree.
>
> The latter removed a superset of the former (as far as include files is
> concerned), so I used that and can carry the fix as necessary (no action
> is required).
>
Hi Stephen,
I looked at all your reports and your fixes are looking good to me.
I'm already building all ARM defconfigs now and have fixup patches for the
instances that went wrong or introduced new warnings, I'll do that again
on top of today's linux-next tree.
The merge window is going to be fun with all those conflicts, but I don't
have a better idea either.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
remove unnecessary includes") from the tree and commit e27e35ec735f
("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
tree.
The latter removed a superset of the former (as far as include files is
concerned), so I used that and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpPKxk6hqvY1.pgp
Description: PGP signature
linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove
unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM:
OMAP2+: Prepare for irqs.h removal") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/video/omap2/dss/dispc.c
index d512c38,ee9e296..000
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@@ -37,6 -37,9 +37,8 @@@
#include
#include
+ #include
-#include
+
#include
#include "dss.h"
pgpOomd9kQpT3.pgp
Description: PGP signature
