* Re: OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register
@ 2009-11-14 0:57 Tony Lindgren
2009-11-14 2:12 ` Janusz Krzysztofik
2009-11-14 23:52 ` [PATCH v2 for-next] " Janusz Krzysztofik
0 siblings, 2 replies; 5+ messages in thread
From: Tony Lindgren @ 2009-11-14 0:57 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: linux-omap
* Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [091110 03:20]:
> The patch corrects the issue introduced with my previous patch:
> "OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set"
> as pointed out by OMAP subsystem maintainer.
Looks like this patch needs to be refreshed against linux-omap
for-next branch.
Tony
> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
>
> ---
> Hi,
>
> I'd really like to have the first one get in as a fix in the -rc series,
> that's why I decided to correct the issue in a follow up.
>
> Thanks,
> Janusz
> ---
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> diff -upr linux-2.6.32-rc6.orig/arch/arm/plat-omap/dma.c linux-2.6.32-rc6/arch/arm/plat-omap/dma.c
> --- linux-2.6.32-rc6.orig/arch/arm/plat-omap/dma.c 2009-11-05 19:30:39.000000000 +0100
> +++ linux-2.6.32-rc6/arch/arm/plat-omap/dma.c 2009-11-10 03:57:06.000000000 +0100
> @@ -34,6 +34,7 @@
> #include <mach/hardware.h>
> #include <mach/dma.h>
>
> +#include <mach/omapfb.h>
> #include <mach/tc.h>
>
> #undef DEBUG
> @@ -1113,7 +1114,7 @@ int omap_dma_running(void)
> * when it gets enabled, so assume DMA running if LCD enabled.
> */
> if (cpu_is_omap1510())
> - if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
> + if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)
> return 1;
>
> /* Check if LCD DMA is running */
> diff -upr linux-2.6.32-rc6.orig/arch/arm/plat-omap/include/mach/omapfb.h linux-2.6.32-rc6/arch/arm/plat-omap/include/mach/omapfb.h
> --- linux-2.6.32-rc6.orig/arch/arm/plat-omap/include/mach/omapfb.h 2009-11-03 20:37:49.000000000 +0100
> +++ linux-2.6.32-rc6/arch/arm/plat-omap/include/mach/omapfb.h 2009-11-10 03:52:00.000000000 +0100
> @@ -170,6 +170,38 @@ enum omapfb_update_mode {
>
> #include <mach/board.h>
>
> +#define OMAP_LCDC_BASE 0xfffec000
> +#define OMAP_LCDC_SIZE 256
> +#define OMAP_LCDC_IRQ INT_LCD_CTRL
> +
> +#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
> +#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
> +#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
> +#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
> +#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
> +#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
> +#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
> +#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
> +
> +#define OMAP_LCDC_STAT_DONE (1 << 0)
> +#define OMAP_LCDC_STAT_VSYNC (1 << 1)
> +#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
> +#define OMAP_LCDC_STAT_ABC (1 << 3)
> +#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
> +#define OMAP_LCDC_STAT_FUF (1 << 5)
> +#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
> +
> +#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
> +#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
> +#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
> +
> +#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
> +#define OMAP_LCDC_IRQ_DONE (1 << 3)
> +#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
> +#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
> +#define OMAP_LCDC_IRQ_LINE (1 << 6)
> +#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
> +
> #define OMAP_LCDC_INV_VSYNC 0x0001
> #define OMAP_LCDC_INV_HSYNC 0x0002
> #define OMAP_LCDC_INV_PIX_CLOCK 0x0004
> diff -upr linux-2.6.32-rc6.orig/drivers/video/omap/lcdc.c linux-2.6.32-rc6/drivers/video/omap/lcdc.c
> --- linux-2.6.32-rc6.orig/drivers/video/omap/lcdc.c 2009-11-03 20:37:49.000000000 +0100
> +++ linux-2.6.32-rc6/drivers/video/omap/lcdc.c 2009-11-10 03:51:16.000000000 +0100
> @@ -38,38 +38,6 @@
>
> #define MODULE_NAME "lcdc"
>
> -#define OMAP_LCDC_BASE 0xfffec000
> -#define OMAP_LCDC_SIZE 256
> -#define OMAP_LCDC_IRQ INT_LCD_CTRL
> -
> -#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
> -#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
> -#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
> -#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
> -#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
> -#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
> -#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
> -#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
> -
> -#define OMAP_LCDC_STAT_DONE (1 << 0)
> -#define OMAP_LCDC_STAT_VSYNC (1 << 1)
> -#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
> -#define OMAP_LCDC_STAT_ABC (1 << 3)
> -#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
> -#define OMAP_LCDC_STAT_FUF (1 << 5)
> -#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
> -
> -#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
> -#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
> -#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
> -
> -#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
> -#define OMAP_LCDC_IRQ_DONE (1 << 3)
> -#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
> -#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
> -#define OMAP_LCDC_IRQ_LINE (1 << 6)
> -#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
> -
> #define MAX_PALETTE_SIZE PAGE_SIZE
>
> enum lcdc_load_mode {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register
2009-11-14 0:57 OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register Tony Lindgren
@ 2009-11-14 2:12 ` Janusz Krzysztofik
2009-11-14 23:52 ` [PATCH v2 for-next] " Janusz Krzysztofik
1 sibling, 0 replies; 5+ messages in thread
From: Janusz Krzysztofik @ 2009-11-14 2:12 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
Saturday 14 November 2009 01:57:10 Tony Lindgren napisał(a):
> * Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [091110 03:20]:
> > The patch corrects the issue introduced with my previous patch:
> > "OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set"
> > as pointed out by OMAP subsystem maintainer.
>
> Looks like this patch needs to be refreshed against linux-omap
> for-next branch.
OK, I'll take care of this.
Janusz
> Tony
>
> > Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
> >
> > ---
> > Hi,
> >
> > I'd really like to have the first one get in as a fix in the -rc series,
> > that's why I decided to correct the issue in a follow up.
> >
> > Thanks,
> > Janusz
> > ---
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> > diff -upr linux-2.6.32-rc6.orig/arch/arm/plat-omap/dma.c
> > linux-2.6.32-rc6/arch/arm/plat-omap/dma.c ---
> > linux-2.6.32-rc6.orig/arch/arm/plat-omap/dma.c 2009-11-05
> > 19:30:39.000000000 +0100 +++
> > linux-2.6.32-rc6/arch/arm/plat-omap/dma.c 2009-11-10 03:57:06.000000000
> > +0100 @@ -34,6 +34,7 @@
> > #include <mach/hardware.h>
> > #include <mach/dma.h>
> >
> > +#include <mach/omapfb.h>
> > #include <mach/tc.h>
> >
> > #undef DEBUG
> > @@ -1113,7 +1114,7 @@ int omap_dma_running(void)
> > * when it gets enabled, so assume DMA running if LCD enabled.
> > */
> > if (cpu_is_omap1510())
> > - if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
> > + if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)
> > return 1;
> >
> > /* Check if LCD DMA is running */
> > diff -upr linux-2.6.32-rc6.orig/arch/arm/plat-omap/include/mach/omapfb.h
> > linux-2.6.32-rc6/arch/arm/plat-omap/include/mach/omapfb.h ---
> > linux-2.6.32-rc6.orig/arch/arm/plat-omap/include/mach/omapfb.h 2009-11-03
> > 20:37:49.000000000 +0100 +++
> > linux-2.6.32-rc6/arch/arm/plat-omap/include/mach/omapfb.h 2009-11-10
> > 03:52:00.000000000 +0100 @@ -170,6 +170,38 @@ enum omapfb_update_mode {
> >
> > #include <mach/board.h>
> >
> > +#define OMAP_LCDC_BASE 0xfffec000
> > +#define OMAP_LCDC_SIZE 256
> > +#define OMAP_LCDC_IRQ INT_LCD_CTRL
> > +
> > +#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
> > +#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
> > +#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
> > +#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
> > +#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
> > +#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
> > +#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
> > +#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
> > +
> > +#define OMAP_LCDC_STAT_DONE (1 << 0)
> > +#define OMAP_LCDC_STAT_VSYNC (1 << 1)
> > +#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
> > +#define OMAP_LCDC_STAT_ABC (1 << 3)
> > +#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
> > +#define OMAP_LCDC_STAT_FUF (1 << 5)
> > +#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
> > +
> > +#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
> > +#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
> > +#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
> > +
> > +#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
> > +#define OMAP_LCDC_IRQ_DONE (1 << 3)
> > +#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
> > +#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
> > +#define OMAP_LCDC_IRQ_LINE (1 << 6)
> > +#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
> > +
> > #define OMAP_LCDC_INV_VSYNC 0x0001
> > #define OMAP_LCDC_INV_HSYNC 0x0002
> > #define OMAP_LCDC_INV_PIX_CLOCK 0x0004
> > diff -upr linux-2.6.32-rc6.orig/drivers/video/omap/lcdc.c
> > linux-2.6.32-rc6/drivers/video/omap/lcdc.c ---
> > linux-2.6.32-rc6.orig/drivers/video/omap/lcdc.c 2009-11-03
> > 20:37:49.000000000 +0100 +++
> > linux-2.6.32-rc6/drivers/video/omap/lcdc.c 2009-11-10 03:51:16.000000000
> > +0100 @@ -38,38 +38,6 @@
> >
> > #define MODULE_NAME "lcdc"
> >
> > -#define OMAP_LCDC_BASE 0xfffec000
> > -#define OMAP_LCDC_SIZE 256
> > -#define OMAP_LCDC_IRQ INT_LCD_CTRL
> > -
> > -#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
> > -#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
> > -#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
> > -#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
> > -#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
> > -#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
> > -#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
> > -#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
> > -
> > -#define OMAP_LCDC_STAT_DONE (1 << 0)
> > -#define OMAP_LCDC_STAT_VSYNC (1 << 1)
> > -#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
> > -#define OMAP_LCDC_STAT_ABC (1 << 3)
> > -#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
> > -#define OMAP_LCDC_STAT_FUF (1 << 5)
> > -#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
> > -
> > -#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
> > -#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
> > -#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
> > -
> > -#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
> > -#define OMAP_LCDC_IRQ_DONE (1 << 3)
> > -#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
> > -#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
> > -#define OMAP_LCDC_IRQ_LINE (1 << 6)
> > -#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
> > -
> > #define MAX_PALETTE_SIZE PAGE_SIZE
> >
> > enum lcdc_load_mode {
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" 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] 5+ messages in thread
* [PATCH v2 for-next] OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register
2009-11-14 0:57 OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register Tony Lindgren
2009-11-14 2:12 ` Janusz Krzysztofik
@ 2009-11-14 23:52 ` Janusz Krzysztofik
2009-11-16 20:40 ` [PATCH v3 " Janusz Krzysztofik
1 sibling, 1 reply; 5+ messages in thread
From: Janusz Krzysztofik @ 2009-11-14 23:52 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
The patch corrects the issue introduced with my previous patch:
"OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set"
as pointed out by OMAP subsystem maintainer.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
Saturday 14 November 2009 01:57:10 Tony Lindgren napisał(a):
> Looks like this patch needs to be refreshed against linux-omap
> for-next branch.
Refreshed against commit 155a75d9725e66e5ec8a383822957dee52427057
Thanks,
Janusz
diff -upr a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
--- a/arch/arm/plat-omap/dma.c 2009-11-14 23:48:41.000000000 +0100
+++ b/arch/arm/plat-omap/dma.c 2009-11-15 00:02:39.000000000 +0100
@@ -34,6 +34,7 @@
#include <mach/hardware.h>
#include <plat/dma.h>
+#include <plat/omapfb.h>
#include <plat/tc.h>
#undef DEBUG
@@ -1125,7 +1126,7 @@ int omap_dma_running(void)
* when it gets enabled, so assume DMA running if LCD enabled.
*/
if (cpu_is_omap1510())
- if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
+ if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)
return 1;
/* Check if LCD DMA is running */
diff -upr a/arch/arm/plat-omap/include/plat/omapfb.h b/arch/arm/plat-omap/include/plat/omapfb.h
--- a/arch/arm/plat-omap/include/plat/omapfb.h 2009-11-14 23:48:41.000000000 +0100
+++ b/arch/arm/plat-omap/include/plat/omapfb.h 2009-11-14 23:59:51.000000000 +0100
@@ -170,6 +170,38 @@ enum omapfb_update_mode {
#include <plat/board.h>
+#define OMAP_LCDC_BASE 0xfffec000
+#define OMAP_LCDC_SIZE 256
+#define OMAP_LCDC_IRQ INT_LCD_CTRL
+
+#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
+#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
+#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
+#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
+#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
+#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
+#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
+#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
+
+#define OMAP_LCDC_STAT_DONE (1 << 0)
+#define OMAP_LCDC_STAT_VSYNC (1 << 1)
+#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
+#define OMAP_LCDC_STAT_ABC (1 << 3)
+#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
+#define OMAP_LCDC_STAT_FUF (1 << 5)
+#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
+
+#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
+#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
+#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
+
+#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
+#define OMAP_LCDC_IRQ_DONE (1 << 3)
+#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
+#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
+#define OMAP_LCDC_IRQ_LINE (1 << 6)
+#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
+
#define OMAP_LCDC_INV_VSYNC 0x0001
#define OMAP_LCDC_INV_HSYNC 0x0002
#define OMAP_LCDC_INV_PIX_CLOCK 0x0004
diff -upr a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
--- a/drivers/video/omap/lcdc.c 2009-11-14 23:49:16.000000000 +0100
+++ b/drivers/video/omap/lcdc.c 2009-11-14 23:59:51.000000000 +0100
@@ -38,38 +38,6 @@
#define MODULE_NAME "lcdc"
-#define OMAP_LCDC_BASE 0xfffec000
-#define OMAP_LCDC_SIZE 256
-#define OMAP_LCDC_IRQ INT_LCD_CTRL
-
-#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
-#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
-#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
-#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
-#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
-#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
-#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
-#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
-
-#define OMAP_LCDC_STAT_DONE (1 << 0)
-#define OMAP_LCDC_STAT_VSYNC (1 << 1)
-#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
-#define OMAP_LCDC_STAT_ABC (1 << 3)
-#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
-#define OMAP_LCDC_STAT_FUF (1 << 5)
-#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
-
-#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
-#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
-#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
-
-#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
-#define OMAP_LCDC_IRQ_DONE (1 << 3)
-#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
-#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
-#define OMAP_LCDC_IRQ_LINE (1 << 6)
-#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
-
#define MAX_PALETTE_SIZE PAGE_SIZE
enum lcdc_load_mode {
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" 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] 5+ messages in thread
* Re: [PATCH v3 for-next] OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register
2009-11-14 23:52 ` [PATCH v2 for-next] " Janusz Krzysztofik
@ 2009-11-16 20:40 ` Janusz Krzysztofik
2009-11-16 20:46 ` [APPLIED] [PATCH v3 for-next] OMAP: DMA: Use some define rather than a Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Janusz Krzysztofik @ 2009-11-16 20:40 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
The patch corrects the issue introduced with my previous patch:
"OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set"
as pointed out by OMAP subsystem maintainer.
Created and tested against linux-omap for-next,
commit 155a75d9725e66e5ec8a383822957dee52427057
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
This version creates a new OMAP1 machine specific header file instead of
modifying an OMAP platform common one.
Thanks,
Janusz
diff -uprN a/arch/arm/mach-omap1/include/mach/lcdc.h b/arch/arm/mach-omap1/include/mach/lcdc.h
--- a/arch/arm/mach-omap1/include/mach/lcdc.h 1970-01-01 01:00:00.000000000 +0100
+++ b/arch/arm/mach-omap1/include/mach/lcdc.h 2009-11-16 21:13:33.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Header file for OMAP1 internal LCD controller
+ *
+ * Extracted from drivers/video/omap/lcdc.c
+ *
+ * Copyright (C) 2004 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ARCH_OMAP_LCDC_H__
+#define __ARCH_OMAP_LCDC_H__
+
+#define OMAP_LCDC_BASE 0xfffec000
+#define OMAP_LCDC_SIZE 256
+#define OMAP_LCDC_IRQ INT_LCD_CTRL
+
+#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
+#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
+#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
+#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
+#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
+#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
+#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
+#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
+
+#define OMAP_LCDC_STAT_DONE (1 << 0)
+#define OMAP_LCDC_STAT_VSYNC (1 << 1)
+#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
+#define OMAP_LCDC_STAT_ABC (1 << 3)
+#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
+#define OMAP_LCDC_STAT_FUF (1 << 5)
+#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
+
+#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
+#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
+#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
+
+#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
+#define OMAP_LCDC_IRQ_DONE (1 << 3)
+#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
+#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
+#define OMAP_LCDC_IRQ_LINE (1 << 6)
+#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
+
+#endif
diff -uprN a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
--- a/arch/arm/plat-omap/dma.c 2009-11-14 23:48:41.000000000 +0100
+++ b/arch/arm/plat-omap/dma.c 2009-11-16 21:14:50.000000000 +0100
@@ -36,6 +36,10 @@
#include <plat/tc.h>
+#ifdef CONFIG_ARCH_OMAP1
+#include <mach/lcdc.h>
+#endif
+
#undef DEBUG
#ifndef CONFIG_ARCH_OMAP1
@@ -1125,7 +1129,7 @@ int omap_dma_running(void)
* when it gets enabled, so assume DMA running if LCD enabled.
*/
if (cpu_is_omap1510())
- if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
+ if (omap_readw(OMAP_LCDC_CONTROL) & OMAP_LCDC_CTRL_LCD_EN)
return 1;
/* Check if LCD DMA is running */
diff -uprN a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
--- a/drivers/video/omap/lcdc.c 2009-11-14 23:49:16.000000000 +0100
+++ b/drivers/video/omap/lcdc.c 2009-11-16 21:10:53.000000000 +0100
@@ -31,6 +31,7 @@
#include <plat/dma.h>
#include <plat/omapfb.h>
+#include <mach/lcdc.h>
#include <asm/mach-types.h>
@@ -38,38 +39,6 @@
#define MODULE_NAME "lcdc"
-#define OMAP_LCDC_BASE 0xfffec000
-#define OMAP_LCDC_SIZE 256
-#define OMAP_LCDC_IRQ INT_LCD_CTRL
-
-#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
-#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
-#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
-#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
-#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
-#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
-#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
-#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
-
-#define OMAP_LCDC_STAT_DONE (1 << 0)
-#define OMAP_LCDC_STAT_VSYNC (1 << 1)
-#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
-#define OMAP_LCDC_STAT_ABC (1 << 3)
-#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
-#define OMAP_LCDC_STAT_FUF (1 << 5)
-#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
-
-#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
-#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
-#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
-
-#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
-#define OMAP_LCDC_IRQ_DONE (1 << 3)
-#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
-#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
-#define OMAP_LCDC_IRQ_LINE (1 << 6)
-#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
-
#define MAX_PALETTE_SIZE PAGE_SIZE
enum lcdc_load_mode {
^ permalink raw reply [flat|nested] 5+ messages in thread
* [APPLIED] [PATCH v3 for-next] OMAP: DMA: Use some define rather than a
2009-11-16 20:40 ` [PATCH v3 " Janusz Krzysztofik
@ 2009-11-16 20:46 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2009-11-16 20:46 UTC (permalink / raw)
To: linux-omap
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): f69a6bb287ffdef1343222af9d3d82222cbb6d5a
PatchWorks
http://patchwork.kernel.org/patch/60478/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=f69a6bb287ffdef1343222af9d3d82222cbb6d5a
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-16 20:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-14 0:57 OMAP: DMA: Use some define rather than a hexadecimal constant for LCD register Tony Lindgren
2009-11-14 2:12 ` Janusz Krzysztofik
2009-11-14 23:52 ` [PATCH v2 for-next] " Janusz Krzysztofik
2009-11-16 20:40 ` [PATCH v3 " Janusz Krzysztofik
2009-11-16 20:46 ` [APPLIED] [PATCH v3 for-next] OMAP: DMA: Use some define rather than a Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.