From 0dba2599c0abe39c58338d0a581d4d09d850598d Mon Sep 17 00:00:00 2001 From: andrzej zaborowski Date: Fri, 4 Aug 2006 13:38:44 +0300 Subject: [PATCH] [PATCH] ARM: OMAP: fix PWL macro names Remove "16XX" from the names of PWL-related defines as they are valid for other models as well. --- drivers/video/omap/lcd_osk.c | 8 ++++---- include/asm-arm/arch-omap/hardware.h | 9 +++++++++ include/asm-arm/arch-omap/omap16xx.h | 9 --------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index 20c4de86bf8..cc8bb597ff6 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c @@ -44,10 +44,10 @@ static int osk_panel_enable(struct lcd_panel *panel) 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_panel *panel) 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 --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 4d226b2671f..e45c02cb407 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h @@ -267,6 +267,15 @@ #define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) #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 --git a/include/asm-arm/arch-omap/omap16xx.h b/include/asm-arm/arch-omap/omap16xx.h index f0c7f0fb4dc..04433e65187 100644 --- a/include/asm-arm/arch-omap/omap16xx.h +++ b/include/asm-arm/arch-omap/omap16xx.h @@ -158,15 +158,6 @@ #define UART3_OSC_12M_SEL (OMAP_UART3_BASE + 0x4C) #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 -- 2.41.1