* [PATCH] fix PWL macro names
@ 2006-06-29 19:10 andrzej zaborowski
2006-07-03 15:59 ` Jonathan McDowell
0 siblings, 1 reply; 4+ messages in thread
From: andrzej zaborowski @ 2006-06-29 19:10 UTC (permalink / raw)
To: Linux-OMAP
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
Remove "16XX" from the names of PWL-related defines as they are valid
for other models as well.
---
Regards,
Andzej
[-- Attachment #2: linux-pwl-defines.patch --]
[-- Type: application/octet-stream, Size: 1979 bytes --]
diff -pNaur -X linux-omap-2.6-newbuild/Documentation/dontdiff linux-omap-2.6/drivers/video/omap/lcd_osk.c linux-omap-2.6-newbuild/drivers/video/omap/lcd_osk.c
--- linux-omap-2.6/drivers/video/omap/lcd_osk.c 2006-03-22 18:44:53.000000000 +0100
+++ linux-omap-2.6-newbuild/drivers/video/omap/lcd_osk.c 2006-06-23 03:49:52.000000000 +0200
@@ -44,10 +44,10 @@ static int osk_panel_enable(struct lcd_p
omap_cfg_reg(PWL);
/* Enable PWL unit */
- omap_writeb(0x01, OMAP16XX_PWL_CLK_ENABLE);
+ omap_writeb(0x01, OMAP_PWL_CLK_ENABLE);
/* Set PWL level */
- omap_writeb(0xFF, OMAP16XX_PWL_ENABLE);
+ omap_writeb(0xFF, OMAP_PWL_ENABLE);
/* configure GPIO2 as output */
omap_set_gpio_direction(2, 0);
@@ -61,10 +61,10 @@ static int osk_panel_enable(struct lcd_p
static void osk_panel_disable(struct lcd_panel *panel)
{
/* Set PWL level to zero */
- omap_writeb(0x00, OMAP16XX_PWL_ENABLE);
+ omap_writeb(0x00, OMAP_PWL_ENABLE);
/* Disable PWL unit */
- omap_writeb(0x00, OMAP16XX_PWL_CLK_ENABLE);
+ omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
/* set GPIO2 low */
omap_set_gpio_dataout(2, 0);
diff -pNaur -X linux-omap-2.6-newbuild/Documentation/dontdiff linux-omap-2.6/include/asm-arm/arch-omap/omap16xx.h linux-omap-2.6-newbuild/include/asm-arm/arch-omap/omap16xx.h
--- linux-omap-2.6/include/asm-arm/arch-omap/omap16xx.h 2006-03-22 18:45:00.000000000 +0100
+++ linux-omap-2.6-newbuild/include/asm-arm/arch-omap/omap16xx.h 2006-06-23 03:48:16.000000000 +0200
@@ -163,9 +163,9 @@
* Pulse-Width Light
* ----------------------------------------------------------------------------
*/
-#define OMAP16XX_PWL_BASE (0xfffb5800)
-#define OMAP16XX_PWL_ENABLE (OMAP16XX_PWL_BASE + 0x00)
-#define OMAP16XX_PWL_CLK_ENABLE (OMAP16XX_PWL_BASE + 0x04)
+#define OMAP_PWL_BASE 0xfffb5800
+#define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00)
+#define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04)
/*
* ---------------------------------------------------------------------------
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix PWL macro names
2006-06-29 19:10 [PATCH] fix PWL macro names andrzej zaborowski
@ 2006-07-03 15:59 ` Jonathan McDowell
2006-07-04 2:20 ` andrzej zaborowski
0 siblings, 1 reply; 4+ messages in thread
From: Jonathan McDowell @ 2006-07-03 15:59 UTC (permalink / raw)
To: linux-omap-open-source
On Thu, Jun 29, 2006 at 09:10:35PM +0200, andrzej zaborowski wrote:
> Remove "16XX" from the names of PWL-related defines as they are valid
> for other models as well.
Move them out of omap16xx.h as well then? I'm in favour of this change
though.
J.
--
noodles is on fire
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix PWL macro names
2006-07-03 15:59 ` Jonathan McDowell
@ 2006-07-04 2:20 ` andrzej zaborowski
2006-08-04 10:37 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: andrzej zaborowski @ 2006-07-04 2:20 UTC (permalink / raw)
To: Jonathan McDowell; +Cc: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 849 bytes --]
On 03/07/06, Jonathan McDowell <noodles@earth.li> wrote:
> On Thu, Jun 29, 2006 at 09:10:35PM +0200, andrzej zaborowski wrote:
> > Remove "16XX" from the names of PWL-related defines as they are valid
> > for other models as well.
>
> Move them out of omap16xx.h as well then? I'm in favour of this change
> though.
Ok, patch attached.
I will do the same for UART3 defines later because they are used for
IrDA and I got the IrDA driver working on my OMAP311 with minor
changes (still testing).
>
> J.
>
> --
> noodles is on fire
> _______________________________________________
> Linux-omap-open-source mailing list
> Linux-omap-open-source@linux.omap.com
> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>
---
Move PWL-related defines out of "omap16xx.h" as they are also valid
for models other than 16xx.
---
Regards,
Andrzej
[-- Attachment #2: linux-pwl-defines.patch --]
[-- Type: application/octet-stream, Size: 3057 bytes --]
diff -pNaur -X linux-omap-2.6-newbuild/Documentation/dontdiff linux-omap-2.6/drivers/video/omap/lcd_osk.c linux-omap-2.6-newbuild/drivers/video/omap/lcd_osk.c
--- linux-omap-2.6/drivers/video/omap/lcd_osk.c 2006-03-22 18:44:53.000000000 +0100
+++ linux-omap-2.6-newbuild/drivers/video/omap/lcd_osk.c 2006-06-23 03:49:52.000000000 +0200
@@ -44,10 +44,10 @@ static int osk_panel_enable(struct lcd_p
omap_cfg_reg(PWL);
/* Enable PWL unit */
- omap_writeb(0x01, OMAP16XX_PWL_CLK_ENABLE);
+ omap_writeb(0x01, OMAP_PWL_CLK_ENABLE);
/* Set PWL level */
- omap_writeb(0xFF, OMAP16XX_PWL_ENABLE);
+ omap_writeb(0xFF, OMAP_PWL_ENABLE);
/* configure GPIO2 as output */
omap_set_gpio_direction(2, 0);
@@ -61,10 +61,10 @@ static int osk_panel_enable(struct lcd_p
static void osk_panel_disable(struct lcd_panel *panel)
{
/* Set PWL level to zero */
- omap_writeb(0x00, OMAP16XX_PWL_ENABLE);
+ omap_writeb(0x00, OMAP_PWL_ENABLE);
/* Disable PWL unit */
- omap_writeb(0x00, OMAP16XX_PWL_CLK_ENABLE);
+ omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
/* set GPIO2 low */
omap_set_gpio_dataout(2, 0);
diff -pNaur -X linux-omap-2.6-newbuild/Documentation/dontdiff linux-omap-2.6/include/asm-arm/arch-omap/hardware.h linux-omap-2.6-newbuild/include/asm-arm/arch-omap/hardware.h
--- linux-omap-2.6/include/asm-arm/arch-omap/hardware.h 2006-03-22 18:45:00.000000000 +0100
+++ linux-omap-2.6-newbuild/include/asm-arm/arch-omap/hardware.h 2006-07-04 05:58:42.000000000 +0200
@@ -268,6 +268,15 @@
#define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04)
/*
+ * ----------------------------------------------------------------------------
+ * Pulse-Width Light
+ * ----------------------------------------------------------------------------
+ */
+#define OMAP_PWL_BASE 0xfffb5800
+#define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00)
+#define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04)
+
+/*
* ---------------------------------------------------------------------------
* Processor specific defines
* ---------------------------------------------------------------------------
diff -pNaur -X linux-omap-2.6-newbuild/Documentation/dontdiff linux-omap-2.6/include/asm-arm/arch-omap/omap16xx.h linux-omap-2.6-newbuild/include/asm-arm/arch-omap/omap16xx.h
--- linux-omap-2.6/include/asm-arm/arch-omap/omap16xx.h 2006-03-22 18:45:00.000000000 +0100
+++ linux-omap-2.6-newbuild/include/asm-arm/arch-omap/omap16xx.h 2006-07-04 05:57:09.000000000 +0200
@@ -159,15 +159,6 @@
#define UART3_MVR (OMAP_UART3_BASE + 0x50)
/*
- * ----------------------------------------------------------------------------
- * Pulse-Width Light
- * ----------------------------------------------------------------------------
- */
-#define OMAP16XX_PWL_BASE (0xfffb5800)
-#define OMAP16XX_PWL_ENABLE (OMAP16XX_PWL_BASE + 0x00)
-#define OMAP16XX_PWL_CLK_ENABLE (OMAP16XX_PWL_BASE + 0x04)
-
-/*
* ---------------------------------------------------------------------------
* Watchdog timer
* ---------------------------------------------------------------------------
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix PWL macro names
2006-07-04 2:20 ` andrzej zaborowski
@ 2006-08-04 10:37 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2006-08-04 10:37 UTC (permalink / raw)
To: balrogg; +Cc: linux-omap-open-source
* andrzej zaborowski <balrog@zabor.org> [060704 05:22]:
> On 03/07/06, Jonathan McDowell <noodles@earth.li> wrote:
> >On Thu, Jun 29, 2006 at 09:10:35PM +0200, andrzej zaborowski wrote:
> >> Remove "16XX" from the names of PWL-related defines as they are valid
> >> for other models as well.
> >
> >Move them out of omap16xx.h as well then? I'm in favour of this change
> >though.
>
> Ok, patch attached.
> I will do the same for UART3 defines later because they are used for
> IrDA and I got the IrDA driver working on my OMAP311 with minor
> changes (still testing).
Pushing today. Please separate the core omap files and add a
Signed-off-by next time as specified in:
http://www.muru.com/linux/omap/README_OMAP_PATCHES
Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-08-04 10:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-29 19:10 [PATCH] fix PWL macro names andrzej zaborowski
2006-07-03 15:59 ` Jonathan McDowell
2006-07-04 2:20 ` andrzej zaborowski
2006-08-04 10:37 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox