[rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Get rid of omap_{read,write}[bsl] defines.
Virtual and physical addresses usage was fixed by Russel King and
there's no need anymore for keeping a define to a standard kernel
function. Get rid of those to keep the namespace cleaner.

Build tested with all omap defconfigs.
Depends on my previous "make clk fwk build again on omap1" patch.

Felipe Balbi (59):
  omap: namespace cleanup to arch/arm/mach-omap1/board-fsample.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-h2.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-nokia770.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-osk.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-palmtt.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-palmz71.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-perseus2.c
  omap: namespace cleanup to arch/arm/mach-omap1/board-voiceblue.c
  omap: namespace cleanup to arch/arm/mach-omap1/clock.c
  omap: namespace cleanup to arch/arm/mach-omap1/devices.c
  omap: namespace cleanup to arch/arm/mach-omap1/id.c
  omap: namespace cleanup to arch/arm/mach-omap1/io.c
  omap: namespace cleanup to arch/arm/mach-omap1/irq.c
  omap: namespace cleanup to arch/arm/mach-omap1/mux.c
  omap: namespace cleanup to arch/arm/mach-omap1/pm.c
  omap: namespace cleanup to arch/arm/mach-omap1/timer32k.c
  omap: namespace cleanup to arch/arm/mach-omap2/pm-debug.c
  omap: namespace cleanup to arch/arm/mach-omap2/pm24xx.c
  omap: namespace cleanup to arch/arm/plat-omap/common.c
  omap: namespace cleanup to arch/arm/plat-omap/dma.c
  omap: namespace cleanup to arch/arm/plat-omap/dmtimer.c
  omap: namespace cleanup to arch/arm/plat-omap/gpio.c
  omap: namespace cleanup to arch/arm/plat-omap/ocpi.c
  omap: namespace cleanup to arch/arm/plat-omap/usb.c
  omap: namespace cleanup to drivers/cbus/tahvo-usb.c
  omap: namespace cleanup to drivers/dsp/dspgateway/dsp.h
  omap: namespace cleanup to drivers/dsp/dspgateway/dsp_common.c
  omap: namespace cleanup to drivers/dsp/dspgateway/mmu.h
  omap: namespace cleanup to drivers/i2c/chips/isp1301_omap.c
  omap: namespace cleanup to drivers/i2c/chips/twl4030-usb.c
  omap: namespace cleanup to drivers/input/keyboard/omap-keypad.c
  omap: namespace cleanup to drivers/mtd/maps/omap_nor.c
  omap: namespace cleanup to drivers/mtd/nand/ams-delta.c
  omap: namespace cleanup to drivers/mtd/nand/omap2.c
  omap: namespace cleanup to drivers/net/irda/omap-ir.c
  omap: namespace cleanup to drivers/pcmcia/omap_cf.c
  omap: namespace cleanup to drivers/rtc/rtc-omap.c
  omap: namespace cleanup to drivers/spi/omap_uwire.c
  omap: namespace cleanup to drivers/usb/gadget/omap_udc.c
  omap: namespace cleanup to drivers/usb/gadget/omap_udc.h
  omap: namespace cleanup to drivers/usb/host/ehci-omap.c
  omap: namespace cleanup to drivers/usb/host/ehci-omap.h
  omap: namespace cleanup to drivers/usb/host/ohci-omap.c
  omap: namespace cleanup to drivers/usb/musb/omap2430.c
  omap: namespace cleanup to drivers/video/backlight/omap1_bl.c
  omap: namespace cleanup to drivers/video/omap/dispc.c
  omap: namespace cleanup to drivers/video/omap/lcd_ams_delta.c
  omap: namespace cleanup to drivers/video/omap/lcd_osk.c
  omap: namespace cleanup to drivers/video/omap/lcd_p2.c
  omap: namespace cleanup to drivers/video/omap/lcdc.c
  omap: namespace cleanup to drivers/video/omap/sossi.c
  omap: namespace cleanup to fs/xfs/linux-2.6/xfs_aops.c
  omap: namespace cleanup to fs/xfs/xfs_iomap.c
  omap: namespace cleanup to fs/xfs/xfs_iomap.h
  omap: namespace cleanup to arch/arm/plat-omap/include/mach/mtd-xip.h
  omap: namespace cleanup to arch/arm/plat-omap/include/mach/pm.h
  omap: namespace cleanup to arch/arm/plat-omap/include/mach/system.h
  omap: namespace cleanup to arch/arm/plat-omap/include/mach/tc.h
  omap: namespace cleanup to arch/arm/plat-omap/include/mach/io.h

 arch/arm/mach-omap1/board-fsample.c       |   12 +-
 arch/arm/mach-omap1/board-h2.c            |    2 +-
 arch/arm/mach-omap1/board-nokia770.c      |    4 +-
 arch/arm/mach-omap1/board-osk.c           |   12 +-
 arch/arm/mach-omap1/board-palmtt.c        |    6 +-
 arch/arm/mach-omap1/board-palmz71.c       |    6 +-
 arch/arm/mach-omap1/board-perseus2.c      |   12 +-
 arch/arm/mach-omap1/board-voiceblue.c     |    8 +-
 arch/arm/mach-omap1/clock.c               |   54 ++--
 arch/arm/mach-omap1/devices.c             |    2 +-
 arch/arm/mach-omap1/id.c                  |   30 +-
 arch/arm/mach-omap1/io.c                  |    4 +-
 arch/arm/mach-omap1/irq.c                 |   16 +-
 arch/arm/mach-omap1/mux.c                 |   12 +-
 arch/arm/mach-omap1/pm.c                  |   54 ++--
 arch/arm/mach-omap1/timer32k.c            |    6 +-
 arch/arm/mach-omap2/pm-debug.c            |    2 +-
 arch/arm/mach-omap2/pm24xx.c              |    6 +-
 arch/arm/plat-omap/common.c               |    2 +-
 arch/arm/plat-omap/dma.c                  |   86 +++---
 arch/arm/plat-omap/dmtimer.c              |    6 +-
 arch/arm/plat-omap/gpio.c                 |    6 +-
 arch/arm/plat-omap/include/mach/io.h      |   17 --
 arch/arm/plat-omap/include/mach/mtd-xip.h |    2 +-
 arch/arm/plat-omap/include/mach/pm.h      |   20 +-
 arch/arm/plat-omap/include/mach/system.h  |    6 +-
 arch/arm/plat-omap/include/mach/tc.h      |    4 +-
 arch/arm/plat-omap/ocpi.c                 |    8 +-
 arch/arm/plat-omap/usb.c                  |   82 +++---
 drivers/cbus/tahvo-usb.c                  |   70 +++---
 drivers/dsp/dspgateway/dsp.h              |   12 +-
 drivers/dsp/dspgateway/dsp_common.c       |    2 +-
 drivers/dsp/dspgateway/mmu.h              |    2 +-
 drivers/i2c/chips/isp1301_omap.c          |  118 +++++-----
 drivers/i2c/chips/twl4030-usb.c           |    8 +-
 drivers/input/keyboard/omap-keypad.c      |   24 +-
 drivers/mtd/maps/omap_nor.c               |    8 +-
 drivers/mtd/nand/ams-delta.c              |    8 +-
 drivers/mtd/nand/omap2.c                  |   12 +-
 drivers/net/irda/omap-ir.c                |    8 +-
 drivers/pcmcia/omap_cf.c                  |   20 +-
 drivers/rtc/rtc-omap.c                    |    4 +-
 drivers/spi/omap_uwire.c                  |    4 +-
 drivers/usb/gadget/omap_udc.c             |  406 ++++++++++++++--------------
 drivers/usb/gadget/omap_udc.h             |    4 +-
 drivers/usb/host/ehci-omap.c              |   48 ++--
 drivers/usb/host/ehci-omap.h              |    2 +-
 drivers/usb/host/ohci-omap.c              |   24 +-
 drivers/usb/musb/omap2430.c               |   30 +-
 drivers/video/backlight/omap1_bl.c        |    4 +-
 drivers/video/omap/dispc.c                |    2 +-
 drivers/video/omap/lcd_ams_delta.c        |    4 +-
 drivers/video/omap/lcd_osk.c              |    8 +-
 drivers/video/omap/lcd_p2.c               |    8 +-
 drivers/video/omap/lcdc.c                 |   38 ++--
 drivers/video/omap/sossi.c                |   10 +-
 fs/xfs/linux-2.6/xfs_aops.c               |    2 +-
 fs/xfs/xfs_iomap.c                        |   14 +-
 fs/xfs/xfs_iomap.h                        |    8 +-
 59 files changed, 691 insertions(+), 708 deletions(-)

[rft/rfc/patch-2.6.28-rc3+ 01/59] omap: namespace cleanup to arch/arm/mach-omap1/board-fsample.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-fsample.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index db78946..d758ff1 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -281,7 +281,7 @@ static void __init omap_fsample_map_io(void)
 	/*
 	 * Hold GSM Reset until needed
 	 */
-	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
+	__raw_writew(__raw_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
 
 	/*
 	 * UARTs -> done automagically by 8250 driver
@@ -292,21 +292,21 @@ static void __init omap_fsample_map_io(void)
 	 */
 
 	/* Flash: CS0 timings setup */
-	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
-	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
+	__raw_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
+	__raw_writel(0x00000088, OMAP730_FLASH_ACFG_0);
 
 	/*
 	 * Ethernet support through the debug board
 	 * CS1 timings setup
 	 */
-	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
-	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
+	__raw_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
+	__raw_writel(0x00000000, OMAP730_FLASH_ACFG_1);
 
 	/*
 	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
 	 * It is used as the Ethernet controller interrupt
 	 */
-	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
+	__raw_writel(__raw_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
 }
 
 MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 02/59] omap: namespace cleanup to arch/arm/mach-omap1/board-h2.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-h2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 2c12dfa..84012d6 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -534,7 +534,7 @@ static void __init h2_init(void)
 
 	/* Irda */
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-	omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
+	__raw_writel(__raw_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
 	if (!(omap_request_gpio(H2_IRDA_FIRSEL_GPIO_PIN))) {
 		omap_set_gpio_direction(H2_IRDA_FIRSEL_GPIO_PIN, 0);
 		h2_irda_data.transceiver_mode = h2_transceiver_mode;
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 03/59] omap: namespace cleanup to arch/arm/mach-omap1/board-nokia770.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-nokia770.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 7b28f4d..c94179c 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -47,9 +47,9 @@ static void __init omap_nokia770_init_irq(void)
 	 * to become functional */
 
 	/* SleepX mask direction */
-	omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
+	__raw_writew((__raw_readw(0xfffb5008) & ~2), 0xfffb5008);
 	/* Unmask SleepX signal */
-	omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
+	__raw_writew((__raw_readw(0xfffb5004) & ~2), 0xfffb5004);
 
 	omap1_init_common_hw();
 	omap_init_irq();
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 04/59] omap: namespace cleanup to arch/arm/mach-omap1/board-osk.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-osk.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e506aef..7d8d18a 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -277,9 +277,9 @@ static void __init osk_init_smc91x(void)
 	}
 
 	/* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */
-	l = omap_readl(EMIFS_CCS(1));
+	l = __raw_readl(EMIFS_CCS(1));
 	l |= 0x3;
-	omap_writel(l, EMIFS_CCS(1));
+	__raw_writel(l, EMIFS_CCS(1));
 }
 
 static void __init osk_init_cf(void)
@@ -539,9 +539,9 @@ static void __init osk_init(void)
 	 * wrong CS3 memory timings. This mainly leads to CRC
 	 * or similar errors if you use NOR flash (e.g. with JFFS2)
 	 */
-	l = omap_readl(EMIFS_CCS(3));
+	l = __raw_readl(EMIFS_CCS(3));
 	if (l != EMIFS_CS3_VAL)
-		omap_writel(EMIFS_CS3_VAL, EMIFS_CCS(3));
+		__raw_writel(EMIFS_CS3_VAL, EMIFS_CCS(3));
 
 	osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys();
 	osk_flash_resource.end += SZ_32M - 1;
@@ -549,9 +549,9 @@ static void __init osk_init(void)
 	omap_board_config = osk_config;
 	omap_board_config_size = ARRAY_SIZE(osk_config);
 
-	l = omap_readl(USB_TRANSCEIVER_CTRL);
+	l = __raw_readl(USB_TRANSCEIVER_CTRL);
 	l |= (3 << 1);
-	omap_writel(l, USB_TRANSCEIVER_CTRL);
+	__raw_writel(l, USB_TRANSCEIVER_CTRL);
 
 	/* irq for tps65010 chip */
 	/* bootloader effectively does:  omap_cfg_reg(U19_1610_MPUIO1); */
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 05/59] omap: namespace cleanup to arch/arm/mach-omap1/board-palmtt.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-palmtt.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 40f9860..8e39d9a 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -320,10 +320,10 @@ static struct omap_board_config_kernel palmtt_config[] __initdata = {
 
 static void __init omap_mpu_wdt_mode(int mode) {
 	if (mode)
-		omap_writew(0x8000, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x8000, OMAP_WDT_TIMER_MODE);
 	else {
-		omap_writew(0x00f5, OMAP_WDT_TIMER_MODE);
-		omap_writew(0x00a0, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x00f5, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x00a0, OMAP_WDT_TIMER_MODE);
 	}
 }
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 06/59] omap: namespace cleanup to arch/arm/mach-omap1/board-palmz71.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-palmz71.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index e8116c5..599ee07 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -300,10 +300,10 @@ static void __init
 omap_mpu_wdt_mode(int mode)
 {
 	if (mode)
-		omap_writew(0x8000, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x8000, OMAP_WDT_TIMER_MODE);
 	else {
-		omap_writew(0x00f5, OMAP_WDT_TIMER_MODE);
-		omap_writew(0x00a0, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x00f5, OMAP_WDT_TIMER_MODE);
+		__raw_writew(0x00a0, OMAP_WDT_TIMER_MODE);
 	}
 }
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 07/59] omap: namespace cleanup to arch/arm/mach-omap1/board-perseus2.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-perseus2.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index b715917..28423e5 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -274,7 +274,7 @@ static void __init omap_perseus2_map_io(void)
 	/*
 	 * Hold GSM Reset until needed
 	 */
-	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
+	__raw_writew(__raw_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
 
 	/*
 	 * UARTs -> done automagically by 8250 driver
@@ -285,21 +285,21 @@ static void __init omap_perseus2_map_io(void)
 	 */
 
 	/* Flash: CS0 timings setup */
-	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
-	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
+	__raw_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
+	__raw_writel(0x00000088, OMAP730_FLASH_ACFG_0);
 
 	/*
 	 * Ethernet support through the debug board
 	 * CS1 timings setup
 	 */
-	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
-	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
+	__raw_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
+	__raw_writel(0x00000000, OMAP730_FLASH_ACFG_1);
 
 	/*
 	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
 	 * It is used as the Ethernet controller interrupt
 	 */
-	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
+	__raw_writel(__raw_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
 }
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 08/59] omap: namespace cleanup to arch/arm/mach-omap1/board-voiceblue.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/board-voiceblue.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 3ab5bbf..e3db8f4 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -192,8 +192,8 @@ static void __init voiceblue_init(void)
 
 	/* There is a good chance board is going up, so enable power LED
 	 * (it is connected through invertor) */
-	omap_writeb(0x00, OMAP_LPG1_LCR);
-	omap_writeb(0x00, OMAP_LPG1_PMR);	/* Disable clock */
+	__raw_writeb(0x00, OMAP_LPG1_LCR);
+	__raw_writeb(0x00, OMAP_LPG1_PMR);	/* Disable clock */
 }
 
 static void __init voiceblue_map_io(void)
@@ -213,8 +213,8 @@ static int panic_event(struct notifier_block *this, unsigned long event,
 		return NOTIFY_DONE;
 
 	/* Flash power LED */
-	omap_writeb(0x78, OMAP_LPG1_LCR);
-	omap_writeb(0x01, OMAP_LPG1_PMR);	/* Enable clock */
+	__raw_writeb(0x78, OMAP_LPG1_LCR);
+	__raw_writeb(0x01, OMAP_LPG1_PMR);	/* Enable clock */
 
 	return NOTIFY_DONE;
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 09/59] omap: namespace cleanup to arch/arm/mach-omap1/clock.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/clock.c |   54 +++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 997cfda..77a0ebe 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -50,7 +50,7 @@ static void omap1_uart_recalc(struct clk * clk)
 
 static void omap1_sossi_recalc(struct clk *clk)
 {
-	u32 div = omap_readl(MOD_CONF_CTRL_1);
+	u32 div = __raw_readl(MOD_CONF_CTRL_1);
 
 	div = (div >> 17) & 0x7;
 	div++;
@@ -87,7 +87,7 @@ static int omap1_clk_enable_uart_functional(struct clk *clk)
 	if (ret == 0) {
 		/* Set smart idle acknowledgement mode */
 		uclk = (struct uart_clk *)clk;
-		omap_writeb((omap_readb(uclk->sysc_addr) & ~0x10) | 8,
+		__raw_writeb((__raw_readb(uclk->sysc_addr) & ~0x10) | 8,
 			    uclk->sysc_addr);
 	}
 
@@ -100,7 +100,7 @@ static void omap1_clk_disable_uart_functional(struct clk *clk)
 
 	/* Set force idle acknowledgement mode */
 	uclk = (struct uart_clk *)clk;
-	omap_writeb((omap_readb(uclk->sysc_addr) & ~0x18), uclk->sysc_addr);
+	__raw_writeb((__raw_readb(uclk->sysc_addr) & ~0x18), uclk->sysc_addr);
 
 	omap1_clk_disable_generic(clk);
 }
@@ -220,7 +220,7 @@ static void omap1_ckctl_recalc(struct clk * clk)
 	int dsor;
 
 	/* Calculate divisor encoded as 2-bit exponent */
-	dsor = 1 << (3 & (omap_readw(ARM_CKCTL) >> clk->rate_offset));
+	dsor = 1 << (3 & (__raw_readw(ARM_CKCTL) >> clk->rate_offset));
 
 	if (unlikely(clk->rate == clk->parent->rate / dsor))
 		return; /* No change, quick exit */
@@ -239,7 +239,7 @@ static void omap1_ckctl_recalc_dsp_domain(struct clk * clk)
 	 * The clock control bits are in DSP domain,
 	 * so api_ck is needed for access.
 	 * Note that DSP_CKCTL virt addr = phys addr, so
-	 * we must use __raw_readw() instead of omap_readw().
+	 * we must use __raw_readw() instead of __raw_readw().
 	 */
 	omap1_clk_enable(&api_ck.clk);
 	dsor = 1 << (3 & (__raw_readw(DSP_CKCTL) >> clk->rate_offset));
@@ -417,10 +417,10 @@ static int omap1_set_sossi_rate(struct clk *clk, unsigned long rate)
 	if (div < 0 || div > 7)
 		return -EINVAL;
 
-	l = omap_readl(MOD_CONF_CTRL_1);
+	l = __raw_readl(MOD_CONF_CTRL_1);
 	l &= ~(7 << 17);
 	l |= div << 17;
-	omap_writel(l, MOD_CONF_CTRL_1);
+	__raw_writel(l, MOD_CONF_CTRL_1);
 
 	clk->rate = p_rate / (div + 1);
 	if (unlikely(clk->flags & RATE_PROPAGATES))
@@ -574,11 +574,11 @@ static int omap1_clk_set_rate(struct clk *clk, unsigned long rate)
 		if (dsor_exp < 0)
 			return dsor_exp;
 
-		regval = omap_readw(ARM_CKCTL);
+		regval = __raw_readw(ARM_CKCTL);
 		regval &= ~(3 << clk->rate_offset);
 		regval |= dsor_exp << clk->rate_offset;
 		regval = verify_ckctl_value(regval);
-		omap_writew(regval, ARM_CKCTL);
+		__raw_writew(regval, ARM_CKCTL);
 		clk->rate = clk->parent->rate / (1 << dsor_exp);
 		ret = 0;
 	}
@@ -655,14 +655,14 @@ int __init omap1_clk_init(void)
 	/* Resets some clocks that may be left on from bootloader,
 	 * but leaves serial clocks on.
  	 */
-	omap_writel(0x3 << 29, MOD_CONF_CTRL_0);
+	__raw_writel(0x3 << 29, MOD_CONF_CTRL_0);
 #endif
 
 	/* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
-	reg = omap_readw(SOFT_REQ_REG) & (1 << 4);
-	omap_writew(reg, SOFT_REQ_REG);
+	reg = __raw_readw(SOFT_REQ_REG) & (1 << 4);
+	__raw_writew(reg, SOFT_REQ_REG);
 	if (!cpu_is_omap15xx())
-		omap_writew(0, SOFT_REQ_REG2);
+		__raw_writew(0, SOFT_REQ_REG2);
 
 	clk_init(&omap1_clk_functions);
 
@@ -705,18 +705,18 @@ int __init omap1_clk_init(void)
 #endif
 
 	printk("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n",
-	       omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
-	       omap_readw(ARM_CKCTL));
+	       __raw_readw(ARM_SYSST), __raw_readw(DPLL_CTL),
+	       __raw_readw(ARM_CKCTL));
 
 	/* We want to be in syncronous scalable mode */
-	omap_writew(0x1000, ARM_SYSST);
+	__raw_writew(0x1000, ARM_SYSST);
 
 #ifdef CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER
 	/* Use values set by bootloader. Determine PLL rate and recalculate
 	 * dependent clocks as if kernel had changed PLL or divisors.
 	 */
 	{
-		unsigned pll_ctl_val = omap_readw(DPLL_CTL);
+		unsigned pll_ctl_val = __raw_readw(DPLL_CTL);
 
 		ck_dpll1.rate = ck_ref.rate; /* Base xtal rate */
 		if (pll_ctl_val & 0x10) {
@@ -744,8 +744,8 @@ int __init omap1_clk_init(void)
 	if (omap1_select_table_rate(&virtual_ck_mpu, ~0)) {
 		printk(KERN_ERR "System frequencies not set. Check your config.\n");
 		/* Guess sane values (60MHz) */
-		omap_writew(0x2290, DPLL_CTL);
-		omap_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);
+		__raw_writew(0x2290, DPLL_CTL);
+		__raw_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);
 		ck_dpll1.rate = 60000000;
 		propagate_rate(&ck_dpll1);
 	}
@@ -760,33 +760,33 @@ int __init omap1_clk_init(void)
 
 #if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)
 	/* Select slicer output as OMAP input clock */
-	omap_writew(omap_readw(OMAP730_PCC_UPLD_CTRL) & ~0x1, OMAP730_PCC_UPLD_CTRL);
+	__raw_writew(__raw_readw(OMAP730_PCC_UPLD_CTRL) & ~0x1, OMAP730_PCC_UPLD_CTRL);
 #endif
 
 	/* Amstrad Delta wants BCLK high when inactive */
 	if (machine_is_ams_delta())
-		omap_writel(omap_readl(ULPD_CLOCK_CTRL) |
+		__raw_writel(__raw_readl(ULPD_CLOCK_CTRL) |
 				(1 << SDW_MCLK_INV_BIT),
 				ULPD_CLOCK_CTRL);
 
 	/* Turn off DSP and ARM_TIMXO. Make sure ARM_INTHCK is not divided */
 	/* (on 730, bit 13 must not be cleared) */
 	if (cpu_is_omap730())
-		omap_writew(omap_readw(ARM_CKCTL) & 0x2fff, ARM_CKCTL);
+		__raw_writew(__raw_readw(ARM_CKCTL) & 0x2fff, ARM_CKCTL);
 	else
-		omap_writew(omap_readw(ARM_CKCTL) & 0x0fff, ARM_CKCTL);
+		__raw_writew(__raw_readw(ARM_CKCTL) & 0x0fff, ARM_CKCTL);
 
 	/* Put DSP/MPUI into reset until needed */
-	omap_writew(0, ARM_RSTCT1);
-	omap_writew(1, ARM_RSTCT2);
-	omap_writew(0x400, ARM_IDLECT1);
+	__raw_writew(0, ARM_RSTCT1);
+	__raw_writew(1, ARM_RSTCT2);
+	__raw_writew(0x400, ARM_IDLECT1);
 
 	/*
 	 * According to OMAP5910 Erratum SYS_DMA_1, bit DMACK_REQ (bit 8)
 	 * of the ARM_IDLECT2 register must be set to zero. The power-on
 	 * default value of this bit is one.
 	 */
-	omap_writew(0x0000, ARM_IDLECT2);	/* Turn LCD clock off also */
+	__raw_writew(0x0000, ARM_IDLECT2);	/* Turn LCD clock off also */
 
 	/*
 	 * Only enable those clocks we will need, let the drivers
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 10/59] omap: namespace cleanup to arch/arm/mach-omap1/devices.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 024dab1..45712a5 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -146,7 +146,7 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
 
 		/* Feedback clock must be set on OMAP-1710 MMC2 */
 		if (cpu_is_omap1710())
-			omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24),
+			__raw_writel(__raw_readl(MOD_CONF_CTRL_1) | (1 << 24),
 					MOD_CONF_CTRL_1);
 	}
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 11/59] omap: namespace cleanup to arch/arm/mach-omap1/id.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/id.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 89bb875..dea9431 100644
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -74,8 +74,8 @@ static u16 __init omap_get_jtag_id(void)
 {
 	u32 prod_id, omap_id;
 
-	prod_id = omap_readl(OMAP_PRODUCTION_ID_1);
-	omap_id = omap_readl(OMAP32_ID_1);
+	prod_id = __raw_readl(OMAP_PRODUCTION_ID_1);
+	omap_id = __raw_readl(OMAP32_ID_1);
 
 	/* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */
 	if (((prod_id >> 20) == 0) || (prod_id == omap_id))
@@ -102,7 +102,7 @@ static u8 __init omap_get_die_rev(void)
 {
 	u32 die_rev;
 
-	die_rev = omap_readl(OMAP_DIE_ID_1);
+	die_rev = __raw_readl(OMAP_DIE_ID_1);
 
 	/* Check for broken OMAP_DIE_ID on early 1710 */
 	if (((die_rev >> 12) & 0xffff) == omap_get_jtag_id())
@@ -112,7 +112,7 @@ static u8 __init omap_get_die_rev(void)
 	if (die_rev)
 		return die_rev;
 
-	die_rev = (omap_readl(OMAP32_ID_1) >> 28) & 0xf;
+	die_rev = (__raw_readl(OMAP32_ID_1) >> 28) & 0xf;
 
 	return die_rev;
 }
@@ -127,25 +127,25 @@ void __init omap_check_revision(void)
 
 	jtag_id = omap_get_jtag_id();
 	die_rev = omap_get_die_rev();
-	omap_id = omap_readl(OMAP32_ID_0);
+	omap_id = __raw_readl(OMAP32_ID_0);
 
 #ifdef DEBUG
-	printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
+	printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", __raw_readl(OMAP_DIE_ID_0));
 	printk(KERN_DEBUG "OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
-		omap_readl(OMAP_DIE_ID_1),
-	       (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
+		__raw_readl(OMAP_DIE_ID_1),
+	       (__raw_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
 	printk(KERN_DEBUG "OMAP_PRODUCTION_ID_0: 0x%08x\n",
-		omap_readl(OMAP_PRODUCTION_ID_0));
+		__raw_readl(OMAP_PRODUCTION_ID_0));
 	printk(KERN_DEBUG "OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
-		omap_readl(OMAP_PRODUCTION_ID_1),
-		omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
-	printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
-	printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+		__raw_readl(OMAP_PRODUCTION_ID_1),
+		__raw_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
+	printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", __raw_readl(OMAP32_ID_0));
+	printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", __raw_readl(OMAP32_ID_1));
 	printk(KERN_DEBUG "JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
 #endif
 
-	system_serial_high = omap_readl(OMAP_DIE_ID_0);
-	system_serial_low = omap_readl(OMAP_DIE_ID_1);
+	system_serial_high = __raw_readl(OMAP_DIE_ID_0);
+	system_serial_low = __raw_readl(OMAP_DIE_ID_1);
 
 	/* First check only the major version in a safe way */
 	for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 12/59] omap: namespace cleanup to arch/arm/mach-omap1/io.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/io.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index b3bd8ca..4670435 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -133,8 +133,8 @@ void __init omap1_init_common_hw()
 	/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
 	 * on a Posted Write in the TIPB Bridge".
 	 */
-	omap_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
-	omap_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
+	__raw_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
+	__raw_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
 
 	/* Must init clocks early to assure that timer interrupt works
 	 */
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 13/59] omap: namespace cleanup to arch/arm/mach-omap1/irq.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/irq.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 9ad5197..a606d76 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -62,20 +62,20 @@ static struct omap_irq_bank *irq_banks;
 
 static inline unsigned int irq_bank_readl(int bank, int offset)
 {
-	return omap_readl(irq_banks[bank].base_reg + offset);
+	return __raw_readl(irq_banks[bank].base_reg + offset);
 }
 
 static inline void irq_bank_writel(unsigned long value, int bank, int offset)
 {
-	omap_writel(value, irq_banks[bank].base_reg + offset);
+	__raw_writel(value, irq_banks[bank].base_reg + offset);
 }
 
 static void omap_ack_irq(unsigned int irq)
 {
 	if (irq > 31)
-		omap_writel(0x1, OMAP_IH2_BASE + IRQ_CONTROL_REG_OFFSET);
+		__raw_writel(0x1, OMAP_IH2_BASE + IRQ_CONTROL_REG_OFFSET);
 
-	omap_writel(0x1, OMAP_IH1_BASE + IRQ_CONTROL_REG_OFFSET);
+	__raw_writel(0x1, OMAP_IH1_BASE + IRQ_CONTROL_REG_OFFSET);
 }
 
 static void omap_mask_irq(unsigned int irq)
@@ -83,9 +83,9 @@ static void omap_mask_irq(unsigned int irq)
 	int bank = IRQ_BANK(irq);
 	u32 l;
 
-	l = omap_readl(irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
+	l = __raw_readl(irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 	l |= 1 << IRQ_BIT(irq);
-	omap_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
+	__raw_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 }
 
 static void omap_unmask_irq(unsigned int irq)
@@ -93,9 +93,9 @@ static void omap_unmask_irq(unsigned int irq)
 	int bank = IRQ_BANK(irq);
 	u32 l;
 
-	l = omap_readl(irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
+	l = __raw_readl(irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 	l &= ~(1 << IRQ_BIT(irq));
-	omap_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
+	__raw_writel(l, irq_banks[bank].base_reg + IRQ_MIR_REG_OFFSET);
 }
 
 static void omap_mask_ack_irq(unsigned int irq)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 14/59] omap: namespace cleanup to arch/arm/mach-omap1/mux.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/mux.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 062c905..1e9558b 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -333,7 +333,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 		unsigned	tmp1, tmp2;
 
 		spin_lock_irqsave(&mux_spin_lock, flags);
-		reg_orig = omap_readl(cfg->mux_reg);
+		reg_orig = __raw_readl(cfg->mux_reg);
 
 		/* The mux registers always seem to be 3 bits long */
 		mask = (0x7 << cfg->mask_offset);
@@ -346,7 +346,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 		if (tmp1 != tmp2)
 			warn = 1;
 
-		omap_writel(reg, cfg->mux_reg);
+		__raw_writel(reg, cfg->mux_reg);
 		spin_unlock_irqrestore(&mux_spin_lock, flags);
 	}
 
@@ -354,7 +354,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 	if (!cpu_is_omap15xx()) {
 		if (cfg->pu_pd_reg && cfg->pull_val) {
 			spin_lock_irqsave(&mux_spin_lock, flags);
-			pu_pd_orig = omap_readl(cfg->pu_pd_reg);
+			pu_pd_orig = __raw_readl(cfg->pu_pd_reg);
 			mask = 1 << cfg->pull_bit;
 
 			if (cfg->pu_pd_val) {
@@ -368,7 +368,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 				/* Use pull down */
 				pu_pd = pu_pd_orig & ~mask;
 			}
-			omap_writel(pu_pd, cfg->pu_pd_reg);
+			__raw_writel(pu_pd, cfg->pu_pd_reg);
 			spin_unlock_irqrestore(&mux_spin_lock, flags);
 		}
 	}
@@ -376,7 +376,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 	/* Check for an associated pull down register */
 	if (cfg->pull_reg) {
 		spin_lock_irqsave(&mux_spin_lock, flags);
-		pull_orig = omap_readl(cfg->pull_reg);
+		pull_orig = __raw_readl(cfg->pull_reg);
 		mask = 1 << cfg->pull_bit;
 
 		if (cfg->pull_val) {
@@ -391,7 +391,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 			pull = pull_orig | mask;
 		}
 
-		omap_writel(pull, cfg->pull_reg);
+		__raw_writel(pull, cfg->pull_reg);
 		spin_unlock_irqrestore(&mux_spin_lock, flags);
 	}
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 15/59] omap: namespace cleanup to arch/arm/mach-omap1/pm.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/pm.c |   54 +++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 9774c1f..3876ac2 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -146,21 +146,21 @@ void omap_pm_idle(void)
 	 * Even the sleep block count should become obsolete. */
 	if ((use_idlect1 != ~0) || !do_sleep) {
 
-		__u32 saved_idlect1 = omap_readl(ARM_IDLECT1);
+		__u32 saved_idlect1 = __raw_readl(ARM_IDLECT1);
 		if (cpu_is_omap15xx())
 			use_idlect1 &= OMAP1510_BIG_SLEEP_REQUEST;
 		else
 			use_idlect1 &= OMAP1610_IDLECT1_SLEEP_VAL;
-		omap_writel(use_idlect1, ARM_IDLECT1);
+		__raw_writel(use_idlect1, ARM_IDLECT1);
 		__asm__ volatile ("mcr	p15, 0, r0, c7, c0, 4");
-		omap_writel(saved_idlect1, ARM_IDLECT1);
+		__raw_writel(saved_idlect1, ARM_IDLECT1);
 
 		local_fiq_enable();
 		local_irq_enable();
 		return;
 	}
-	omap_sram_suspend(omap_readl(ARM_IDLECT1),
-			  omap_readl(ARM_IDLECT2));
+	omap_sram_suspend(__raw_readl(ARM_IDLECT1),
+			  __raw_readl(ARM_IDLECT2));
 
 	local_fiq_enable();
 	local_irq_enable();
@@ -192,30 +192,30 @@ static void omap_pm_wakeup_setup(void)
 		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
 			OMAP_IRQ_BIT(INT_1610_IH2_IRQ);
 
-	omap_writel(~level1_wake, OMAP_IH1_MIR);
+	__raw_writel(~level1_wake, OMAP_IH1_MIR);
 
 	if (cpu_is_omap730()) {
-		omap_writel(~level2_wake, OMAP_IH2_0_MIR);
-		omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
+		__raw_writel(~level2_wake, OMAP_IH2_0_MIR);
+		__raw_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
 				OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),
 				OMAP_IH2_1_MIR);
 	} else if (cpu_is_omap15xx()) {
 		level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
-		omap_writel(~level2_wake,  OMAP_IH2_MIR);
+		__raw_writel(~level2_wake,  OMAP_IH2_MIR);
 	} else if (cpu_is_omap16xx()) {
 		level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
-		omap_writel(~level2_wake, OMAP_IH2_0_MIR);
+		__raw_writel(~level2_wake, OMAP_IH2_0_MIR);
 
 		/* INT_1610_WAKE_UP_REQ is needed for GPIO wakeup... */
-		omap_writel(~OMAP_IRQ_BIT(INT_1610_WAKE_UP_REQ),
+		__raw_writel(~OMAP_IRQ_BIT(INT_1610_WAKE_UP_REQ),
 			    OMAP_IH2_1_MIR);
-		omap_writel(~0x0, OMAP_IH2_2_MIR);
-		omap_writel(~0x0, OMAP_IH2_3_MIR);
+		__raw_writel(~0x0, OMAP_IH2_2_MIR);
+		__raw_writel(~0x0, OMAP_IH2_3_MIR);
 	}
 
 	/*  New IRQ agreement, recalculate in cascade order */
-	omap_writel(1, OMAP_IH2_CONTROL);
-	omap_writel(1, OMAP_IH1_CONTROL);
+	__raw_writel(1, OMAP_IH2_CONTROL);
+	__raw_writel(1, OMAP_IH1_CONTROL);
 }
 
 #define EN_DSPCK	13	/* ARM_CKCTL */
@@ -232,7 +232,7 @@ void omap_pm_suspend(void)
 	omap_serial_wake_trigger(1);
 
 	if (!cpu_is_omap15xx())
-		omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
+		__raw_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
 	/*
 	 * Step 1: turn off interrupts (FIXME: NOTE: already disabled)
@@ -302,14 +302,14 @@ void omap_pm_suspend(void)
 	 */
 
 	/* stop DSP */
-	omap_writew(omap_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1);
+	__raw_writew(__raw_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1);
 
 		/* shut down dsp_ck */
 	if (!cpu_is_omap730())
-		omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL);
+		__raw_writew(__raw_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL);
 
 	/* temporarily enabling api_ck to access DSP registers */
-	omap_writew(omap_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2);
+	__raw_writew(__raw_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2);
 
 	/* save DSP registers */
 	DSP_SAVE(DSP_IDLECT2);
@@ -328,8 +328,8 @@ void omap_pm_suspend(void)
 	 */
 
 	/* disable ARM watchdog */
-	omap_writel(0x00F5, OMAP_WDT_TIMER_MODE);
-	omap_writel(0x00A0, OMAP_WDT_TIMER_MODE);
+	__raw_writel(0x00F5, OMAP_WDT_TIMER_MODE);
+	__raw_writel(0x00A0, OMAP_WDT_TIMER_MODE);
 
 	/*
 	 * Step 6b: ARM and Traffic controller shutdown
@@ -363,7 +363,7 @@ void omap_pm_suspend(void)
 	 */
 
 	/* again temporarily enabling api_ck to access DSP registers */
-	omap_writew(omap_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2);
+	__raw_writew(__raw_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2);
 
 	/* Restore DSP domain clocks */
 	DSP_RESTORE(DSP_IDLECT2);
@@ -411,7 +411,7 @@ void omap_pm_suspend(void)
 	}
 
 	if (!cpu_is_omap15xx())
-		omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
+		__raw_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
 
 	/*
 	 * Re-enable interrupts
@@ -693,16 +693,16 @@ static int __init omap_pm_init(void)
 	/* Program new power ramp-up time
 	 * (0 for most boards since we don't lower voltage when in deep sleep)
 	 */
-	omap_writew(ULPD_SETUP_ANALOG_CELL_3_VAL, ULPD_SETUP_ANALOG_CELL_3);
+	__raw_writew(ULPD_SETUP_ANALOG_CELL_3_VAL, ULPD_SETUP_ANALOG_CELL_3);
 
 	/* Setup ULPD POWER_CTRL_REG - enter deep sleep whenever possible */
-	omap_writew(ULPD_POWER_CTRL_REG_VAL, ULPD_POWER_CTRL);
+	__raw_writew(ULPD_POWER_CTRL_REG_VAL, ULPD_POWER_CTRL);
 
 	/* Configure IDLECT3 */
 	if (cpu_is_omap730())
-		omap_writel(OMAP730_IDLECT3_VAL, OMAP730_IDLECT3);
+		__raw_writel(OMAP730_IDLECT3_VAL, OMAP730_IDLECT3);
 	else if (cpu_is_omap16xx())
-		omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
+		__raw_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
 
 	suspend_set_ops(&omap_pm_ops);
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 16/59] omap: namespace cleanup to arch/arm/mach-omap1/timer32k.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap1/timer32k.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
index 705367e..40d9865 100644
--- a/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@ -93,12 +93,12 @@ struct sys_timer omap_timer;
 
 static inline void omap_32k_timer_write(int val, int reg)
 {
-	omap_writew(val, OMAP1_32K_TIMER_BASE + reg);
+	__raw_writew(val, OMAP1_32K_TIMER_BASE + reg);
 }
 
 static inline unsigned long omap_32k_timer_read(int reg)
 {
-	return omap_readl(OMAP1_32K_TIMER_BASE + reg) & 0xffffff;
+	return __raw_readl(OMAP1_32K_TIMER_BASE + reg) & 0xffffff;
 }
 
 static inline void omap_32k_timer_start(unsigned long load_val)
@@ -156,7 +156,7 @@ static struct clock_event_device clockevent_32k_timer = {
  */
 static inline unsigned long omap_32k_sync_timer_read(void)
 {
-	return omap_readl(TIMER_32K_SYNCHRONIZED);
+	return __raw_readl(TIMER_32K_SYNCHRONIZED);
 }
 
 static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 17/59] omap: namespace cleanup to arch/arm/mach-omap2/pm-debug.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/pm-debug.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 0b5c044..9607c3c 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -68,7 +68,7 @@ static void serial_wait_tx(void)
 
 u32 omap2_read_32k_sync_counter(void)
 {
-        return omap_readl(OMAP2_32KSYNCT_BASE + 0x0010);
+        return __raw_readl(OMAP2_32KSYNCT_BASE + 0x0010);
 }
 
 void serial_console_fclk_mask(u32 *f1, u32 *f2)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 18/59] omap: namespace cleanup to arch/arm/mach-omap2/pm24xx.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/pm24xx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 60ff04f..3632aa1 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -300,12 +300,12 @@ static int omap2_pm_suspend(void)
 	prm_write_mod_reg(wken_wkup & ~OMAP24XX_EN_GPT1, WKUP_MOD, PM_WKEN);
 
 	/* Mask GPT1 */
-	mir1 = omap_readl(0x480fe0a4);
-	omap_writel(1 << 5, 0x480fe0ac);
+	mir1 = __raw_readl(0x480fe0a4);
+	__raw_writel(1 << 5, 0x480fe0ac);
 
 	omap2_enter_full_retention();
 
-	omap_writel(mir1, 0x480fe0a4);
+	__raw_writel(mir1, 0x480fe0a4);
 	prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN);
 
 	return 0;
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 19/59] omap: namespace cleanup to arch/arm/plat-omap/common.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 8c53125..3086705 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -207,7 +207,7 @@ console_initcall(omap_add_serial_console);
 
 static cycle_t omap_32k_read(void)
 {
-	return omap_readl(TIMER_32K_SYNCHRONIZED);
+	return __raw_readl(TIMER_32K_SYNCHRONIZED);
 }
 
 static struct clocksource clocksource_32k = {
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 20/59] omap: namespace cleanup to arch/arm/plat-omap/dma.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/dma.c |   86 +++++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c4e5ba3..8a67a45 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -177,7 +177,7 @@ static inline int get_gdma_dev(int req)
 	u32 reg = OMAP_FUNC_MUX_ARM_BASE + ((req - 1) / 5) * 4;
 	int shift = ((req - 1) % 5) * 6;
 
-	return ((omap_readl(reg) >> shift) & 0x3f) + 1;
+	return ((__raw_readl(reg) >> shift) & 0x3f) + 1;
 }
 
 static inline void set_gdma_dev(int req, int dev)
@@ -186,10 +186,10 @@ static inline void set_gdma_dev(int req, int dev)
 	int shift = ((req - 1) % 5) * 6;
 	u32 l;
 
-	l = omap_readl(reg);
+	l = __raw_readl(reg);
 	l &= ~(0x3f << shift);
 	l |= (dev - 1) << shift;
-	omap_writel(l, reg);
+	__raw_writel(l, reg);
 }
 #else
 #define set_gdma_dev(req, dev)	do {} while (0)
@@ -228,10 +228,10 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
 			BUG();
 			return;
 		}
-		l = omap_readl(reg);
+		l = __raw_readl(reg);
 		l &= ~(0xf << 8);
 		l |= (priority & 0xf) << 8;
-		omap_writel(l, reg);
+		__raw_writel(l, reg);
 	}
 
 	if (cpu_class_is_omap2()) {
@@ -1086,7 +1086,7 @@ int omap_dma_running(void)
 
 	/* Check if LCD DMA is running */
 	if (cpu_is_omap16xx())
-		if (omap_readw(OMAP1610_DMA_LCD_CCR) & OMAP_DMA_CCR_EN)
+		if (__raw_readw(OMAP1610_DMA_LCD_CCR) & OMAP_DMA_CCR_EN)
 			return 1;
 
 	for (lch = 0; lch < dma_chan_count; lch++)
@@ -2126,63 +2126,63 @@ static void set_b1_regs(void)
 	}
 
 	if (omap_dma_in_1510_mode()) {
-		omap_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U);
-		omap_writew(top, OMAP1510_DMA_LCD_TOP_F1_L);
-		omap_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U);
-		omap_writew(bottom, OMAP1510_DMA_LCD_BOT_F1_L);
+		__raw_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U);
+		__raw_writew(top, OMAP1510_DMA_LCD_TOP_F1_L);
+		__raw_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U);
+		__raw_writew(bottom, OMAP1510_DMA_LCD_BOT_F1_L);
 
 		return;
 	}
 
 	/* 1610 regs */
-	omap_writew(top >> 16, OMAP1610_DMA_LCD_TOP_B1_U);
-	omap_writew(top, OMAP1610_DMA_LCD_TOP_B1_L);
-	omap_writew(bottom >> 16, OMAP1610_DMA_LCD_BOT_B1_U);
-	omap_writew(bottom, OMAP1610_DMA_LCD_BOT_B1_L);
+	__raw_writew(top >> 16, OMAP1610_DMA_LCD_TOP_B1_U);
+	__raw_writew(top, OMAP1610_DMA_LCD_TOP_B1_L);
+	__raw_writew(bottom >> 16, OMAP1610_DMA_LCD_BOT_B1_U);
+	__raw_writew(bottom, OMAP1610_DMA_LCD_BOT_B1_L);
 
-	omap_writew(en, OMAP1610_DMA_LCD_SRC_EN_B1);
-	omap_writew(fn, OMAP1610_DMA_LCD_SRC_FN_B1);
+	__raw_writew(en, OMAP1610_DMA_LCD_SRC_EN_B1);
+	__raw_writew(fn, OMAP1610_DMA_LCD_SRC_FN_B1);
 
-	w = omap_readw(OMAP1610_DMA_LCD_CSDP);
+	w = __raw_readw(OMAP1610_DMA_LCD_CSDP);
 	w &= ~0x03;
 	w |= lcd_dma.data_type;
-	omap_writew(w, OMAP1610_DMA_LCD_CSDP);
+	__raw_writew(w, OMAP1610_DMA_LCD_CSDP);
 
-	w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+	w = __raw_readw(OMAP1610_DMA_LCD_CTRL);
 	/* Always set the source port as SDRAM for now*/
 	w &= ~(0x03 << 6);
 	if (lcd_dma.callback != NULL)
 		w |= 1 << 1;		/* Block interrupt enable */
 	else
 		w &= ~(1 << 1);
-	omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+	__raw_writew(w, OMAP1610_DMA_LCD_CTRL);
 
 	if (!(lcd_dma.rotate || lcd_dma.mirror ||
 	      lcd_dma.vxres || lcd_dma.xscale || lcd_dma.yscale))
 		return;
 
-	w = omap_readw(OMAP1610_DMA_LCD_CCR);
+	w = __raw_readw(OMAP1610_DMA_LCD_CCR);
 	/* Set the double-indexed addressing mode */
 	w |= (0x03 << 12);
-	omap_writew(w, OMAP1610_DMA_LCD_CCR);
+	__raw_writew(w, OMAP1610_DMA_LCD_CCR);
 
-	omap_writew(ei, OMAP1610_DMA_LCD_SRC_EI_B1);
-	omap_writew(fi >> 16, OMAP1610_DMA_LCD_SRC_FI_B1_U);
-	omap_writew(fi, OMAP1610_DMA_LCD_SRC_FI_B1_L);
+	__raw_writew(ei, OMAP1610_DMA_LCD_SRC_EI_B1);
+	__raw_writew(fi >> 16, OMAP1610_DMA_LCD_SRC_FI_B1_U);
+	__raw_writew(fi, OMAP1610_DMA_LCD_SRC_FI_B1_L);
 }
 
 static irqreturn_t lcd_dma_irq_handler(int irq, void *dev_id)
 {
 	u16 w;
 
-	w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+	w = __raw_readw(OMAP1610_DMA_LCD_CTRL);
 	if (unlikely(!(w & (1 << 3)))) {
 		printk(KERN_WARNING "Spurious LCD DMA IRQ\n");
 		return IRQ_NONE;
 	}
 	/* Ack the IRQ */
 	w |= (1 << 3);
-	omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+	__raw_writew(w, OMAP1610_DMA_LCD_CTRL);
 	lcd_dma.active = 0;
 	if (lcd_dma.callback != NULL)
 		lcd_dma.callback(w, lcd_dma.cb_data);
@@ -2228,7 +2228,7 @@ void omap_free_lcd_dma(void)
 		return;
 	}
 	if (!enable_1510_mode)
-		omap_writew(omap_readw(OMAP1610_DMA_LCD_CCR) & ~1,
+		__raw_writew(__raw_readw(OMAP1610_DMA_LCD_CCR) & ~1,
 			    OMAP1610_DMA_LCD_CCR);
 	lcd_dma.reserved = 0;
 	spin_unlock(&lcd_dma.lock);
@@ -2247,15 +2247,15 @@ void omap_enable_lcd_dma(void)
 	if (enable_1510_mode || !lcd_dma.ext_ctrl)
 		return;
 
-	w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+	w = __raw_readw(OMAP1610_DMA_LCD_CTRL);
 	w |= 1 << 8;
-	omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+	__raw_writew(w, OMAP1610_DMA_LCD_CTRL);
 
 	lcd_dma.active = 1;
 
-	w = omap_readw(OMAP1610_DMA_LCD_CCR);
+	w = __raw_readw(OMAP1610_DMA_LCD_CCR);
 	w |= 1 << 7;
-	omap_writew(w, OMAP1610_DMA_LCD_CCR);
+	__raw_writew(w, OMAP1610_DMA_LCD_CCR);
 }
 EXPORT_SYMBOL(omap_enable_lcd_dma);
 
@@ -2264,15 +2264,15 @@ void omap_setup_lcd_dma(void)
 	BUG_ON(lcd_dma.active);
 	if (!enable_1510_mode) {
 		/* Set some reasonable defaults */
-		omap_writew(0x5440, OMAP1610_DMA_LCD_CCR);
-		omap_writew(0x9102, OMAP1610_DMA_LCD_CSDP);
-		omap_writew(0x0004, OMAP1610_DMA_LCD_LCH_CTRL);
+		__raw_writew(0x5440, OMAP1610_DMA_LCD_CCR);
+		__raw_writew(0x9102, OMAP1610_DMA_LCD_CSDP);
+		__raw_writew(0x0004, OMAP1610_DMA_LCD_LCH_CTRL);
 	}
 	set_b1_regs();
 	if (!enable_1510_mode) {
 		u16 w;
 
-		w = omap_readw(OMAP1610_DMA_LCD_CCR);
+		w = __raw_readw(OMAP1610_DMA_LCD_CCR);
 		/*
 		 * If DMA was already active set the end_prog bit to have
 		 * the programmed register set loaded into the active
@@ -2281,7 +2281,7 @@ void omap_setup_lcd_dma(void)
 		w |= 1 << 11;		/* End_prog */
 		if (!lcd_dma.single_transfer)
 			w |= (3 << 8);	/* Auto_init, repeat */
-		omap_writew(w, OMAP1610_DMA_LCD_CCR);
+		__raw_writew(w, OMAP1610_DMA_LCD_CCR);
 	}
 }
 EXPORT_SYMBOL(omap_setup_lcd_dma);
@@ -2294,13 +2294,13 @@ void omap_stop_lcd_dma(void)
 	if (enable_1510_mode || !lcd_dma.ext_ctrl)
 		return;
 
-	w = omap_readw(OMAP1610_DMA_LCD_CCR);
+	w = __raw_readw(OMAP1610_DMA_LCD_CCR);
 	w &= ~(1 << 7);
-	omap_writew(w, OMAP1610_DMA_LCD_CCR);
+	__raw_writew(w, OMAP1610_DMA_LCD_CCR);
 
-	w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+	w = __raw_readw(OMAP1610_DMA_LCD_CTRL);
 	w &= ~(1 << 8);
-	omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+	__raw_writew(w, OMAP1610_DMA_LCD_CTRL);
 }
 EXPORT_SYMBOL(omap_stop_lcd_dma);
 
@@ -2366,9 +2366,9 @@ static int __init omap_init_dma(void)
 			u16 w;
 
 			/* this would prevent OMAP sleep */
-			w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+			w = __raw_readw(OMAP1610_DMA_LCD_CTRL);
 			w &= ~(1 << 8);
-			omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+			__raw_writew(w, OMAP1610_DMA_LCD_CTRL);
 		}
 	} else if (cpu_class_is_omap2()) {
 		u8 revision = dma_read(REVISION) & 0xff;
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 21/59] omap: namespace cleanup to arch/arm/plat-omap/dmtimer.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/dmtimer.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 844043a..62d1d19 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -443,7 +443,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 
 		l = omap_dm_timer_read_reg(&dm_timers[i], OMAP_TIMER_CTRL_REG);
 		if (l & OMAP_TIMER_CTRL_ST) {
-			if (((omap_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0)
+			if (((__raw_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0)
 				inputmask &= ~(1 << 1);
 			else
 				inputmask &= ~(1 << 2);
@@ -503,9 +503,9 @@ void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 	int n = (timer - dm_timers) << 1;
 	u32 l;
 
-	l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
+	l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
 	l |= source << n;
-	omap_writel(l, MOD_CONF_CTRL_1);
+	__raw_writel(l, MOD_CONF_CTRL_1);
 }
 
 #else
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 22/59] omap: namespace cleanup to arch/arm/plat-omap/gpio.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/gpio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 8bb4542..4c1f68e 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1528,13 +1528,13 @@ static int __init _omap_gpio_init(void)
 	/* Enable system clock for GPIO module.
 	 * The CAM_CLK_CTRL *is* really the right place. */
 	if (cpu_is_omap16xx())
-		omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04, ULPD_CAM_CLK_CTRL);
+		__raw_writel(__raw_readl(ULPD_CAM_CLK_CTRL) | 0x04, ULPD_CAM_CLK_CTRL);
 
 	/* Enable autoidle for the OCP interface */
 	if (cpu_is_omap24xx())
-		omap_writel(1 << 0, 0x48019010);
+		__raw_writel(1 << 0, 0x48019010);
 	if (cpu_is_omap34xx())
-		omap_writel(1 << 0, 0x48306814);
+		__raw_writel(1 << 0, 0x48306814);
 
 	return 0;
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 23/59] omap: namespace cleanup to arch/arm/plat-omap/ocpi.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/ocpi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index ebe0c73..b0578d3 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -62,14 +62,14 @@ int ocpi_enable(void)
 		return -ENODEV;
 
 	/* Enable access for OHCI in OCPI */
-	val = omap_readl(OCPI_PROT);
+	val = __raw_readl(OCPI_PROT);
 	val &= ~0xff;
 	//val &= (1 << 0);	/* Allow access only to EMIFS */
-	omap_writel(val, OCPI_PROT);
+	__raw_writel(val, OCPI_PROT);
 
-	val = omap_readl(OCPI_SEC);
+	val = __raw_readl(OCPI_SEC);
 	val &= ~0xff;
-	omap_writel(val, OCPI_SEC);
+	__raw_writel(val, OCPI_SEC);
 
 	return 0;
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 24/59] omap: namespace cleanup to arch/arm/plat-omap/usb.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/usb.c |   82 +++++++++++++++++++++++-----------------------
 1 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 67ca1e2..d7fc013 100644
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -159,9 +159,9 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 			u32 l;
 
 			/* pulldown D+/D- */
-			l = omap_readl(USB_TRANSCEIVER_CTRL);
+			l = __raw_readl(USB_TRANSCEIVER_CTRL);
 			l &= ~(3 << 1);
-			omap_writel(l, USB_TRANSCEIVER_CTRL);
+			__raw_writel(l, USB_TRANSCEIVER_CTRL);
 		}
 		return 0;
 	}
@@ -191,11 +191,11 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 		 *  - OTG support on this port not yet written
 		 */
 
-		l = omap_readl(USB_TRANSCEIVER_CTRL);
+		l = __raw_readl(USB_TRANSCEIVER_CTRL);
 		l &= ~(7 << 4);
 		if (!is_device)
 			l |= (3 << 1);
-		omap_writel(l, USB_TRANSCEIVER_CTRL);
+		__raw_writel(l, USB_TRANSCEIVER_CTRL);
 
 		return 3 << 16;
 	}
@@ -228,9 +228,9 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 	if (cpu_class_is_omap1() && nwires != 6) {
 		u32 l;
 
-		l = omap_readl(USB_TRANSCEIVER_CTRL);
+		l = __raw_readl(USB_TRANSCEIVER_CTRL);
 		l &= ~CONF_USB2_UNI_R;
-		omap_writel(l, USB_TRANSCEIVER_CTRL);
+		__raw_writel(l, USB_TRANSCEIVER_CTRL);
 	}
 
 	switch (nwires) {
@@ -255,9 +255,9 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 
 			omap_cfg_reg(AA9_USB0_VP);
 			omap_cfg_reg(R9_USB0_VM);
-			l = omap_readl(USB_TRANSCEIVER_CTRL);
+			l = __raw_readl(USB_TRANSCEIVER_CTRL);
 			l |= CONF_USB2_UNI_R;
-			omap_writel(l, USB_TRANSCEIVER_CTRL);
+			__raw_writel(l, USB_TRANSCEIVER_CTRL);
 		}
 		break;
 	default:
@@ -274,9 +274,9 @@ static u32 __init omap_usb1_init(unsigned nwires)
 	if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) {
 		u32 l;
 
-		l = omap_readl(USB_TRANSCEIVER_CTRL);
+		l = __raw_readl(USB_TRANSCEIVER_CTRL);
 		l &= ~CONF_USB1_UNI_R;
-		omap_writel(l, USB_TRANSCEIVER_CTRL);
+		__raw_writel(l, USB_TRANSCEIVER_CTRL);
 	}
 	if (cpu_is_omap24xx())
 		omap2_usb_devconf_clear(1, USB_BIDIR_TLL);
@@ -341,9 +341,9 @@ static u32 __init omap_usb1_init(unsigned nwires)
 		if (!cpu_is_omap15xx()) {
 			u32 l;
 
-			l = omap_readl(USB_TRANSCEIVER_CTRL);
+			l = __raw_readl(USB_TRANSCEIVER_CTRL);
 			l |= CONF_USB1_UNI_R;
-			omap_writel(l, USB_TRANSCEIVER_CTRL);
+			__raw_writel(l, USB_TRANSCEIVER_CTRL);
 		}
 		break;
 	default:
@@ -370,9 +370,9 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup)
 	if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) {
 		u32 l;
 
-		l = omap_readl(USB_TRANSCEIVER_CTRL);
+		l = __raw_readl(USB_TRANSCEIVER_CTRL);
 		l &= ~CONF_USB2_UNI_R;
-		omap_writel(l, USB_TRANSCEIVER_CTRL);
+		__raw_writel(l, USB_TRANSCEIVER_CTRL);
 	}
 
 	/* external transceiver */
@@ -446,9 +446,9 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup)
 
 			omap_cfg_reg(AA9_USB2_VP);
 			omap_cfg_reg(R9_USB2_VM);
-			l = omap_readl(USB_TRANSCEIVER_CTRL);
+			l = __raw_readl(USB_TRANSCEIVER_CTRL);
 			l |= CONF_USB2_UNI_R;
-			omap_writel(l, USB_TRANSCEIVER_CTRL);
+			__raw_writel(l, USB_TRANSCEIVER_CTRL);
 		}
 		break;
 	default:
@@ -588,11 +588,11 @@ omap_otg_init(struct omap_usb_config *config)
 
 	/* NOTE:  no bus or clock setup (yet?) */
 
-	syscon = omap_readl(OTG_SYSCON_1) & 0xffff;
+	syscon = __raw_readl(OTG_SYSCON_1) & 0xffff;
 	if (!(syscon & OTG_RESET_DONE))
 		pr_debug("USB resets not complete?\n");
 
-	//omap_writew(0, OTG_IRQ_EN);
+	//__raw_writew(0, OTG_IRQ_EN);
 
 	/* pin muxing and transceiver pinouts */
 	if (config->pins[0] > 2)	/* alt pingroup 2 */
@@ -600,8 +600,8 @@ omap_otg_init(struct omap_usb_config *config)
 	syscon |= omap_usb0_init(config->pins[0], is_usb0_device(config));
 	syscon |= omap_usb1_init(config->pins[1]);
 	syscon |= omap_usb2_init(config->pins[2], alt_pingroup);
-	pr_debug("OTG_SYSCON_1 = %08x\n", omap_readl(OTG_SYSCON_1));
-	omap_writel(syscon, OTG_SYSCON_1);
+	pr_debug("OTG_SYSCON_1 = %08x\n", __raw_readl(OTG_SYSCON_1));
+	__raw_writel(syscon, OTG_SYSCON_1);
 
 	syscon = config->hmc_mode;
 	syscon |= USBX_SYNCHRO | (4 << 16) /* B_ASE0_BRST */;
@@ -611,9 +611,9 @@ omap_otg_init(struct omap_usb_config *config)
 #endif
 	if (cpu_class_is_omap1())
 		pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
-			 omap_readl(USB_TRANSCEIVER_CTRL));
-	pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));
-	omap_writel(syscon, OTG_SYSCON_2);
+			 __raw_readl(USB_TRANSCEIVER_CTRL));
+	pr_debug("OTG_SYSCON_2 = %08x\n", __raw_readl(OTG_SYSCON_2));
+	__raw_writel(syscon, OTG_SYSCON_2);
 
 	printk("USB: hmc %d", config->hmc_mode);
 	if (!alt_pingroup)
@@ -633,16 +633,16 @@ omap_otg_init(struct omap_usb_config *config)
 		u16 w;
 
 		/* leave USB clocks/controllers off until needed */
-		w = omap_readw(ULPD_SOFT_REQ);
+		w = __raw_readw(ULPD_SOFT_REQ);
 		w &= ~SOFT_USB_CLK_REQ;
-		omap_writew(w, ULPD_SOFT_REQ);
+		__raw_writew(w, ULPD_SOFT_REQ);
 
-		w = omap_readw(ULPD_CLOCK_CTRL);
+		w = __raw_readw(ULPD_CLOCK_CTRL);
 		w &= ~USB_MCLK_EN;
 		w |= DIS_USB_PVCI_CLK;
-		omap_writew(w, ULPD_CLOCK_CTRL);
+		__raw_writew(w, ULPD_CLOCK_CTRL);
 	}
-	syscon = omap_readl(OTG_SYSCON_1);
+	syscon = __raw_readl(OTG_SYSCON_1);
 	syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;
 
 #ifdef	CONFIG_USB_GADGET_OMAP
@@ -679,8 +679,8 @@ omap_otg_init(struct omap_usb_config *config)
 			pr_debug("can't register OTG device, %d\n", status);
 	}
 #endif
-	pr_debug("OTG_SYSCON_1 = %08x\n", omap_readl(OTG_SYSCON_1));
-	omap_writel(syscon, OTG_SYSCON_1);
+	pr_debug("OTG_SYSCON_1 = %08x\n", __raw_readl(OTG_SYSCON_1));
+	__raw_writel(syscon, OTG_SYSCON_1);
 
 	status = 0;
 }
@@ -711,9 +711,9 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
 	omap_usb1_init(config->pins[1]);
 	omap_usb2_init(config->pins[2], 0);
 
-	val = omap_readl(MOD_CONF_CTRL_0) & ~(0x3f << 1);
+	val = __raw_readl(MOD_CONF_CTRL_0) & ~(0x3f << 1);
 	val |= (config->hmc_mode << 1);
-	omap_writel(val, MOD_CONF_CTRL_0);
+	__raw_writel(val, MOD_CONF_CTRL_0);
 
 	printk("USB: hmc %d", config->hmc_mode);
 	if (config->pins[0])
@@ -726,22 +726,22 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
 	printk("\n");
 
 	/* use DPLL for 48 MHz function clock */
-	pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),
-			omap_readw(ULPD_DPLL_CTRL), omap_readw(ULPD_SOFT_REQ));
+	pr_debug("APLL %04x DPLL %04x REQ %04x\n", __raw_readw(ULPD_APLL_CTRL),
+			__raw_readw(ULPD_DPLL_CTRL), __raw_readw(ULPD_SOFT_REQ));
 
-	w = omap_readw(ULPD_APLL_CTRL);
+	w = __raw_readw(ULPD_APLL_CTRL);
 	w &= ~APLL_NDPLL_SWITCH;
-	omap_writew(w, ULPD_APLL_CTRL);
+	__raw_writew(w, ULPD_APLL_CTRL);
 
-	w = omap_readw(ULPD_DPLL_CTRL);
+	w = __raw_readw(ULPD_DPLL_CTRL);
 	w |= DPLL_IOB | DPLL_PLL_ENABLE;
-	omap_writew(w, ULPD_DPLL_CTRL);
+	__raw_writew(w, ULPD_DPLL_CTRL);
 
-	w = omap_readw(ULPD_SOFT_REQ);
+	w = __raw_readw(ULPD_SOFT_REQ);
 	w |= SOFT_UDC_REQ | SOFT_DPLL_REQ;
-	omap_writew(w, ULPD_SOFT_REQ);
+	__raw_writew(w, ULPD_SOFT_REQ);
 
-	while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))
+	while (!(__raw_readw(ULPD_DPLL_CTRL) & DPLL_LOCK))
 		cpu_relax();
 
 #ifdef	CONFIG_USB_GADGET_OMAP
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 25/59] omap: namespace cleanup to drivers/cbus/tahvo-usb.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/cbus/tahvo-usb.c |   70 +++++++++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index d8ad836..8ee066d 100644
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -118,27 +118,27 @@ static irqreturn_t omap_otg_irq(int irq, void *arg)
 	struct tahvo_usb *tu = (struct tahvo_usb *) otg_dev->dev.driver_data;
 	u16 otg_irq;
 
-	otg_irq = omap_readw(OTG_IRQ_SRC);
+	otg_irq = __raw_readw(OTG_IRQ_SRC);
 	if (otg_irq & OPRT_CHG) {
-		omap_writew(OPRT_CHG, OTG_IRQ_SRC);
+		__raw_writew(OPRT_CHG, OTG_IRQ_SRC);
 	} else if (otg_irq & B_SRP_TMROUT) {
-		omap_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
+		__raw_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
 	} else if (otg_irq & B_HNP_FAIL) {
-		omap_writew(B_HNP_FAIL, OTG_IRQ_SRC);
+		__raw_writew(B_HNP_FAIL, OTG_IRQ_SRC);
 	} else if (otg_irq & A_SRP_DETECT) {
-		omap_writew(A_SRP_DETECT, OTG_IRQ_SRC);
+		__raw_writew(A_SRP_DETECT, OTG_IRQ_SRC);
 	} else if (otg_irq & A_REQ_TMROUT) {
-		omap_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
+		__raw_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
 	} else if (otg_irq & A_VBUS_ERR) {
-		omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
+		__raw_writew(A_VBUS_ERR, OTG_IRQ_SRC);
 	} else if (otg_irq & DRIVER_SWITCH) {
-		if ((!(omap_readl(OTG_CTRL) & OTG_DRIVER_SEL)) &&
+		if ((!(__raw_readl(OTG_CTRL) & OTG_DRIVER_SEL)) &&
 		   tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
 			/* role is host */
 			usb_bus_start_enum(tu->otg.host,
 					   tu->otg.host->otg_port);
 		}
-		omap_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
+		__raw_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
 	} else
 		return IRQ_NONE;
 
@@ -157,13 +157,13 @@ static int omap_otg_init(void)
 	}
 #endif
 
-	l = omap_readl(OTG_SYSCON_1);
+	l = __raw_readl(OTG_SYSCON_1);
 	l &= ~OTG_IDLE_EN;
-	omap_writel(l, OTG_SYSCON_1);
+	__raw_writel(l, OTG_SYSCON_1);
 	udelay(100);
 
 	/* some of these values are board-specific... */
-	l = omap_readl(OTG_SYSCON_2);
+	l = __raw_readl(OTG_SYSCON_2);
 	l |= OTG_EN
 		/* for B-device: */
 		| SRP_GPDATA		/* 9msec Bdev D+ pulse */
@@ -173,15 +173,15 @@ static int omap_otg_init(void)
 		| (0 << 20)		/* 200ms nominal A_WAIT_VRISE timer */
 		| SRP_DPW		/* detect 167+ns SRP pulses */
 		| SRP_DATA | SRP_VBUS;	/* accept both kinds of SRP pulse */
-	omap_writel(l, OTG_SYSCON_2);
+	__raw_writel(l, OTG_SYSCON_2);
 
-	omap_writew(DRIVER_SWITCH | OPRT_CHG
+	__raw_writew(DRIVER_SWITCH | OPRT_CHG
 			| B_SRP_TMROUT | B_HNP_FAIL
 				  | A_VBUS_ERR | A_SRP_DETECT | A_REQ_TMROUT,
 					OTG_IRQ_EN);
-	l = omap_readl(OTG_SYSCON_2);
+	l = __raw_readl(OTG_SYSCON_2);
 	l |= OTG_EN;
-	omap_writel(l, OTG_SYSCON_2);
+	__raw_writel(l, OTG_SYSCON_2);
 
 	return 0;
 }
@@ -291,10 +291,10 @@ static void check_vbus_state(struct tahvo_usb *tu)
 				usb_gadget_vbus_connect(tu->otg.gadget);
 			/* Set B-session valid and not B-sessio ended to indicate
 			 * Vbus to be ok. */
-			l = omap_readl(OTG_CTRL);
+			l = __raw_readl(OTG_CTRL);
 			l &= ~OTG_BSESSEND;
 			l |= OTG_BSESSVLD;
-			omap_writel(l, OTG_CTRL);
+			__raw_writel(l, OTG_CTRL);
 
 			tu->otg.state = OTG_STATE_B_PERIPHERAL;
 			break;
@@ -338,10 +338,10 @@ static void tahvo_usb_become_host(struct tahvo_usb *tu)
 	 * also mark the A-session is always valid */
 	omap_otg_init();
 
-	l = omap_readl(OTG_CTRL);
+	l = __raw_readl(OTG_CTRL);
 	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK);
 	l |= OTG_ASESSVLD;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	/* Power up the transceiver in USB host mode */
 	tahvo_write_reg(TAHVO_REG_USBR, USBR_REGOUT | USBR_NSUSPEND |
@@ -365,10 +365,10 @@ static void tahvo_usb_become_peripheral(struct tahvo_usb *tu)
 	 * and enable ID to mark peripheral mode and
 	 * BSESSEND to mark no Vbus */
 	omap_otg_init();
-	l = omap_readl(OTG_CTRL);
+	l = __raw_readl(OTG_CTRL);
 	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK | OTG_BSESSVLD);
 	l |= OTG_ID | OTG_BSESSEND;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	/* Power up transceiver and set it in USB perhiperal mode */
 	tahvo_write_reg(TAHVO_REG_USBR, USBR_SLAVE_CONTROL | USBR_REGOUT | USBR_NSUSPEND | USBR_SLAVE_SW);
@@ -381,10 +381,10 @@ static void tahvo_usb_stop_peripheral(struct tahvo_usb *tu)
 {
 	u32 l;
 
-	l = omap_readl(OTG_CTRL);
+	l = __raw_readl(OTG_CTRL);
 	l &= ~OTG_BSESSVLD;
 	l |= OTG_BSESSEND;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	if (tu->otg.gadget)
 		usb_gadget_vbus_disconnect(tu->otg.gadget);
@@ -408,19 +408,19 @@ static void tahvo_usb_power_off(struct tahvo_usb *tu)
 		id = OTG_ID;
 	else
 		id = 0;
-	l = omap_readl(OTG_CTRL);
+	l = __raw_readl(OTG_CTRL);
 	l &= ~(OTG_CTRL_XCVR_MASK | OTG_CTRL_SYS_MASK | OTG_BSESSVLD);
 	l |= id | OTG_BSESSEND;
-	omap_writel(l, OTG_CTRL);
-	omap_writew(0, OTG_IRQ_EN);
+	__raw_writel(l, OTG_CTRL);
+	__raw_writew(0, OTG_IRQ_EN);
 
-	l = omap_readl(OTG_SYSCON_2);
+	l = __raw_readl(OTG_SYSCON_2);
 	l &= ~OTG_EN;
-	omap_writel(l, OTG_SYSCON_2);
+	__raw_writel(l, OTG_SYSCON_2);
 
-	l = omap_readl(OTG_SYSCON_1);
+	l = __raw_readl(OTG_SYSCON_1);
 	l |= OTG_IDLE_EN;
-	omap_writel(l, OTG_SYSCON_1);
+	__raw_writel(l, OTG_SYSCON_1);
 
 	/* Power off transceiver */
 	tahvo_write_reg(TAHVO_REG_USBR, 0);
@@ -467,13 +467,13 @@ static int tahvo_usb_start_srp(struct otg_transceiver *dev)
 	if (!dev || tu->otg.state != OTG_STATE_B_IDLE)
 		return -ENODEV;
 
-	otg_ctrl = omap_readl(OTG_CTRL);
+	otg_ctrl = __raw_readl(OTG_CTRL);
 	if (!(otg_ctrl & OTG_BSESSEND))
 		return -EINVAL;
 
 	otg_ctrl |= OTG_B_BUSREQ;
 	otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_SYS_MASK;
-	omap_writel(otg_ctrl, OTG_CTRL);
+	__raw_writel(otg_ctrl, OTG_CTRL);
 	tu->otg.state = OTG_STATE_B_SRP_INIT;
 
 	return 0;
@@ -512,9 +512,9 @@ static int tahvo_usb_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 		return 0;
 	}
 
-	l = omap_readl(OTG_SYSCON_1);
+	l = __raw_readl(OTG_SYSCON_1);
 	l &= ~(OTG_IDLE_EN | HST_IDLE_EN | DEV_IDLE_EN);
-	omap_writel(l, OTG_SYSCON_1);
+	__raw_writel(l, OTG_SYSCON_1);
 
 	if (TAHVO_MODE(tu) == TAHVO_MODE_HOST) {
 		tu->otg.host = NULL;
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 26/59] omap: namespace cleanup to drivers/dsp/dspgateway/dsp.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/dspgateway/dsp.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/dsp/dspgateway/dsp.h b/drivers/dsp/dspgateway/dsp.h
index 84e7cea..f27c344 100644
--- a/drivers/dsp/dspgateway/dsp.h
+++ b/drivers/dsp/dspgateway/dsp.h
@@ -259,15 +259,15 @@ extern struct omap_mmu dsp_mmu;
 #define DSPSPACE_SIZE	0x1000000
 
 #define omap_set_bit_regw(b,r) \
-	do { omap_writew(omap_readw(r) | (b), (r)); } while(0)
+	do { __raw_writew(__raw_readw(r) | (b), (r)); } while(0)
 #define omap_clr_bit_regw(b,r) \
-	do { omap_writew(omap_readw(r) & ~(b), (r)); } while(0)
+	do { __raw_writew(__raw_readw(r) & ~(b), (r)); } while(0)
 #define omap_set_bit_regl(b,r) \
-	do { omap_writel(omap_readl(r) | (b), (r)); } while(0)
+	do { __raw_writel(__raw_readl(r) | (b), (r)); } while(0)
 #define omap_clr_bit_regl(b,r) \
-	do { omap_writel(omap_readl(r) & ~(b), (r)); } while(0)
+	do { __raw_writel(__raw_readl(r) & ~(b), (r)); } while(0)
 #define omap_set_bits_regl(val,mask,r) \
-	do { omap_writel((omap_readl(r) & ~(mask)) | (val), (r)); } while(0)
+	do { __raw_writel((__raw_readl(r) & ~(mask)) | (val), (r)); } while(0)
 
 #define dspword_to_virt(dw)	((void *)(dspmem_base + ((dw) << 1)))
 #define dspbyte_to_virt(db)	((void *)(dspmem_base + (db)))
@@ -307,7 +307,7 @@ extern struct omap_mmu dsp_mmu;
  */
 #define tc_wordswap() \
 	do { \
-		omap_writel(TC_ENDIANISM_SWAP_WORD | TC_ENDIANISM_EN, \
+		__raw_writel(TC_ENDIANISM_SWAP_WORD | TC_ENDIANISM_EN, \
 			    TC_ENDIANISM); \
 	} while(0)
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 27/59] omap: namespace cleanup to drivers/dsp/dspgateway/dsp_common.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/dspgateway/dsp_common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dsp/dspgateway/dsp_common.c b/drivers/dsp/dspgateway/dsp_common.c
index 9dffda2..52740ae 100644
--- a/drivers/dsp/dspgateway/dsp_common.c
+++ b/drivers/dsp/dspgateway/dsp_common.c
@@ -41,7 +41,7 @@
 #endif
 
 #if defined(CONFIG_ARCH_OMAP1)
-#define dsp_boot_config(mode)	omap_writew((mode), MPUI_DSP_BOOT_CONFIG)
+#define dsp_boot_config(mode)	__raw_writew((mode), MPUI_DSP_BOOT_CONFIG)
 #endif
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #define dsp_boot_config(mode)	writel((mode), DSP_IPI_DSPBOOTCONFIG)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 28/59] omap: namespace cleanup to drivers/dsp/dspgateway/mmu.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/dspgateway/mmu.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dsp/dspgateway/mmu.h b/drivers/dsp/dspgateway/mmu.h
index 9d60e9e..b8e17c7 100644
--- a/drivers/dsp/dspgateway/mmu.h
+++ b/drivers/dsp/dspgateway/mmu.h
@@ -64,7 +64,7 @@ static int omapfb_ready;
 #define EMIF_PRIO_MPU_SHIFT	0
 #define set_emiff_dma_prio(prio) \
 	do { \
-		omap_writel((omap_readl(OMAP_TC_OCPT1_PRIOR) & \
+		__raw_writel((__raw_readl(OMAP_TC_OCPT1_PRIOR) & \
 			     ~EMIF_PRIO_DMA_MASK) | \
 			    ((prio) << EMIF_PRIO_DMA_SHIFT), \
 			    OMAP_TC_OCPT1_PRIOR); \
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 29/59] omap: namespace cleanup to drivers/i2c/chips/isp1301_omap.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/i2c/chips/isp1301_omap.c |  118 +++++++++++++++++++-------------------
 1 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index f717270..411d709 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -367,8 +367,8 @@ static void a_idle(struct isp1301 *isp, const char *tag)
 		gadget_suspend(isp);
 	}
 	isp->otg.state = OTG_STATE_A_IDLE;
-	l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
-	omap_writel(l, OTG_CTRL);
+	l = __raw_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+	__raw_writel(l, OTG_CTRL);
 	isp->last_otg_ctrl = l;
 	pr_debug("  --> %s/%s\n", state_name(isp), tag);
 }
@@ -391,8 +391,8 @@ static void b_idle(struct isp1301 *isp, const char *tag)
 		gadget_suspend(isp);
 	}
 	isp->otg.state = OTG_STATE_B_IDLE;
-	l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
-	omap_writel(l, OTG_CTRL);
+	l = __raw_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+	__raw_writel(l, OTG_CTRL);
 	isp->last_otg_ctrl = l;
 	pr_debug("  --> %s/%s\n", state_name(isp), tag);
 }
@@ -406,7 +406,7 @@ dump_regs(struct isp1301 *isp, const char *label)
 	u8	src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);
 
 	pr_debug("otg: %06x, %s %s, otg/%02x stat/%02x.%02x\n",
-		omap_readl(OTG_CTRL), label, state_name(isp),
+		__raw_readl(OTG_CTRL), label, state_name(isp),
 		ctrl, status, src);
 	/* mode control and irq enables don't change much */
 #endif
@@ -429,7 +429,7 @@ dump_regs(struct isp1301 *isp, const char *label)
 static void check_state(struct isp1301 *isp, const char *tag)
 {
 	enum usb_otg_state	state = OTG_STATE_UNDEFINED;
-	u8			fsm = omap_readw(OTG_TEST) & 0x0ff;
+	u8			fsm = __raw_readw(OTG_TEST) & 0x0ff;
 	unsigned		extra = 0;
 
 	switch (fsm) {
@@ -495,7 +495,7 @@ static void check_state(struct isp1301 *isp, const char *tag)
 		return;
 	pr_debug("otg: %s FSM %s/%02x, %s, %06x\n", tag,
 		state_string(state), fsm, state_name(isp),
-		omap_readl(OTG_CTRL));
+		__raw_readl(OTG_CTRL));
 }
 
 #else
@@ -509,7 +509,7 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
 {
 	u32	otg_ctrl;
 
-	otg_ctrl = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+	otg_ctrl = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 	otg_ctrl &= ~OTG_XCEIV_INPUTS;
 	otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD);
 
@@ -536,7 +536,7 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
 			return;
 		}
 	}
-	omap_writel(otg_ctrl, OTG_CTRL);
+	__raw_writel(otg_ctrl, OTG_CTRL);
 }
 
 /* outputs from ISP1301_OTG_STATUS */
@@ -544,14 +544,14 @@ static void update_otg2(struct isp1301 *isp, u8 otg_status)
 {
 	u32	otg_ctrl;
 
-	otg_ctrl = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+	otg_ctrl = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 	otg_ctrl &= ~OTG_XCEIV_INPUTS;
 	otg_ctrl &= ~(OTG_BSESSVLD | OTG_BSESSEND);
 	if (otg_status & OTG_B_SESS_VLD)
 		otg_ctrl |= OTG_BSESSVLD;
 	else if (otg_status & OTG_B_SESS_END)
 		otg_ctrl |= OTG_BSESSEND;
-	omap_writel(otg_ctrl, OTG_CTRL);
+	__raw_writel(otg_ctrl, OTG_CTRL);
 }
 
 /* inputs going to ISP1301 */
@@ -560,7 +560,7 @@ static void otg_update_isp(struct isp1301 *isp)
 	u32	otg_ctrl, otg_change;
 	u8	set = OTG1_DM_PULLDOWN, clr = OTG1_DM_PULLUP;
 
-	otg_ctrl = omap_readl(OTG_CTRL);
+	otg_ctrl = __raw_readl(OTG_CTRL);
 	otg_change = otg_ctrl ^ isp->last_otg_ctrl;
 	isp->last_otg_ctrl = otg_ctrl;
 	otg_ctrl = otg_ctrl & OTG_XCEIV_INPUTS;
@@ -658,9 +658,9 @@ pulldown:
 		default:
 			break;
 		}
-		l = omap_readl(OTG_CTRL);
+		l = __raw_readl(OTG_CTRL);
 		l |= OTG_PULLUP;
-		omap_writel(l, OTG_CTRL);
+		__raw_writel(l, OTG_CTRL);
 	}
 
 	check_state(isp, __func__);
@@ -669,20 +669,20 @@ pulldown:
 
 static irqreturn_t omap_otg_irq(int irq, void *_isp)
 {
-	u16		otg_irq = omap_readw(OTG_IRQ_SRC);
+	u16		otg_irq = __raw_readw(OTG_IRQ_SRC);
 	u32		otg_ctrl;
 	int		ret = IRQ_NONE;
 	struct isp1301	*isp = _isp;
 
 	/* update ISP1301 transciever from OTG controller */
 	if (otg_irq & OPRT_CHG) {
-		omap_writew(OPRT_CHG, OTG_IRQ_SRC);
+		__raw_writew(OPRT_CHG, OTG_IRQ_SRC);
 		isp1301_defer_work(isp, WORK_UPDATE_ISP);
 		ret = IRQ_HANDLED;
 
 	/* SRP to become b_peripheral failed */
 	} else if (otg_irq & B_SRP_TMROUT) {
-		pr_debug("otg: B_SRP_TIMEOUT, %06x\n", omap_readl(OTG_CTRL));
+		pr_debug("otg: B_SRP_TIMEOUT, %06x\n", __raw_readl(OTG_CTRL));
 		notresponding(isp);
 
 		/* gadget drivers that care should monitor all kinds of
@@ -692,31 +692,31 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
 		if (isp->otg.state == OTG_STATE_B_SRP_INIT)
 			b_idle(isp, "srp_timeout");
 
-		omap_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
+		__raw_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 	/* HNP to become b_host failed */
 	} else if (otg_irq & B_HNP_FAIL) {
 		pr_debug("otg: %s B_HNP_FAIL, %06x\n",
-				state_name(isp), omap_readl(OTG_CTRL));
+				state_name(isp), __raw_readl(OTG_CTRL));
 		notresponding(isp);
 
-		otg_ctrl = omap_readl(OTG_CTRL);
+		otg_ctrl = __raw_readl(OTG_CTRL);
 		otg_ctrl |= OTG_BUSDROP;
 		otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-		omap_writel(otg_ctrl, OTG_CTRL);
+		__raw_writel(otg_ctrl, OTG_CTRL);
 
 		/* subset of b_peripheral()... */
 		isp->otg.state = OTG_STATE_B_PERIPHERAL;
 		pr_debug("  --> b_peripheral\n");
 
-		omap_writew(B_HNP_FAIL, OTG_IRQ_SRC);
+		__raw_writew(B_HNP_FAIL, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 	/* detect SRP from B-device ... */
 	} else if (otg_irq & A_SRP_DETECT) {
 		pr_debug("otg: %s SRP_DETECT, %06x\n",
-				state_name(isp), omap_readl(OTG_CTRL));
+				state_name(isp), __raw_readl(OTG_CTRL));
 
 		isp1301_defer_work(isp, WORK_UPDATE_OTG);
 		switch (isp->otg.state) {
@@ -724,49 +724,49 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
 			if (!isp->otg.host)
 				break;
 			isp1301_defer_work(isp, WORK_HOST_RESUME);
-			otg_ctrl = omap_readl(OTG_CTRL);
+			otg_ctrl = __raw_readl(OTG_CTRL);
 			otg_ctrl |= OTG_A_BUSREQ;
 			otg_ctrl &= ~(OTG_BUSDROP|OTG_B_BUSREQ)
 					& ~OTG_XCEIV_INPUTS
 					& OTG_CTRL_MASK;
-			omap_writel(otg_ctrl, OTG_CTRL);
+			__raw_writel(otg_ctrl, OTG_CTRL);
 			break;
 		default:
 			break;
 		}
 
-		omap_writew(A_SRP_DETECT, OTG_IRQ_SRC);
+		__raw_writew(A_SRP_DETECT, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 	/* timer expired:  T(a_wait_bcon) and maybe T(a_wait_vrise)
 	 * we don't track them separately
 	 */
 	} else if (otg_irq & A_REQ_TMROUT) {
-		otg_ctrl = omap_readl(OTG_CTRL);
+		otg_ctrl = __raw_readl(OTG_CTRL);
 		pr_info("otg: BCON_TMOUT from %s, %06x\n",
 				state_name(isp), otg_ctrl);
 		notresponding(isp);
 
 		otg_ctrl |= OTG_BUSDROP;
 		otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-		omap_writel(otg_ctrl, OTG_CTRL);
+		__raw_writel(otg_ctrl, OTG_CTRL);
 		isp->otg.state = OTG_STATE_A_WAIT_VFALL;
 
-		omap_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
+		__raw_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 	/* A-supplied voltage fell too low; overcurrent */
 	} else if (otg_irq & A_VBUS_ERR) {
-		otg_ctrl = omap_readl(OTG_CTRL);
+		otg_ctrl = __raw_readl(OTG_CTRL);
 		printk(KERN_ERR "otg: %s, VBUS_ERR %04x ctrl %06x\n",
 			state_name(isp), otg_irq, otg_ctrl);
 
 		otg_ctrl |= OTG_BUSDROP;
 		otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-		omap_writel(otg_ctrl, OTG_CTRL);
+		__raw_writel(otg_ctrl, OTG_CTRL);
 		isp->otg.state = OTG_STATE_A_VBUS_ERR;
 
-		omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
+		__raw_writew(A_VBUS_ERR, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 	/* switch driver; the transciever code activates it,
@@ -775,7 +775,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
 	} else if (otg_irq & DRIVER_SWITCH) {
 		int	kick = 0;
 
-		otg_ctrl = omap_readl(OTG_CTRL);
+		otg_ctrl = __raw_readl(OTG_CTRL);
 		printk(KERN_NOTICE "otg: %s, SWITCH to %s, ctrl %06x\n",
 				state_name(isp),
 				(otg_ctrl & OTG_DRIVER_SEL)
@@ -798,7 +798,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
 		} else {
 			if (!(otg_ctrl & OTG_ID)) {
 				otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-				omap_writel(otg_ctrl | OTG_A_BUSREQ, OTG_CTRL);
+				__raw_writel(otg_ctrl | OTG_A_BUSREQ, OTG_CTRL);
 			}
 
 			if (isp->otg.host) {
@@ -823,7 +823,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
 			}
 		}
 
-		omap_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
+		__raw_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
 		ret = IRQ_HANDLED;
 
 		if (kick)
@@ -846,7 +846,7 @@ static int otg_init(struct isp1301 *isp)
 
 	dump_regs(isp, __func__);
 	/* some of these values are board-specific... */
-	l = omap_readl(OTG_SYSCON_2);
+	l = __raw_readl(OTG_SYSCON_2);
 	l |= OTG_EN
 		/* for B-device: */
 		| SRP_GPDATA		/* 9msec Bdev D+ pulse */
@@ -857,22 +857,22 @@ static int otg_init(struct isp1301 *isp)
 		| SRP_DPW		/* detect 167+ns SRP pulses */
 		| SRP_DATA | SRP_VBUS	/* accept both kinds of SRP pulse */
 		;
-	omap_writel(l, OTG_SYSCON_2);
+	__raw_writel(l, OTG_SYSCON_2);
 
 	update_otg1(isp, isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE));
 	update_otg2(isp, isp1301_get_u8(isp, ISP1301_OTG_STATUS));
 
 	check_state(isp, __func__);
 	pr_debug("otg: %s, %s %06x\n",
-			state_name(isp), __func__, omap_readl(OTG_CTRL));
+			state_name(isp), __func__, __raw_readl(OTG_CTRL));
 
-	omap_writew(DRIVER_SWITCH | OPRT_CHG
+	__raw_writew(DRIVER_SWITCH | OPRT_CHG
 			| B_SRP_TMROUT | B_HNP_FAIL
 			| A_VBUS_ERR | A_SRP_DETECT | A_REQ_TMROUT, OTG_IRQ_EN);
 
-	l = omap_readl(OTG_SYSCON_2);
+	l = __raw_readl(OTG_SYSCON_2);
 	l |= OTG_EN;
-	omap_writel(l, OTG_SYSCON_2);
+	__raw_writel(l, OTG_SYSCON_2);
 
 	return 0;
 }
@@ -941,8 +941,8 @@ static void b_peripheral(struct isp1301 *isp)
 {
 	u32 l;
 
-	l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
-	omap_writel(l, OTG_CTRL);
+	l = __raw_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+	__raw_writel(l, OTG_CTRL);
 
 	usb_gadget_vbus_connect(isp->otg.gadget);
 
@@ -1037,9 +1037,9 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
 				isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1,
 						MC1_BDIS_ACON_EN);
 				isp->otg.state = OTG_STATE_B_IDLE;
-				l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+				l = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 				l &= ~OTG_CTRL_BITS;
-				omap_writel(l, OTG_CTRL);
+				__raw_writel(l, OTG_CTRL);
 				break;
 			case OTG_STATE_B_IDLE:
 				break;
@@ -1065,8 +1065,8 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
 			/* FALLTHROUGH */
 		case OTG_STATE_B_SRP_INIT:
 			b_idle(isp, __func__);
-			l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
-			omap_writel(l, OTG_CTRL);
+			l = __raw_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+			__raw_writel(l, OTG_CTRL);
 			/* FALLTHROUGH */
 		case OTG_STATE_B_IDLE:
 			if (isp->otg.gadget && (isp_bstat & OTG_B_SESS_VLD)) {
@@ -1150,11 +1150,11 @@ isp1301_work(struct work_struct *work)
 			case OTG_STATE_A_WAIT_VRISE:
 				isp->otg.state = OTG_STATE_A_HOST;
 				pr_debug("  --> a_host\n");
-				otg_ctrl = omap_readl(OTG_CTRL);
+				otg_ctrl = __raw_readl(OTG_CTRL);
 				otg_ctrl |= OTG_A_BUSREQ;
 				otg_ctrl &= ~(OTG_BUSDROP|OTG_B_BUSREQ)
 						& OTG_CTRL_MASK;
-				omap_writel(otg_ctrl, OTG_CTRL);
+				__raw_writel(otg_ctrl, OTG_CTRL);
 				break;
 			case OTG_STATE_B_WAIT_ACON:
 				isp->otg.state = OTG_STATE_B_HOST;
@@ -1294,7 +1294,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 		return -ENODEV;
 
 	if (!host) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		power_down(isp);
 		isp->otg.host = 0;
 		return 0;
@@ -1351,7 +1351,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 		return -ENODEV;
 
 	if (!gadget) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		if (!isp->otg.default_a)
 			enable_vbus_draw(isp, 0);
 		usb_gadget_vbus_disconnect(isp->otg.gadget);
@@ -1372,10 +1372,10 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 	isp->otg.gadget = gadget;
 	// FIXME update its refcount
 
-	l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+	l = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 	l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
 	l |= OTG_ID;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	power_up(isp);
 	isp->otg.state = OTG_STATE_B_IDLE;
@@ -1428,17 +1428,17 @@ isp1301_start_srp(struct otg_transceiver *dev)
 			|| isp->otg.state != OTG_STATE_B_IDLE)
 		return -ENODEV;
 
-	otg_ctrl = omap_readl(OTG_CTRL);
+	otg_ctrl = __raw_readl(OTG_CTRL);
 	if (!(otg_ctrl & OTG_BSESSEND))
 		return -EINVAL;
 
 	otg_ctrl |= OTG_B_BUSREQ;
 	otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK;
-	omap_writel(otg_ctrl, OTG_CTRL);
+	__raw_writel(otg_ctrl, OTG_CTRL);
 	isp->otg.state = OTG_STATE_B_SRP_INIT;
 
 	pr_debug("otg: SRP, %s ... %06x\n", state_name(isp),
-			omap_readl(OTG_CTRL));
+			__raw_readl(OTG_CTRL));
 #ifdef	CONFIG_USB_OTG
 	check_state(isp, __func__);
 #endif
@@ -1477,9 +1477,9 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 #endif
 		/* caller must suspend then clear A_BUSREQ */
 		usb_gadget_vbus_connect(isp->otg.gadget);
-		l = omap_readl(OTG_CTRL);
+		l = __raw_readl(OTG_CTRL);
 		l |= OTG_A_SETB_HNPEN;
-		omap_writel(l, OTG_CTRL);
+		__raw_writel(l, OTG_CTRL);
 
 		break;
 	case OTG_STATE_A_PERIPHERAL:
@@ -1489,7 +1489,7 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 		return -EILSEQ;
 	}
 	pr_debug("otg: HNP %s, %06x ...\n",
-		state_name(isp), omap_readl(OTG_CTRL));
+		state_name(isp), __raw_readl(OTG_CTRL));
 	check_state(isp, __func__);
 	return 0;
 #else
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 30/59] omap: namespace cleanup to drivers/i2c/chips/twl4030-usb.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/i2c/chips/twl4030-usb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index f967353..b6c7893 100644
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -594,7 +594,7 @@ static int twl4030_set_peripheral(struct otg_transceiver *x,
 	twl = xceiv_to_twl(x);
 
 	if (!gadget) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		twl4030_phy_suspend(twl, 1);
 		twl->otg.gadget = NULL;
 
@@ -604,10 +604,10 @@ static int twl4030_set_peripheral(struct otg_transceiver *x,
 	twl->otg.gadget = gadget;
 	twl4030_phy_resume(twl);
 
-	l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+	l = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 	l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
 	l |= OTG_ID;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	twl->otg.state = OTG_STATE_B_IDLE;
 
@@ -624,7 +624,7 @@ static int twl4030_set_host(struct otg_transceiver *x, struct usb_bus *host)
 	twl = xceiv_to_twl(x);
 
 	if (!host) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		twl4030_phy_suspend(twl, 1);
 		twl->otg.host = NULL;
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 31/59] omap: namespace cleanup to drivers/input/keyboard/omap-keypad.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/input/keyboard/omap-keypad.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 0f95046..cbb0c83 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -116,7 +116,7 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
 			disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
 	} else
 		/* disable keyboard interrupt and schedule for handling */
-		omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
 	tasklet_schedule(&kp_tasklet);
 
@@ -143,20 +143,20 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
 
 	} else {
 		/* disable keyboard interrupt and schedule for handling */
-		omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
 		/* read the keypad status */
-		omap_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
+		__raw_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
 		for (col = 0; col < omap_kp->cols; col++) {
-			omap_writew(~(1 << col) & 0xff,
+			__raw_writew(~(1 << col) & 0xff,
 				    OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
 
 			udelay(omap_kp->delay);
 
-			state[col] = ~omap_readw(OMAP_MPUIO_BASE +
+			state[col] = ~__raw_readw(OMAP_MPUIO_BASE +
 						 OMAP_MPUIO_KBR_LATCH) & 0xff;
 		}
-		omap_writew(0x00, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
+		__raw_writew(0x00, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
 		udelay(2);
 	}
 }
@@ -234,7 +234,7 @@ static void omap_kp_tasklet(unsigned long data)
 			for (i = 0; i < omap_kp_data->rows; i++)
 				enable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
 		} else {
-			omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+			__raw_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 			kp_cur_group = -1;
 		}
 	}
@@ -285,7 +285,7 @@ static int omap_kp_suspend(struct platform_device *dev, pm_message_t state)
 	 * to wake us up from suspended.
 	 */
 	if (cpu_class_is_omap1())
-		omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
 	omap_kp->suspended = 1;
 
@@ -333,7 +333,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
 
 	/* Disable the interrupt for the MPUIO keyboard */
 	if (!cpu_is_omap24xx())
-		omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
 	keymap = pdata->keymap;
 
@@ -407,7 +407,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
 	}
 
 	if (pdata->dbounce)
-		omap_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_DEBOUNCING);
+		__raw_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_DEBOUNCING);
 
 	/* scan current status and enable interrupt */
 	omap_kp_scan_keypad(omap_kp, keypad_state);
@@ -418,7 +418,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
 					"omap-keypad", omap_kp) < 0)
 				goto err4;
 		}
-		omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 	} else {
 		for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
 			if (request_irq(OMAP_GPIO_IRQ(row_gpios[irq_idx]),
@@ -465,7 +465,7 @@ static int omap_kp_remove(struct platform_device *pdev)
 			free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);
 		}
 	} else {
-		omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+		__raw_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 		free_irq(omap_kp->irq, 0);
 	}
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 32/59] omap: namespace cleanup to drivers/mtd/maps/omap_nor.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/mtd/maps/omap_nor.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 73bc277..b9758a2 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -65,15 +65,15 @@ static void omap_set_vpp(struct map_info *map, int enable)
 	if (cpu_class_is_omap1()) {
 		if (enable) {
 			if (count++ == 0) {
-				l = omap_readl(EMIFS_CONFIG);
+				l = __raw_readl(EMIFS_CONFIG);
 				l |= OMAP_EMIFS_CONFIG_WP;
-				omap_writel(l, EMIFS_CONFIG);
+				__raw_writel(l, EMIFS_CONFIG);
 			}
 		} else {
 			if (count && (--count == 0)) {
-				l = omap_readl(EMIFS_CONFIG);
+				l = __raw_readl(EMIFS_CONFIG);
 				l &= ~OMAP_EMIFS_CONFIG_WP;
-				omap_writel(l, EMIFS_CONFIG);
+				__raw_writel(l, EMIFS_CONFIG);
 			}
 		}
 	}
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 33/59] omap: namespace cleanup to drivers/mtd/nand/ams-delta.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/mtd/nand/ams-delta.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 782994e..a706118 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -63,8 +63,8 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)
 {
 	struct nand_chip *this = mtd->priv;
 
-	omap_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
-	omap_writew(byte, this->IO_ADDR_W);
+	__raw_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
+	__raw_writew(byte, this->IO_ADDR_W);
 	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0);
 	ndelay(40);
 	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE,
@@ -78,8 +78,8 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd)
 
 	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0);
 	ndelay(40);
-	omap_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
-	res = omap_readw(this->IO_ADDR_R);
+	__raw_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
+	res = __raw_readw(this->IO_ADDR_R);
 	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE,
 			       AMS_DELTA_LATCH2_NAND_NRE);
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 34/59] omap: namespace cleanup to drivers/mtd/nand/omap2.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/mtd/nand/omap2.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 2ede116..170f235 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -187,12 +187,12 @@ static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 }
 
 /*
- * omap_read_buf16 - read data from NAND controller into buffer
+ * __raw_read_buf16 - read data from NAND controller into buffer
  * @mtd: MTD device structure
  * @buf: buffer to store date
  * @len: number of bytes to read
  */
-static void omap_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
+static void __raw_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 {
 	struct nand_chip *nand = mtd->priv;
 
@@ -200,12 +200,12 @@ static void omap_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 }
 
 /*
- * omap_write_buf16 - write buffer to NAND controller
+ * __raw_write_buf16 - write buffer to NAND controller
  * @mtd: MTD device structure
  * @buf: data buffer
  * @len: number of bytes to write
  */
-static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
+static void __raw_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
 {
 	struct omap_nand_info *info = container_of(mtd,
 						struct omap_nand_info, mtd);
@@ -641,8 +641,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
 
 	/* REVISIT:  only supports 16-bit NAND flash */
 
-	info->nand.read_buf   = omap_read_buf16;
-	info->nand.write_buf  = omap_write_buf16;
+	info->nand.read_buf   = __raw_read_buf16;
+	info->nand.write_buf  = __raw_write_buf16;
 	info->nand.verify_buf = omap_verify_buf;
 
 	/*
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 35/59] omap: namespace cleanup to drivers/net/irda/omap-ir.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/net/irda/omap-ir.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index b706253..3652ff3 100644
--- a/drivers/net/irda/omap-ir.c
+++ b/drivers/net/irda/omap-ir.c
@@ -138,12 +138,12 @@ struct omap_irda {
 
 static void inline uart_reg_out(int idx, u8 val)
 {
-	omap_writeb(val, idx);
+	__raw_writeb(val, idx);
 }
 
 static u8 inline uart_reg_in(int idx)
 {
-	u8 b = omap_readb(idx);
+	u8 b = __raw_readb(idx);
 	return b;
 }
 
@@ -232,14 +232,14 @@ static int omap_irda_startup(struct net_device *dev)
 	/* FIXME: use clk_* apis for UART3 clock*/
 	/* Enable UART3 clock and set UART3 to IrDA mode */
 	if (machine_is_omap_h2() || machine_is_omap_h3())
-		omap_writel(omap_readl(MOD_CONF_CTRL_0) | (1 << 31) | (1 << 15),
+		__raw_writel(__raw_readl(MOD_CONF_CTRL_0) | (1 << 31) | (1 << 15),
 				MOD_CONF_CTRL_0);
 
 	/* Only for H2?
 	 */
 	if (omap_ir->pdata->transceiver_mode && machine_is_omap_h2()) {
 		/* Is it select_irda on H2 ? */
-		omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7,
+		__raw_writel(__raw_readl(FUNC_MUX_CTRL_A) | 7,
 					FUNC_MUX_CTRL_A);
 		omap_ir->pdata->transceiver_mode(omap_ir->dev, IR_SIRMODE);
 	}
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 36/59] omap: namespace cleanup to drivers/pcmcia/omap_cf.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/pcmcia/omap_cf.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index f373639..5600f98 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -50,7 +50,7 @@
 #define CF_CONTROL			(CF_BASE + 0x04)
 #	define	CF_CONTROL_RESET	(1 << 0)
 
-#define omap_cf_present() (!(omap_readw(CF_STATUS) & CF_STATUS_CARD_DETECT))
+#define omap_cf_present() (!(__raw_readw(CF_STATUS) & CF_STATUS_CARD_DETECT))
 
 /*--------------------------------------------------------------------------*/
 
@@ -139,11 +139,11 @@ omap_cf_set_socket(struct pcmcia_socket *sock, struct socket_state_t *s)
 		return -EINVAL;
 	}
 
-	control = omap_readw(CF_CONTROL);
+	control = __raw_readw(CF_CONTROL);
 	if (s->flags & SS_RESET)
-		omap_writew(CF_CONTROL_RESET, CF_CONTROL);
+		__raw_writew(CF_CONTROL_RESET, CF_CONTROL);
 	else
-		omap_writew(0, CF_CONTROL);
+		__raw_writew(0, CF_CONTROL);
 
 	pr_debug("%s: Vcc %d, io_irq %d, flags %04x csc %04x\n",
 		driver_name, s->Vcc, s->io_irq, s->flags, s->csc_mask);
@@ -270,7 +270,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)
 	omap_cfg_reg(V10_1610_CF_IREQ);
 	omap_cfg_reg(W10_1610_CF_RESET);
 
-	omap_writew(~(1 << seg), CF_CFG);
+	__raw_writew(~(1 << seg), CF_CFG);
 
 	pr_info("%s: cs%d on irq %d\n", driver_name, seg, irq);
 
@@ -279,15 +279,15 @@ static int __init omap_cf_probe(struct platform_device *pdev)
 	 * CF/PCMCIA variants...
 	 */
 	pr_debug("%s: cs%d, previous ccs %08x acs %08x\n", driver_name,
-		seg, omap_readl(EMIFS_CCS(seg)), omap_readl(EMIFS_ACS(seg)));
-	omap_writel(0x0004a1b3, EMIFS_CCS(seg));	/* synch mode 4 etc */
-	omap_writel(0x00000000, EMIFS_ACS(seg));	/* OE hold/setup */
+		seg, __raw_readl(EMIFS_CCS(seg)), omap_readl(EMIFS_ACS(seg)));
+	__raw_writel(0x0004a1b3, EMIFS_CCS(seg));	/* synch mode 4 etc */
+	__raw_writel(0x00000000, EMIFS_ACS(seg));	/* OE hold/setup */
 
 	/* CF uses armxor_ck, which is "always" available */
 
 	pr_debug("%s: sts %04x cfg %04x control %04x %s\n", driver_name,
-		omap_readw(CF_STATUS), omap_readw(CF_CFG),
-		omap_readw(CF_CONTROL),
+		__raw_readw(CF_STATUS), omap_readw(CF_CFG),
+		__raw_readw(CF_CONTROL),
 		omap_cf_present() ? "present" : "(not present)");
 
 	cf->socket.owner = THIS_MODULE;
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 37/59] omap: namespace cleanup to drivers/rtc/rtc-omap.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/rtc/rtc-omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 2cbeb07..f3c7cf9 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -88,8 +88,8 @@
 #define OMAP_RTC_INTERRUPTS_IT_TIMER    (1<<2)
 
 
-#define rtc_read(addr)		omap_readb(OMAP_RTC_BASE + (addr))
-#define rtc_write(val, addr)	omap_writeb(val, OMAP_RTC_BASE + (addr))
+#define rtc_read(addr)		__raw_readb(OMAP_RTC_BASE + (addr))
+#define rtc_write(val, addr)	__raw_writeb(val, OMAP_RTC_BASE + (addr))
 
 
 /* we rely on the rtc framework to handle locking (rtc->ops_lock),
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 38/59] omap: namespace cleanup to drivers/spi/omap_uwire.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/spi/omap_uwire.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index bab6ff0..ad68cb7 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -578,8 +578,8 @@ static int __init omap_uwire_init(void)
 	}
 	if (machine_is_omap_perseus2()) {
 		/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */
-		int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000;
-		omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9);
+		int val = __raw_readl(OMAP730_IO_CONF_9) & ~0x00EEE000;
+		__raw_writel(val | 0x00AAA000, OMAP730_IO_CONF_9);
 	}
 
 	return platform_driver_probe(&uwire_driver, uwire_probe);
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 39/59] omap: namespace cleanup to drivers/usb/gadget/omap_udc.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/gadget/omap_udc.c |  406 ++++++++++++++++++++--------------------
 1 files changed, 203 insertions(+), 203 deletions(-)

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 34e9e39..767d599 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -136,7 +136,7 @@ static void use_ep(struct omap_ep *ep, u16 select)
 
 	if (ep->bEndpointAddress & USB_DIR_IN)
 		num |= UDC_EP_DIR;
-	omap_writew(num | select, UDC_EP_NUM);
+	__raw_writew(num | select, UDC_EP_NUM);
 	/* when select, MUST deselect later !! */
 }
 
@@ -144,9 +144,9 @@ static inline void deselect_ep(void)
 {
 	u16 w;
 
-	w = omap_readw(UDC_EP_NUM);
+	w = __raw_readw(UDC_EP_NUM);
 	w &= ~UDC_EP_SEL;
-	omap_writew(w, UDC_EP_NUM);
+	__raw_writew(w, UDC_EP_NUM);
 	/* 6 wait states before TX will happen */
 }
 
@@ -221,7 +221,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
 	ep->has_dma = 0;
 	ep->lch = -1;
 	use_ep(ep, UDC_EP_SEL);
-	omap_writew(udc->clr_halt, UDC_CTRL);
+	__raw_writew(udc->clr_halt, UDC_CTRL);
 	ep->ackwait = 0;
 	deselect_ep();
 
@@ -237,7 +237,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
 	if (desc->bmAttributes != USB_ENDPOINT_XFER_ISOC
 			&& !ep->has_dma
 			&& !(ep->bEndpointAddress & USB_DIR_IN)) {
-		omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+		__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 		ep->ackwait = 1 + ep->double_buf;
 	}
 
@@ -264,7 +264,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
 	nuke (ep, -ESHUTDOWN);
 	ep->ep.maxpacket = ep->maxpacket;
 	ep->has_dma = 0;
-	omap_writew(UDC_SET_HALT, UDC_CTRL);
+	__raw_writew(UDC_SET_HALT, UDC_CTRL);
 	list_del_init(&ep->iso);
 	del_timer(&ep->timer);
 
@@ -365,13 +365,13 @@ write_packet(u8 *buf, struct omap_req *req, unsigned max)
 	if (likely((((int)buf) & 1) == 0)) {
 		wp = (u16 *)buf;
 		while (max >= 2) {
-			omap_writew(*wp++, UDC_DATA);
+			__raw_writew(*wp++, UDC_DATA);
 			max -= 2;
 		}
 		buf = (u8 *)wp;
 	}
 	while (max--)
-		omap_writeb(*buf++, UDC_DATA);
+		__raw_writeb(*buf++, UDC_DATA);
 	return len;
 }
 
@@ -390,13 +390,13 @@ static int write_fifo(struct omap_ep *ep, struct omap_req *req)
 	prefetch(buf);
 
 	/* PIO-IN isn't double buffered except for iso */
-	ep_stat = omap_readw(UDC_STAT_FLG);
+	ep_stat = __raw_readw(UDC_STAT_FLG);
 	if (ep_stat & UDC_FIFO_UNWRITABLE)
 		return 0;
 
 	count = ep->ep.maxpacket;
 	count = write_packet(buf, req, count);
-	omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+	__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 	ep->ackwait = 1;
 
 	/* last packet is often short (sometimes a zlp) */
@@ -430,13 +430,13 @@ read_packet(u8 *buf, struct omap_req *req, unsigned avail)
 	if (likely((((int)buf) & 1) == 0)) {
 		wp = (u16 *)buf;
 		while (avail >= 2) {
-			*wp++ = omap_readw(UDC_DATA);
+			*wp++ = __raw_readw(UDC_DATA);
 			avail -= 2;
 		}
 		buf = (u8 *)wp;
 	}
 	while (avail--)
-		*buf++ = omap_readb(UDC_DATA);
+		*buf++ = __raw_readb(UDC_DATA);
 	return len;
 }
 
@@ -451,7 +451,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
 	prefetchw(buf);
 
 	for (;;) {
-		u16	ep_stat = omap_readw(UDC_STAT_FLG);
+		u16	ep_stat = __raw_readw(UDC_STAT_FLG);
 
 		is_last = 0;
 		if (ep_stat & FIFO_EMPTY) {
@@ -465,7 +465,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
 		if (ep_stat & UDC_FIFO_FULL)
 			avail = ep->ep.maxpacket;
 		else  {
-			avail = omap_readw(UDC_RXFSTAT);
+			avail = __raw_readw(UDC_RXFSTAT);
 			ep->fnf = ep->double_buf;
 		}
 		count = read_packet(buf, req, avail);
@@ -478,7 +478,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
 				req->req.status = -EOVERFLOW;
 				avail -= count;
 				while (avail--)
-					omap_readw(UDC_DATA);
+					__raw_readw(UDC_DATA);
 			}
 		} else if (req->req.length == req->req.actual)
 			is_last = 1;
@@ -572,10 +572,10 @@ static void next_in_dma(struct omap_ep *ep, struct omap_req *req)
 
 	omap_start_dma(ep->lch);
 	ep->dma_counter = omap_get_dma_src_pos(ep->lch);
-	w = omap_readw(UDC_DMA_IRQ_EN);
+	w = __raw_readw(UDC_DMA_IRQ_EN);
 	w |= UDC_TX_DONE_IE(ep->dma_channel);
-	omap_writew(w, UDC_DMA_IRQ_EN);
-	omap_writew(UDC_TXN_START | txdma_ctrl, UDC_TXDMA(ep->dma_channel));
+	__raw_writew(w, UDC_DMA_IRQ_EN);
+	__raw_writew(UDC_TXN_START | txdma_ctrl, UDC_TXDMA(ep->dma_channel));
 	req->dma_bytes = length;
 }
 
@@ -599,9 +599,9 @@ static void finish_in_dma(struct omap_ep *ep, struct omap_req *req, int status)
 
 	/* tx completion */
 	omap_stop_dma(ep->lch);
-	w = omap_readw(UDC_DMA_IRQ_EN);
+	w = __raw_readw(UDC_DMA_IRQ_EN);
 	w &= ~UDC_TX_DONE_IE(ep->dma_channel);
-	omap_writew(w, UDC_DMA_IRQ_EN);
+	__raw_writew(w, UDC_DMA_IRQ_EN);
 	done(ep, req, status);
 }
 
@@ -638,12 +638,12 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
 		0, 0);
 	ep->dma_counter = omap_get_dma_dst_pos(ep->lch);
 
-	omap_writew(UDC_RXN_STOP | (packets - 1), UDC_RXDMA(ep->dma_channel));
-	w = omap_readw(UDC_DMA_IRQ_EN);
+	__raw_writew(UDC_RXN_STOP | (packets - 1), UDC_RXDMA(ep->dma_channel));
+	w = __raw_readw(UDC_DMA_IRQ_EN);
 	w |= UDC_RX_EOT_IE(ep->dma_channel);
-	omap_writew(w, UDC_DMA_IRQ_EN);
-	omap_writew(ep->bEndpointAddress & 0xf, UDC_EP_NUM);
-	omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+	__raw_writew(w, UDC_DMA_IRQ_EN);
+	__raw_writew(ep->bEndpointAddress & 0xf, UDC_EP_NUM);
+	__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 
 	omap_start_dma(ep->lch);
 }
@@ -670,15 +670,15 @@ finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status, int one)
 		return;
 
 	/* rx completion */
-	w = omap_readw(UDC_DMA_IRQ_EN);
+	w = __raw_readw(UDC_DMA_IRQ_EN);
 	w &= ~UDC_RX_EOT_IE(ep->dma_channel);
-	omap_writew(w, UDC_DMA_IRQ_EN);
+	__raw_writew(w, UDC_DMA_IRQ_EN);
 	done(ep, req, status);
 }
 
 static void dma_irq(struct omap_udc *udc, u16 irq_src)
 {
-	u16		dman_stat = omap_readw(UDC_DMAN_STAT);
+	u16		dman_stat = __raw_readw(UDC_DMAN_STAT);
 	struct omap_ep	*ep;
 	struct omap_req	*req;
 
@@ -692,7 +692,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
 						struct omap_req, queue);
 			finish_in_dma(ep, req, 0);
 		}
-		omap_writew(UDC_TXN_DONE, UDC_IRQ_SRC);
+		__raw_writew(UDC_TXN_DONE, UDC_IRQ_SRC);
 
 		if (!list_empty (&ep->queue)) {
 			req = container_of(ep->queue.next,
@@ -711,7 +711,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
 					struct omap_req, queue);
 			finish_out_dma(ep, req, 0, dman_stat & UDC_DMA_RX_SB);
 		}
-		omap_writew(UDC_RXN_EOT, UDC_IRQ_SRC);
+		__raw_writew(UDC_RXN_EOT, UDC_IRQ_SRC);
 
 		if (!list_empty (&ep->queue)) {
 			req = container_of(ep->queue.next,
@@ -725,7 +725,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
 		ep->irqs++;
 		/* omap15xx does this unasked... */
 		VDBG("%s, RX_CNT irq?\n", ep->ep.name);
-		omap_writew(UDC_RXN_CNT, UDC_IRQ_SRC);
+		__raw_writew(UDC_RXN_CNT, UDC_IRQ_SRC);
 	}
 }
 
@@ -748,9 +748,9 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
 
 	is_in = ep->bEndpointAddress & USB_DIR_IN;
 	if (is_in)
-		reg = omap_readw(UDC_TXDMA_CFG);
+		reg = __raw_readw(UDC_TXDMA_CFG);
 	else
-		reg = omap_readw(UDC_RXDMA_CFG);
+		reg = __raw_readw(UDC_RXDMA_CFG);
 	reg |= UDC_DMA_REQ;		/* "pulse" activated */
 
 	ep->dma_channel = 0;
@@ -778,7 +778,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
 		status = omap_request_dma(dma_channel,
 			ep->ep.name, dma_error, ep, &ep->lch);
 		if (status == 0) {
-			omap_writew(reg, UDC_TXDMA_CFG);
+			__raw_writew(reg, UDC_TXDMA_CFG);
 			/* EMIFF or SDRC */
 			omap_set_dma_src_burst_mode(ep->lch,
 						OMAP_DMA_DATA_BURST_4);
@@ -799,7 +799,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
 		status = omap_request_dma(dma_channel,
 			ep->ep.name, dma_error, ep, &ep->lch);
 		if (status == 0) {
-			omap_writew(reg, UDC_RXDMA_CFG);
+			__raw_writew(reg, UDC_RXDMA_CFG);
 			/* TIPB */
 			omap_set_dma_src_params(ep->lch,
 				OMAP_DMA_PORT_TIPB,
@@ -846,7 +846,7 @@ just_restart:
 			(is_in ? write_fifo : read_fifo)(ep, req);
 			deselect_ep();
 			if (!is_in) {
-				omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 				ep->ackwait = 1 + ep->double_buf;
 			}
 			/* IN: 6 wait states before it'll tx */
@@ -880,7 +880,7 @@ static void dma_channel_release(struct omap_ep *ep)
 
 	/* wait till current packet DMA finishes, and fifo empties */
 	if (ep->bEndpointAddress & USB_DIR_IN) {
-		omap_writew((omap_readw(UDC_TXDMA_CFG) & ~mask) | UDC_DMA_REQ,
+		__raw_writew((__raw_readw(UDC_TXDMA_CFG) & ~mask) | UDC_DMA_REQ,
 					UDC_TXDMA_CFG);
 
 		if (req) {
@@ -888,17 +888,17 @@ static void dma_channel_release(struct omap_ep *ep)
 
 			/* clear FIFO; hosts probably won't empty it */
 			use_ep(ep, UDC_EP_SEL);
-			omap_writew(UDC_CLR_EP, UDC_CTRL);
+			__raw_writew(UDC_CLR_EP, UDC_CTRL);
 			deselect_ep();
 		}
-		while (omap_readw(UDC_TXDMA_CFG) & mask)
+		while (__raw_readw(UDC_TXDMA_CFG) & mask)
 			udelay(10);
 	} else {
-		omap_writew((omap_readw(UDC_RXDMA_CFG) & ~mask) | UDC_DMA_REQ,
+		__raw_writew((__raw_readw(UDC_RXDMA_CFG) & ~mask) | UDC_DMA_REQ,
 					UDC_RXDMA_CFG);
 
 		/* dma empties the fifo */
-		while (omap_readw(UDC_RXDMA_CFG) & mask)
+		while (__raw_readw(UDC_RXDMA_CFG) & mask)
 			udelay(10);
 		if (req)
 			finish_out_dma(ep, req, -ECONNRESET, 0);
@@ -988,9 +988,9 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 	if (is_iso) {
 		u16 w;
 
-		w = omap_readw(UDC_IRQ_EN);
+		w = __raw_readw(UDC_IRQ_EN);
 		w |= UDC_SOF_IE;
-		omap_writew(w, UDC_IRQ_EN);
+		__raw_writew(w, UDC_IRQ_EN);
 	} else if (list_empty(&ep->queue) && !ep->stopped && !ep->ackwait) {
 		int	is_in;
 
@@ -1009,23 +1009,23 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 				 * requests to non-control endpoints
 				 */
 				if (udc->ep0_set_config) {
-					u16	irq_en = omap_readw(UDC_IRQ_EN);
+					u16	irq_en = __raw_readw(UDC_IRQ_EN);
 
 					irq_en |= UDC_DS_CHG_IE | UDC_EP0_IE;
 					if (!udc->ep0_reset_config)
 						irq_en |= UDC_EPN_RX_IE
 							| UDC_EPN_TX_IE;
-					omap_writew(irq_en, UDC_IRQ_EN);
+					__raw_writew(irq_en, UDC_IRQ_EN);
 				}
 
 				/* STATUS for zero length DATA stages is
 				 * always an IN ... even for IN transfers,
 				 * a weird case which seem to stall OMAP.
 				 */
-				omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
-				omap_writew(UDC_CLR_EP, UDC_CTRL);
-				omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-				omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+				__raw_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
+				__raw_writew(UDC_CLR_EP, UDC_CTRL);
+				__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 
 				/* cleanup */
 				udc->ep0_pending = 0;
@@ -1034,11 +1034,11 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 
 			/* non-empty DATA stage */
 			} else if (is_in) {
-				omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
+				__raw_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
 			} else {
 				if (udc->ep0_setup)
 					goto irq_wait;
-				omap_writew(UDC_EP_SEL, UDC_EP_NUM);
+				__raw_writew(UDC_EP_SEL, UDC_EP_NUM);
 			}
 		} else {
 			is_in = ep->bEndpointAddress & USB_DIR_IN;
@@ -1054,7 +1054,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 				req = NULL;
 			deselect_ep();
 			if (!is_in) {
-				omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 				ep->ackwait = 1 + ep->double_buf;
 			}
 			/* IN: 6 wait states before it'll tx */
@@ -1122,9 +1122,9 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
 		else if (value) {
 			if (ep->udc->ep0_set_config) {
 				WARNING("error changing config?\n");
-				omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
+				__raw_writew(UDC_CLR_CFG, UDC_SYSCON2);
 			}
-			omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
+			__raw_writew(UDC_STALL_CMD, UDC_SYSCON2);
 			ep->udc->ep0_pending = 0;
 			status = 0;
 		} else /* NOP */
@@ -1151,8 +1151,8 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
 				channel = 0;
 
 			use_ep(ep, UDC_EP_SEL);
-			if (omap_readw(UDC_STAT_FLG) & UDC_NON_ISO_FIFO_EMPTY) {
-				omap_writew(UDC_SET_HALT, UDC_CTRL);
+			if (__raw_readw(UDC_STAT_FLG) & UDC_NON_ISO_FIFO_EMPTY) {
+				__raw_writew(UDC_SET_HALT, UDC_CTRL);
 				status = 0;
 			} else
 				status = -EAGAIN;
@@ -1162,10 +1162,10 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
 				dma_channel_claim(ep, channel);
 		} else {
 			use_ep(ep, 0);
-			omap_writew(ep->udc->clr_halt, UDC_CTRL);
+			__raw_writew(ep->udc->clr_halt, UDC_CTRL);
 			ep->ackwait = 0;
 			if (!(ep->bEndpointAddress & USB_DIR_IN)) {
-				omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 				ep->ackwait = 1 + ep->double_buf;
 			}
 		}
@@ -1197,7 +1197,7 @@ static struct usb_ep_ops omap_ep_ops = {
 
 static int omap_get_frame(struct usb_gadget *gadget)
 {
-	u16	sof = omap_readw(UDC_SOF);
+	u16	sof = __raw_readw(UDC_SOF);
 	return (sof & UDC_TS_OK) ? (sof & UDC_TS) : -EL2NSYNC;
 }
 
@@ -1216,7 +1216,7 @@ static int omap_wakeup(struct usb_gadget *gadget)
 		 */
 		if (udc->devstat & (UDC_B_HNP_ENABLE|UDC_R_WK_OK)) {
 			DBG("remote wakeup...\n");
-			omap_writew(UDC_RMT_WKP, UDC_SYSCON2);
+			__raw_writew(UDC_RMT_WKP, UDC_SYSCON2);
 			retval = 0;
 		}
 
@@ -1239,12 +1239,12 @@ omap_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
 
 	udc = container_of(gadget, struct omap_udc, gadget);
 	spin_lock_irqsave(&udc->lock, flags);
-	syscon1 = omap_readw(UDC_SYSCON1);
+	syscon1 = __raw_readw(UDC_SYSCON1);
 	if (is_selfpowered)
 		syscon1 |= UDC_SELF_PWR;
 	else
 		syscon1 &= ~UDC_SELF_PWR;
-	omap_writew(syscon1, UDC_SYSCON1);
+	__raw_writew(syscon1, UDC_SYSCON1);
 	spin_unlock_irqrestore(&udc->lock, flags);
 
 	return 0;
@@ -1259,17 +1259,17 @@ static void pullup_enable(struct omap_udc *udc)
 {
 	u16 w;
 
-	w = omap_readw(UDC_SYSCON1);
+	w = __raw_readw(UDC_SYSCON1);
 	w |= UDC_PULLUP_EN;
-	omap_writew(w, UDC_SYSCON1);
+	__raw_writew(w, UDC_SYSCON1);
 	if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) {
 		u32 l;
 
-		l = omap_readl(OTG_CTRL);
+		l = __raw_readl(OTG_CTRL);
 		l |= OTG_BSESSVLD;
-		omap_writel(l, OTG_CTRL);
+		__raw_writel(l, OTG_CTRL);
 	}
-	omap_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
+	__raw_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
 }
 
 static void pullup_disable(struct omap_udc *udc)
@@ -1279,14 +1279,14 @@ static void pullup_disable(struct omap_udc *udc)
 	if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) {
 		u32 l;
 
-		l = omap_readl(OTG_CTRL);
+		l = __raw_readl(OTG_CTRL);
 		l &= ~OTG_BSESSVLD;
-		omap_writel(l, OTG_CTRL);
+		__raw_writel(l, OTG_CTRL);
 	}
-	omap_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
-	w = omap_readw(UDC_SYSCON1);
+	__raw_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
+	w = __raw_readw(UDC_SYSCON1);
 	w &= ~UDC_PULLUP_EN;
-	omap_writew(w, UDC_SYSCON1);
+	__raw_writew(w, UDC_SYSCON1);
 }
 
 static struct omap_udc *udc;
@@ -1322,12 +1322,12 @@ static int omap_vbus_session(struct usb_gadget *gadget, int is_active)
 	udc->vbus_active = (is_active != 0);
 	if (cpu_is_omap15xx()) {
 		/* "software" detect, ignored if !VBUS_MODE_1510 */
-		l = omap_readl(FUNC_MUX_CTRL_0);
+		l = __raw_readl(FUNC_MUX_CTRL_0);
 		if (is_active)
 			l |= VBUS_CTRL_1510;
 		else
 			l &= ~VBUS_CTRL_1510;
-		omap_writel(l, FUNC_MUX_CTRL_0);
+		__raw_writel(l, FUNC_MUX_CTRL_0);
 	}
 	if (udc->dc_clk != NULL && is_active) {
 		if (!udc->clk_requested) {
@@ -1397,9 +1397,9 @@ static void nuke(struct omap_ep *ep, int status)
 		dma_channel_release(ep);
 
 	use_ep(ep, 0);
-	omap_writew(UDC_CLR_EP, UDC_CTRL);
+	__raw_writew(UDC_CLR_EP, UDC_CTRL);
 	if (ep->bEndpointAddress && ep->bmAttributes != USB_ENDPOINT_XFER_ISOC)
-		omap_writew(UDC_SET_HALT, UDC_CTRL);
+		__raw_writew(UDC_SET_HALT, UDC_CTRL);
 
 	while (!list_empty(&ep->queue)) {
 		req = list_entry(ep->queue.next, struct omap_req, queue);
@@ -1427,8 +1427,8 @@ static void update_otg(struct omap_udc *udc)
 	if (!gadget_is_otg(&udc->gadget))
 		return;
 
-	if (omap_readl(OTG_CTRL) & OTG_ID)
-		devstat = omap_readw(UDC_DEVSTAT);
+	if (__raw_readl(OTG_CTRL) & OTG_ID)
+		devstat = __raw_readw(UDC_DEVSTAT);
 	else
 		devstat = 0;
 
@@ -1442,10 +1442,10 @@ static void update_otg(struct omap_udc *udc)
 	if (udc->gadget.b_hnp_enable) {
 		u32 l;
 
-		l = omap_readl(OTG_CTRL);
+		l = __raw_readl(OTG_CTRL);
 		l |= OTG_B_HNPEN | OTG_B_BUSREQ;
 		l &= ~OTG_PULLUP;
-		omap_writel(l, OTG_CTRL);
+		__raw_writel(l, OTG_CTRL);
 	}
 }
 
@@ -1464,7 +1464,7 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 
 		nuke(ep0, 0);
 		if (ack) {
-			omap_writew(ack, UDC_IRQ_SRC);
+			__raw_writew(ack, UDC_IRQ_SRC);
 			irq_src = UDC_SETUP;
 		}
 	}
@@ -1484,9 +1484,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 	if (irq_src & UDC_EP0_TX) {
 		int	stat;
 
-		omap_writew(UDC_EP0_TX, UDC_IRQ_SRC);
-		omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
-		stat = omap_readw(UDC_STAT_FLG);
+		__raw_writew(UDC_EP0_TX, UDC_IRQ_SRC);
+		__raw_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+		stat = __raw_readw(UDC_STAT_FLG);
 		if (stat & UDC_ACK) {
 			if (udc->ep0_in) {
 				/* write next IN packet from response,
@@ -1494,26 +1494,26 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 				 */
 				if (req)
 					stat = write_fifo(ep0, req);
-				omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+				__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 				if (!req && udc->ep0_pending) {
-					omap_writew(UDC_EP_SEL, UDC_EP_NUM);
-					omap_writew(UDC_CLR_EP, UDC_CTRL);
-					omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-					omap_writew(0, UDC_EP_NUM);
+					__raw_writew(UDC_EP_SEL, UDC_EP_NUM);
+					__raw_writew(UDC_CLR_EP, UDC_CTRL);
+					__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+					__raw_writew(0, UDC_EP_NUM);
 					udc->ep0_pending = 0;
 				} /* else:  6 wait states before it'll tx */
 			} else {
 				/* ack status stage of OUT transfer */
-				omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+				__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 				if (req)
 					done(ep0, req, 0);
 			}
 			req = NULL;
 		} else if (stat & UDC_STALL) {
-			omap_writew(UDC_CLR_HALT, UDC_CTRL);
-			omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(UDC_CLR_HALT, UDC_CTRL);
+			__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 		} else {
-			omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 		}
 	}
 
@@ -1521,9 +1521,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 	if (irq_src & UDC_EP0_RX) {
 		int	stat;
 
-		omap_writew(UDC_EP0_RX, UDC_IRQ_SRC);
-		omap_writew(UDC_EP_SEL, UDC_EP_NUM);
-		stat = omap_readw(UDC_STAT_FLG);
+		__raw_writew(UDC_EP0_RX, UDC_IRQ_SRC);
+		__raw_writew(UDC_EP_SEL, UDC_EP_NUM);
+		stat = __raw_readw(UDC_STAT_FLG);
 		if (stat & UDC_ACK) {
 			if (!udc->ep0_in) {
 				stat = 0;
@@ -1531,35 +1531,35 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 				 * reactiviting the fifo; stall on errors.
 				 */
 				if (!req || (stat = read_fifo(ep0, req)) < 0) {
-					omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
+					__raw_writew(UDC_STALL_CMD, UDC_SYSCON2);
 					udc->ep0_pending = 0;
 					stat = 0;
 				} else if (stat == 0)
-					omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-				omap_writew(0, UDC_EP_NUM);
+					__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(0, UDC_EP_NUM);
 
 				/* activate status stage */
 				if (stat == 1) {
 					done(ep0, req, 0);
 					/* that may have STALLed ep0... */
-					omap_writew(UDC_EP_SEL | UDC_EP_DIR,
+					__raw_writew(UDC_EP_SEL | UDC_EP_DIR,
 							UDC_EP_NUM);
-					omap_writew(UDC_CLR_EP, UDC_CTRL);
-					omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-					omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+					__raw_writew(UDC_CLR_EP, UDC_CTRL);
+					__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+					__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 					udc->ep0_pending = 0;
 				}
 			} else {
 				/* ack status stage of IN transfer */
-				omap_writew(0, UDC_EP_NUM);
+				__raw_writew(0, UDC_EP_NUM);
 				if (req)
 					done(ep0, req, 0);
 			}
 		} else if (stat & UDC_STALL) {
-			omap_writew(UDC_CLR_HALT, UDC_CTRL);
-			omap_writew(0, UDC_EP_NUM);
+			__raw_writew(UDC_CLR_HALT, UDC_CTRL);
+			__raw_writew(0, UDC_EP_NUM);
 		} else {
-			omap_writew(0, UDC_EP_NUM);
+			__raw_writew(0, UDC_EP_NUM);
 		}
 	}
 
@@ -1574,14 +1574,14 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 
 		/* read the (latest) SETUP message */
 		do {
-			omap_writew(UDC_SETUP_SEL, UDC_EP_NUM);
+			__raw_writew(UDC_SETUP_SEL, UDC_EP_NUM);
 			/* two bytes at a time */
-			u.word[0] = omap_readw(UDC_DATA);
-			u.word[1] = omap_readw(UDC_DATA);
-			u.word[2] = omap_readw(UDC_DATA);
-			u.word[3] = omap_readw(UDC_DATA);
-			omap_writew(0, UDC_EP_NUM);
-		} while (omap_readw(UDC_IRQ_SRC) & UDC_SETUP);
+			u.word[0] = __raw_readw(UDC_DATA);
+			u.word[1] = __raw_readw(UDC_DATA);
+			u.word[2] = __raw_readw(UDC_DATA);
+			u.word[3] = __raw_readw(UDC_DATA);
+			__raw_writew(0, UDC_EP_NUM);
+		} while (__raw_readw(UDC_IRQ_SRC) & UDC_SETUP);
 
 #define	w_value		le16_to_cpu(u.r.wValue)
 #define	w_index		le16_to_cpu(u.r.wIndex)
@@ -1612,9 +1612,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 			 * later if it fails the request.
 			 */
 			if (udc->ep0_reset_config)
-				omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
+				__raw_writew(UDC_CLR_CFG, UDC_SYSCON2);
 			else
-				omap_writew(UDC_DEV_CFG, UDC_SYSCON2);
+				__raw_writew(UDC_DEV_CFG, UDC_SYSCON2);
 			update_otg(udc);
 			goto delegate;
 		case USB_REQ_CLEAR_FEATURE:
@@ -1632,10 +1632,10 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 						|| !ep->desc)
 					goto do_stall;
 				use_ep(ep, 0);
-				omap_writew(udc->clr_halt, UDC_CTRL);
+				__raw_writew(udc->clr_halt, UDC_CTRL);
 				ep->ackwait = 0;
 				if (!(ep->bEndpointAddress & USB_DIR_IN)) {
-					omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+					__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 					ep->ackwait = 1 + ep->double_buf;
 				}
 				/* NOTE:  assumes the host behaves sanely,
@@ -1668,15 +1668,15 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 			}
 			use_ep(ep, 0);
 			/* can't halt if fifo isn't empty... */
-			omap_writew(UDC_CLR_EP, UDC_CTRL);
-			omap_writew(UDC_SET_HALT, UDC_CTRL);
+			__raw_writew(UDC_CLR_EP, UDC_CTRL);
+			__raw_writew(UDC_SET_HALT, UDC_CTRL);
 			VDBG("%s halted by host\n", ep->name);
 ep0out_status_stage:
 			status = 0;
-			omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
-			omap_writew(UDC_CLR_EP, UDC_CTRL);
-			omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-			omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(UDC_CLR_EP, UDC_CTRL);
+			__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+			__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 			udc->ep0_pending = 0;
 			break;
 		case USB_REQ_GET_STATUS:
@@ -1713,10 +1713,10 @@ intf_status:
 
 zero_status:
 			/* return two zero bytes */
-			omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
-			omap_writew(0, UDC_DATA);
-			omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
-			omap_writew(UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+			__raw_writew(0, UDC_DATA);
+			__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+			__raw_writew(UDC_EP_DIR, UDC_EP_NUM);
 			status = 0;
 			VDBG("GET_STATUS, interface %d\n", w_index);
 			/* next, status stage */
@@ -1725,8 +1725,8 @@ zero_status:
 delegate:
 			/* activate the ep0out fifo right away */
 			if (!udc->ep0_in && w_length) {
-				omap_writew(0, UDC_EP_NUM);
-				omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+				__raw_writew(0, UDC_EP_NUM);
+				__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 			}
 
 			/* gadget drivers see class/vendor specific requests,
@@ -1767,9 +1767,9 @@ do_stall:
 				if (udc->ep0_reset_config)
 					WARNING("error resetting config?\n");
 				else
-					omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
+					__raw_writew(UDC_CLR_CFG, UDC_SYSCON2);
 			}
-			omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
+			__raw_writew(UDC_STALL_CMD, UDC_SYSCON2);
 			udc->ep0_pending = 0;
 		}
 	}
@@ -1783,7 +1783,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
 {
 	u16	devstat, change;
 
-	devstat = omap_readw(UDC_DEVSTAT);
+	devstat = __raw_readw(UDC_DEVSTAT);
 	change = devstat ^ udc->devstat;
 	udc->devstat = devstat;
 
@@ -1823,7 +1823,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
 				INFO("USB reset done, gadget %s\n",
 					udc->driver->driver.name);
 				/* ep0 traffic is legal from now on */
-				omap_writew(UDC_DS_CHG_IE | UDC_EP0_IE,
+				__raw_writew(UDC_DS_CHG_IE | UDC_EP0_IE,
 						UDC_IRQ_EN);
 			}
 			change &= ~UDC_USB_RESET;
@@ -1868,7 +1868,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
 		VDBG("devstat %03x, ignore change %03x\n",
 			devstat,  change);
 
-	omap_writew(UDC_DS_CHG, UDC_IRQ_SRC);
+	__raw_writew(UDC_DS_CHG, UDC_IRQ_SRC);
 }
 
 static irqreturn_t omap_udc_irq(int irq, void *_udc)
@@ -1879,7 +1879,7 @@ static irqreturn_t omap_udc_irq(int irq, void *_udc)
 	unsigned long	flags;
 
 	spin_lock_irqsave(&udc->lock, flags);
-	irq_src = omap_readw(UDC_IRQ_SRC);
+	irq_src = __raw_readw(UDC_IRQ_SRC);
 
 	/* Device state change (usb ch9 stuff) */
 	if (irq_src & UDC_DS_CHG) {
@@ -1923,7 +1923,7 @@ static void pio_out_timer(unsigned long _ep)
 	spin_lock_irqsave(&ep->udc->lock, flags);
 	if (!list_empty(&ep->queue) && ep->ackwait) {
 		use_ep(ep, UDC_EP_SEL);
-		stat_flg = omap_readw(UDC_STAT_FLG);
+		stat_flg = __raw_readw(UDC_STAT_FLG);
 
 		if ((stat_flg & UDC_ACK) && (!(stat_flg & UDC_FIFO_EN)
 				|| (ep->double_buf && HALF_FULL(stat_flg)))) {
@@ -1933,8 +1933,8 @@ static void pio_out_timer(unsigned long _ep)
 			req = container_of(ep->queue.next,
 					struct omap_req, queue);
 			(void) read_fifo(ep, req);
-			omap_writew(ep->bEndpointAddress, UDC_EP_NUM);
-			omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+			__raw_writew(ep->bEndpointAddress, UDC_EP_NUM);
+			__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 			ep->ackwait = 1 + ep->double_buf;
 		} else
 			deselect_ep();
@@ -1954,20 +1954,20 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
 	unsigned long	flags;
 
 	spin_lock_irqsave(&udc->lock, flags);
-	epn_stat = omap_readw(UDC_EPN_STAT);
-	irq_src = omap_readw(UDC_IRQ_SRC);
+	epn_stat = __raw_readw(UDC_EPN_STAT);
+	irq_src = __raw_readw(UDC_IRQ_SRC);
 
 	/* handle OUT first, to avoid some wasteful NAKs */
 	if (irq_src & UDC_EPN_RX) {
 		epnum = (epn_stat >> 8) & 0x0f;
-		omap_writew(UDC_EPN_RX, UDC_IRQ_SRC);
+		__raw_writew(UDC_EPN_RX, UDC_IRQ_SRC);
 		status = IRQ_HANDLED;
 		ep = &udc->ep[epnum];
 		ep->irqs++;
 
-		omap_writew(epnum | UDC_EP_SEL, UDC_EP_NUM);
+		__raw_writew(epnum | UDC_EP_SEL, UDC_EP_NUM);
 		ep->fnf = 0;
-		if (omap_readw(UDC_STAT_FLG) & UDC_ACK) {
+		if (__raw_readw(UDC_STAT_FLG) & UDC_ACK) {
 			ep->ackwait--;
 			if (!list_empty(&ep->queue)) {
 				int stat;
@@ -1979,15 +1979,15 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
 			}
 		}
 		/* min 6 clock delay before clearing EP_SEL ... */
-		epn_stat = omap_readw(UDC_EPN_STAT);
-		epn_stat = omap_readw(UDC_EPN_STAT);
-		omap_writew(epnum, UDC_EP_NUM);
+		epn_stat = __raw_readw(UDC_EPN_STAT);
+		epn_stat = __raw_readw(UDC_EPN_STAT);
+		__raw_writew(epnum, UDC_EP_NUM);
 
 		/* enabling fifo _after_ clearing ACK, contrary to docs,
 		 * reduces lossage; timer still needed though (sigh).
 		 */
 		if (ep->fnf) {
-			omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+			__raw_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 			ep->ackwait = 1 + ep->double_buf;
 		}
 		mod_timer(&ep->timer, PIO_OUT_TIMEOUT);
@@ -1996,13 +1996,13 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
 	/* then IN transfers */
 	else if (irq_src & UDC_EPN_TX) {
 		epnum = epn_stat & 0x0f;
-		omap_writew(UDC_EPN_TX, UDC_IRQ_SRC);
+		__raw_writew(UDC_EPN_TX, UDC_IRQ_SRC);
 		status = IRQ_HANDLED;
 		ep = &udc->ep[16 + epnum];
 		ep->irqs++;
 
-		omap_writew(epnum | UDC_EP_DIR | UDC_EP_SEL, UDC_EP_NUM);
-		if (omap_readw(UDC_STAT_FLG) & UDC_ACK) {
+		__raw_writew(epnum | UDC_EP_DIR | UDC_EP_SEL, UDC_EP_NUM);
+		if (__raw_readw(UDC_STAT_FLG) & UDC_ACK) {
 			ep->ackwait = 0;
 			if (!list_empty(&ep->queue)) {
 				req = container_of(ep->queue.next,
@@ -2011,9 +2011,9 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
 			}
 		}
 		/* min 6 clock delay before clearing EP_SEL ... */
-		epn_stat = omap_readw(UDC_EPN_STAT);
-		epn_stat = omap_readw(UDC_EPN_STAT);
-		omap_writew(epnum | UDC_EP_DIR, UDC_EP_NUM);
+		epn_stat = __raw_readw(UDC_EPN_STAT);
+		epn_stat = __raw_readw(UDC_EPN_STAT);
+		__raw_writew(epnum | UDC_EP_DIR, UDC_EP_NUM);
 		/* then 6 clocks before it'd tx */
 	}
 
@@ -2041,7 +2041,7 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
 		req = list_entry(ep->queue.next, struct omap_req, queue);
 
 		use_ep(ep, UDC_EP_SEL);
-		stat = omap_readw(UDC_STAT_FLG);
+		stat = __raw_readw(UDC_STAT_FLG);
 
 		/* NOTE: like the other controller drivers, this isn't
 		 * currently reporting lost or damaged frames.
@@ -2076,11 +2076,11 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
 	if (!pending) {
 		u16 w;
 
-		w = omap_readw(UDC_IRQ_EN);
+		w = __raw_readw(UDC_IRQ_EN);
 		w &= ~UDC_SOF_IE;
-		omap_writew(w, UDC_IRQ_EN);
+		__raw_writew(w, UDC_IRQ_EN);
 	}
-	omap_writew(UDC_IRQ_SOF, UDC_IRQ_SRC);
+	__raw_writew(UDC_IRQ_SOF, UDC_IRQ_SRC);
 
 	spin_unlock_irqrestore(&udc->lock, flags);
 	return IRQ_HANDLED;
@@ -2129,7 +2129,7 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
 		if (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC)
 			continue;
 		use_ep(ep, 0);
-		omap_writew(UDC_SET_HALT, UDC_CTRL);
+		__raw_writew(UDC_SET_HALT, UDC_CTRL);
 	}
 	udc->ep0_pending = 0;
 	udc->ep[0].irqs = 0;
@@ -2153,7 +2153,7 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
 	}
 	DBG("bound to driver %s\n", driver->driver.name);
 
-	omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
+	__raw_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
 
 	/* connect to bus through transceiver */
 	if (udc->transceiver) {
@@ -2250,7 +2250,7 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
 	else
 		buf[0] = 0;
 
-	stat_flg = omap_readw(UDC_STAT_FLG);
+	stat_flg = __raw_readw(UDC_STAT_FLG);
 	seq_printf(s,
 		"\n%s %s%s%sirqs %ld stat %04x " EIGHTBITS FOURBITS "%s\n",
 		ep->name, buf,
@@ -2311,7 +2311,7 @@ static int proc_otg_show(struct seq_file *s)
 	u32		trans;
 	char		*ctrl_name;
 
-	tmp = omap_readl(OTG_REV);
+	tmp = __raw_readl(OTG_REV);
 	if (cpu_is_omap24xx()) {
 		/*
 		 * REVISIT: Not clear how this works on OMAP2.  trans
@@ -2324,11 +2324,11 @@ static int proc_otg_show(struct seq_file *s)
 		trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	} else {
 		ctrl_name = "tranceiver_ctrl";
-		trans = omap_readw(USB_TRANSCEIVER_CTRL);
+		trans = __raw_readw(USB_TRANSCEIVER_CTRL);
 	}
 	seq_printf(s, "\nOTG rev %d.%d, %s %05x\n",
 		tmp >> 4, tmp & 0xf, ctrl_name, trans);
-	tmp = omap_readw(OTG_SYSCON_1);
+	tmp = __raw_readw(OTG_SYSCON_1);
 	seq_printf(s, "otg_syscon1 %08x usb2 %s, usb1 %s, usb0 %s,"
 			FOURBITS "\n", tmp,
 		trx_mode(USB2_TRX_MODE(tmp), trans & CONF_USB2_UNI_R),
@@ -2340,7 +2340,7 @@ static int proc_otg_show(struct seq_file *s)
 		(tmp & HST_IDLE_EN) ? " !host" : "",
 		(tmp & DEV_IDLE_EN) ? " !dev" : "",
 		(tmp & OTG_RESET_DONE) ? " reset_done" : " reset_active");
-	tmp = omap_readl(OTG_SYSCON_2);
+	tmp = __raw_readl(OTG_SYSCON_2);
 	seq_printf(s, "otg_syscon2 %08x%s" EIGHTBITS
 			" b_ase_brst=%d hmc=%d\n", tmp,
 		(tmp & OTG_EN) ? " otg_en" : "",
@@ -2355,7 +2355,7 @@ static int proc_otg_show(struct seq_file *s)
 		(tmp & HMC_TLLATTACH) ? " tllattach" : "",
 		B_ASE_BRST(tmp),
 		OTG_HMC(tmp));
-	tmp = omap_readl(OTG_CTRL);
+	tmp = __raw_readl(OTG_CTRL);
 	seq_printf(s, "otg_ctrl    %06x" EIGHTBITS EIGHTBITS "%s\n", tmp,
 		(tmp & OTG_ASESSVLD) ? " asess" : "",
 		(tmp & OTG_BSESSEND) ? " bsess_end" : "",
@@ -2375,13 +2375,13 @@ static int proc_otg_show(struct seq_file *s)
 		(tmp & OTG_PU_VBUS) ? " pu_vb" : "",
 		(tmp & OTG_PU_ID) ? " pu_id" : ""
 		);
-	tmp = omap_readw(OTG_IRQ_EN);
+	tmp = __raw_readw(OTG_IRQ_EN);
 	seq_printf(s, "otg_irq_en  %04x" "\n", tmp);
-	tmp = omap_readw(OTG_IRQ_SRC);
+	tmp = __raw_readw(OTG_IRQ_SRC);
 	seq_printf(s, "otg_irq_src %04x" "\n", tmp);
-	tmp = omap_readw(OTG_OUTCTRL);
+	tmp = __raw_readw(OTG_OUTCTRL);
 	seq_printf(s, "otg_outctrl %04x" "\n", tmp);
-	tmp = omap_readw(OTG_TEST);
+	tmp = __raw_readw(OTG_TEST);
 	seq_printf(s, "otg_test    %04x" "\n", tmp);
 	return 0;
 }
@@ -2402,7 +2402,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
 		driver_desc,
 		use_dma ?  " (dma)" : "");
 
-	tmp = omap_readw(UDC_REV) & 0xff;
+	tmp = __raw_readw(UDC_REV) & 0xff;
 	seq_printf(s,
 		"UDC rev %d.%d, fifo mode %d, gadget %s\n"
 		"hmc %d, transceiver %s\n",
@@ -2416,16 +2416,16 @@ static int proc_udc_show(struct seq_file *s, void *_)
 				? "external" : "(none)"));
 	if (cpu_class_is_omap1()) {
 		seq_printf(s, "ULPD control %04x req %04x status %04x\n",
-			omap_readw(ULPD_CLOCK_CTRL),
-			omap_readw(ULPD_SOFT_REQ),
-			omap_readw(ULPD_STATUS_REQ));
+			__raw_readw(ULPD_CLOCK_CTRL),
+			__raw_readw(ULPD_SOFT_REQ),
+			__raw_readw(ULPD_STATUS_REQ));
 	}
 
 	/* OTG controller registers */
 	if (!cpu_is_omap15xx())
 		proc_otg_show(s);
 
-	tmp = omap_readw(UDC_SYSCON1);
+	tmp = __raw_readw(UDC_SYSCON1);
 	seq_printf(s, "\nsyscon1     %04x" EIGHTBITS "\n", tmp,
 		(tmp & UDC_CFG_LOCK) ? " cfg_lock" : "",
 		(tmp & UDC_DATA_ENDIAN) ? " data_endian" : "",
@@ -2444,7 +2444,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
 		return 0;
 	}
 
-	tmp = omap_readw(UDC_DEVSTAT);
+	tmp = __raw_readw(UDC_DEVSTAT);
 	seq_printf(s, "devstat     %04x" EIGHTBITS "%s%s\n", tmp,
 		(tmp & UDC_B_HNP_ENABLE) ? " b_hnp" : "",
 		(tmp & UDC_A_HNP_SUPPORT) ? " a_hnp" : "",
@@ -2456,15 +2456,15 @@ static int proc_udc_show(struct seq_file *s, void *_)
 		(tmp & UDC_ADD) ? " ADD" : "",
 		(tmp & UDC_DEF) ? " DEF" : "",
 		(tmp & UDC_ATT) ? " ATT" : "");
-	seq_printf(s, "sof         %04x\n", omap_readw(UDC_SOF));
-	tmp = omap_readw(UDC_IRQ_EN);
+	seq_printf(s, "sof         %04x\n", __raw_readw(UDC_SOF));
+	tmp = __raw_readw(UDC_IRQ_EN);
 	seq_printf(s, "irq_en      %04x" FOURBITS "%s\n", tmp,
 		(tmp & UDC_SOF_IE) ? " sof" : "",
 		(tmp & UDC_EPN_RX_IE) ? " epn_rx" : "",
 		(tmp & UDC_EPN_TX_IE) ? " epn_tx" : "",
 		(tmp & UDC_DS_CHG_IE) ? " ds_chg" : "",
 		(tmp & UDC_EP0_IE) ? " ep0" : "");
-	tmp = omap_readw(UDC_IRQ_SRC);
+	tmp = __raw_readw(UDC_IRQ_SRC);
 	seq_printf(s, "irq_src     %04x" EIGHTBITS "%s%s\n", tmp,
 		(tmp & UDC_TXN_DONE) ? " txn_done" : "",
 		(tmp & UDC_RXN_CNT) ? " rxn_cnt" : "",
@@ -2479,7 +2479,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
 	if (use_dma) {
 		unsigned i;
 
-		tmp = omap_readw(UDC_DMA_IRQ_EN);
+		tmp = __raw_readw(UDC_DMA_IRQ_EN);
 		seq_printf(s, "dma_irq_en  %04x%s" EIGHTBITS "\n", tmp,
 			(tmp & UDC_TX_DONE_IE(3)) ? " tx2_done" : "",
 			(tmp & UDC_RX_CNT_IE(3)) ? " rx2_cnt" : "",
@@ -2493,29 +2493,29 @@ static int proc_udc_show(struct seq_file *s, void *_)
 			(tmp & UDC_RX_CNT_IE(1)) ? " rx0_cnt" : "",
 			(tmp & UDC_RX_EOT_IE(1)) ? " rx0_eot" : "");
 
-		tmp = omap_readw(UDC_RXDMA_CFG);
+		tmp = __raw_readw(UDC_RXDMA_CFG);
 		seq_printf(s, "rxdma_cfg   %04x\n", tmp);
 		if (tmp) {
 			for (i = 0; i < 3; i++) {
 				if ((tmp & (0x0f << (i * 4))) == 0)
 					continue;
 				seq_printf(s, "rxdma[%d]    %04x\n", i,
-						omap_readw(UDC_RXDMA(i + 1)));
+						__raw_readw(UDC_RXDMA(i + 1)));
 			}
 		}
-		tmp = omap_readw(UDC_TXDMA_CFG);
+		tmp = __raw_readw(UDC_TXDMA_CFG);
 		seq_printf(s, "txdma_cfg   %04x\n", tmp);
 		if (tmp) {
 			for (i = 0; i < 3; i++) {
 				if (!(tmp & (0x0f << (i * 4))))
 					continue;
 				seq_printf(s, "txdma[%d]    %04x\n", i,
-						omap_readw(UDC_TXDMA(i + 1)));
+						__raw_readw(UDC_TXDMA(i + 1)));
 			}
 		}
 	}
 
-	tmp = omap_readw(UDC_DEVSTAT);
+	tmp = __raw_readw(UDC_DEVSTAT);
 	if (tmp & UDC_ATT) {
 		proc_ep_show(s, &udc->ep[0]);
 		if (tmp & UDC_ADD) {
@@ -2629,9 +2629,9 @@ omap_ep_setup(char *name, u8 addr, u8 type,
 		name, addr, epn_rxtx, maxp, dbuf ? "x2" : "", buf);
 
 	if (addr & USB_DIR_IN)
-		omap_writew(epn_rxtx, UDC_EP_TX(addr & 0xf));
+		__raw_writew(epn_rxtx, UDC_EP_TX(addr & 0xf));
 	else
-		omap_writew(epn_rxtx, UDC_EP_RX(addr));
+		__raw_writew(epn_rxtx, UDC_EP_RX(addr));
 
 	/* next endpoint's buffer starts after this one's */
 	buf += maxp;
@@ -2670,12 +2670,12 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
 	unsigned	tmp, buf;
 
 	/* abolish any previous hardware state */
-	omap_writew(0, UDC_SYSCON1);
-	omap_writew(0, UDC_IRQ_EN);
-	omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
-	omap_writew(0, UDC_DMA_IRQ_EN);
-	omap_writew(0, UDC_RXDMA_CFG);
-	omap_writew(0, UDC_TXDMA_CFG);
+	__raw_writew(0, UDC_SYSCON1);
+	__raw_writew(0, UDC_IRQ_EN);
+	__raw_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
+	__raw_writew(0, UDC_DMA_IRQ_EN);
+	__raw_writew(0, UDC_RXDMA_CFG);
+	__raw_writew(0, UDC_TXDMA_CFG);
 
 	/* UDC_PULLUP_EN gates the chip clock */
 	// OTG_SYSCON_1 |= DEV_IDLE_EN;
@@ -2709,8 +2709,8 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
 
 	/* initially disable all non-ep0 endpoints */
 	for (tmp = 1; tmp < 15; tmp++) {
-		omap_writew(0, UDC_EP_RX(tmp));
-		omap_writew(0, UDC_EP_TX(tmp));
+		__raw_writew(0, UDC_EP_RX(tmp));
+		__raw_writew(0, UDC_EP_TX(tmp));
 	}
 
 #define OMAP_BULK_EP(name,addr) \
@@ -2795,7 +2795,7 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
 		ERR("unsupported fifo_mode #%d\n", fifo_mode);
 		return -ENODEV;
 	}
-	omap_writew(UDC_CFG_LOCK|UDC_SELF_PWR, UDC_SYSCON1);
+	__raw_writew(UDC_CFG_LOCK|UDC_SELF_PWR, UDC_SYSCON1);
 	INFO("fifo mode %d, %d bytes not used\n", fifo_mode, 2048 - buf);
 	return 0;
 }
@@ -2839,7 +2839,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
 	}
 
 	INFO("OMAP UDC rev %d.%d%s\n",
-		omap_readw(UDC_REV) >> 4, omap_readw(UDC_REV) & 0xf,
+		__raw_readw(UDC_REV) >> 4, omap_readw(UDC_REV) & 0xf,
 		config->otg ? ", Mini-AB" : "");
 
 	/* use the mode given to us by board init code */
@@ -2854,12 +2854,12 @@ static int __init omap_udc_probe(struct platform_device *pdev)
 			 * know when to turn PULLUP_EN on/off; and that
 			 * means we always "need" the 48MHz clock.
 			 */
-			u32 tmp = omap_readl(FUNC_MUX_CTRL_0);
+			u32 tmp = __raw_readl(FUNC_MUX_CTRL_0);
 			tmp &= ~VBUS_CTRL_1510;
-			omap_writel(tmp, FUNC_MUX_CTRL_0);
+			__raw_writel(tmp, FUNC_MUX_CTRL_0);
 			tmp |= VBUS_MODE_1510;
 			tmp &= ~VBUS_CTRL_1510;
-			omap_writel(tmp, FUNC_MUX_CTRL_0);
+			__raw_writel(tmp, FUNC_MUX_CTRL_0);
 		}
 	} else {
 		/* The transceiver may package some GPIO logic or handle
@@ -2939,7 +2939,7 @@ known:
 #endif
 
 	/* starting with omap1710 es2.0, clear toggle is a separate bit */
-	if (omap_readw(UDC_REV) >= 0x61)
+	if (__raw_readw(UDC_REV) >= 0x61)
 		udc->clr_halt = UDC_RESET_EP | UDC_CLRDATA_TOGGLE;
 	else
 		udc->clr_halt = UDC_RESET_EP;
@@ -3037,7 +3037,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
 		put_device(udc->transceiver->dev);
 		udc->transceiver = NULL;
 	}
-	omap_writew(0, UDC_SYSCON1);
+	__raw_writew(0, UDC_SYSCON1);
 
 	remove_proc_file();
 
@@ -3077,7 +3077,7 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message)
 {
 	u32	devstat;
 
-	devstat = omap_readw(UDC_DEVSTAT);
+	devstat = __raw_readw(UDC_DEVSTAT);
 
 	/* we're requesting 48 MHz clock if the pullup is enabled
 	 * (== we're attached to the host) and we're not suspended,
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 40/59] omap: namespace cleanup to drivers/usb/gadget/omap_udc.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/gadget/omap_udc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/omap_udc.h b/drivers/usb/gadget/omap_udc.h
index 29edc51..165c7ff 100644
--- a/drivers/usb/gadget/omap_udc.h
+++ b/drivers/usb/gadget/omap_udc.h
@@ -201,7 +201,7 @@ struct omap_udc {
 #define	VBUS_CTRL_1510		(1 << 19)	/* 1 connected (software) */
 #define	VBUS_MODE_1510		(1 << 18)	/* 0 hardware, 1 software */
 
-#define	HMC_1510	((omap_readl(MOD_CONF_CTRL_0) >> 1) & 0x3f)
-#define	HMC_1610	(omap_readl(OTG_SYSCON_2) & 0x3f)
+#define	HMC_1510	((__raw_readl(MOD_CONF_CTRL_0) >> 1) & 0x3f)
+#define	HMC_1610	(__raw_readl(OTG_SYSCON_2) & 0x3f)
 #define	HMC		(cpu_is_omap15xx() ? HMC_1510 : HMC_1610)
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 41/59] omap: namespace cleanup to drivers/usb/host/ehci-omap.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/host/ehci-omap.c |   48 +++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 419e70a..fa772aa 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -88,14 +88,14 @@ static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask)
 	int i;
 
 	/* Use UTMI Ports of TLL */
-	omap_writel((1 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)|
+	__raw_writel((1 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR8_BURST_EN_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN_SHIFT)|
 			(0<<OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN_SHIFT),
 						OMAP_UHH_HOSTCONFIG);
 	/* Enusre bit is set */
-	while (!(omap_readl(OMAP_UHH_HOSTCONFIG)
+	while (!(__raw_readl(OMAP_UHH_HOSTCONFIG)
 			& (1 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)))
 		cpu_relax();
 
@@ -106,22 +106,22 @@ static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask)
 	for (i = 0; i < OMAP_TLL_CHANNEL_COUNT; i++) {
 
 		/* Disable AutoIdle */
-		omap_writel(omap_readl(OMAP_TLL_CHANNEL_CONF(i)) &
+		__raw_writel(__raw_readl(OMAP_TLL_CHANNEL_CONF(i)) &
 			    ~(1<<OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE_SHIFT),
 			    OMAP_TLL_CHANNEL_CONF(i));
 		/* Disable BitStuffing */
-		omap_writel(omap_readl(OMAP_TLL_CHANNEL_CONF(i)) &
+		__raw_writel(__raw_readl(OMAP_TLL_CHANNEL_CONF(i)) &
 			    ~(1<<OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF_SHIFT),
 			    OMAP_TLL_CHANNEL_CONF(i));
 		/* SDR Mode */
-		omap_writel(omap_readl(OMAP_TLL_CHANNEL_CONF(i)) &
+		__raw_writel(__raw_readl(OMAP_TLL_CHANNEL_CONF(i)) &
 			    ~(1<<OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE_SHIFT),
 			    OMAP_TLL_CHANNEL_CONF(i));
 
 	}
 
 	/* Program Common TLL register */
-	omap_writel((1 << OMAP_TLL_SHARED_CONF_FCLK_IS_ON_SHIFT) |
+	__raw_writel((1 << OMAP_TLL_SHARED_CONF_FCLK_IS_ON_SHIFT) |
 			(1 << OMAP_TLL_SHARED_CONF_USB_DIVRATION_SHIFT) |
 			(0 << OMAP_TLL_SHARED_CONF_USB_180D_SDR_EN_SHIFT) |
 			(0 << OMAP_TLL_SHARED_CONF_USB_90D_DDR_EN_SHFT),
@@ -134,14 +134,14 @@ static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask)
 		if (!(tll_channel_mask & 1<<i))
 			continue;
 
-		omap_writel(omap_readl(OMAP_TLL_CHANNEL_CONF(i)) |
+		__raw_writel(__raw_readl(OMAP_TLL_CHANNEL_CONF(i)) |
 			    (1<<OMAP_TLL_CHANNEL_CONF_CHANEN_SHIFT),
 			    OMAP_TLL_CHANNEL_CONF(i));
 
-		omap_writeb(0xBE, OMAP_TLL_ULPI_SCRATCH_REGISTER(i));
+		__raw_writeb(0xBE, OMAP_TLL_ULPI_SCRATCH_REGISTER(i));
 		dev_dbg(hcd->self.controller, "\nULPI_SCRATCH_REG[ch=%d]"
 			"= 0x%02x\n",
-			i+1, omap_readb(OMAP_TLL_ULPI_SCRATCH_REGISTER(i)));
+			i+1, __raw_readb(OMAP_TLL_ULPI_SCRATCH_REGISTER(i)));
 	}
 }
 
@@ -256,24 +256,24 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd)
 		cpu_relax();
 
 	/* perform TLL soft reset, and wait until reset is complete */
-	omap_writel(1 << OMAP_USBTLL_SYSCONFIG_SOFTRESET_SHIFT,
+	__raw_writel(1 << OMAP_USBTLL_SYSCONFIG_SOFTRESET_SHIFT,
 			OMAP_USBTLL_SYSCONFIG);
 	/* Wait for TLL reset to complete */
-	while (!(omap_readl(OMAP_USBTLL_SYSSTATUS)
+	while (!(__raw_readl(OMAP_USBTLL_SYSSTATUS)
 			& (1 << OMAP_USBTLL_SYSSTATUS_RESETDONE_SHIFT)))
 		cpu_relax();
 
 	dev_dbg(hcd->self.controller, "TLL RESET DONE\n");
 
 	/* (1<<3) = no idle mode only for initial debugging */
-	omap_writel((1 << OMAP_USBTLL_SYSCONFIG_ENAWAKEUP_SHIFT) |
+	__raw_writel((1 << OMAP_USBTLL_SYSCONFIG_ENAWAKEUP_SHIFT) |
 			(1 << OMAP_USBTLL_SYSCONFIG_SIDLEMODE_SHIFT) |
 			(1 << OMAP_USBTLL_SYSCONFIG_CACTIVITY_SHIFT),
 			OMAP_USBTLL_SYSCONFIG);
 
 
 	/* Put UHH in NoIdle/NoStandby mode */
-	omap_writel((0 << OMAP_UHH_SYSCONFIG_AUTOIDLE_SHIFT) |
+	__raw_writel((0 << OMAP_UHH_SYSCONFIG_AUTOIDLE_SHIFT) |
 			(1 << OMAP_UHH_SYSCONFIG_ENAWAKEUP_SHIFT) |
 			(1 << OMAP_UHH_SYSCONFIG_SIDLEMODE_SHIFT) |
 			(1 << OMAP_UHH_SYSCONFIG_CACTIVITY_SHIFT) |
@@ -282,14 +282,14 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd)
 
 #ifdef CONFIG_OMAP_EHCI_PHY_MODE
 	/* Bypass the TLL module for PHY mode operation */
-	omap_writel((0 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)|
+	__raw_writel((0 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR8_BURST_EN_SHIFT)|
 			(1<<OMAP_UHH_HOSTCONFIG_INCR16_BURST_EN_SHIFT)|
 			(0<<OMAP_UHH_HOSTCONFIG_INCRX_ALIGN_EN_SHIFT),
 						OMAP_UHH_HOSTCONFIG);
 	/* Ensure that BYPASS is set */
-	while (omap_readl(OMAP_UHH_HOSTCONFIG)
+	while (__raw_readl(OMAP_UHH_HOSTCONFIG)
 			& (1 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT))
 		cpu_relax();
 
@@ -319,14 +319,14 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd)
 	/* use Port1 VBUS to charge externally Port2:
 	 *	So for PHY mode operation use Port2 only
 	 */
-	omap_writel((0xA << EHCI_INSNREG05_ULPI_REGADD_SHIFT) |/* OTG ctrl reg*/
+	__raw_writel((0xA << EHCI_INSNREG05_ULPI_REGADD_SHIFT) |/* OTG ctrl reg*/
 			(2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) |/*   Write */
 			(1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) |/* Port1 */
 			(1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) |/* Start */
 			(0x26),
 			EHCI_INSNREG05_ULPI);
 
-	while (!(omap_readl(EHCI_INSNREG05_ULPI)
+	while (!(__raw_readl(EHCI_INSNREG05_ULPI)
 			& (1<<EHCI_INSNREG05_ULPI_CONTROL_SHIFT)))
 		cpu_relax();
 
@@ -347,19 +347,19 @@ static void omap_stop_ehc(struct platform_device *dev, struct usb_hcd *hcd)
 	dev_dbg(hcd->self.controller, "stopping TI EHCI USB Controller\n");
 
 	/* Reset OMAP modules for insmod/rmmod to work */
-	omap_writel((1<<1), OMAP_UHH_SYSCONFIG);
-	while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<0)))
+	__raw_writel((1<<1), OMAP_UHH_SYSCONFIG);
+	while (!(__raw_readl(OMAP_UHH_SYSSTATUS) & (1<<0)))
 		cpu_relax();
-	while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<1)))
+	while (!(__raw_readl(OMAP_UHH_SYSSTATUS) & (1<<1)))
 		cpu_relax();
-	while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<2)))
+	while (!(__raw_readl(OMAP_UHH_SYSSTATUS) & (1<<2)))
 		cpu_relax();
 	dev_dbg(hcd->self.controller,
 		"UHH RESET DONE OMAP_UHH_SYSSTATUS %x !!\n",
-			omap_readl(OMAP_UHH_SYSSTATUS));
+			__raw_readl(OMAP_UHH_SYSSTATUS));
 
-	omap_writel((1<<1), OMAP_USBTLL_SYSCONFIG);
-	while (!(omap_readl(OMAP_USBTLL_SYSSTATUS) & (1<<0)))
+	__raw_writel((1<<1), OMAP_USBTLL_SYSCONFIG);
+	while (!(__raw_readl(OMAP_USBTLL_SYSSTATUS) & (1<<0)))
 		cpu_relax();
 	dev_dbg(hcd->self.controller, "TLL RESET DONE\n");
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 42/59] omap: namespace cleanup to drivers/usb/host/ehci-omap.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/host/ehci-omap.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-omap.h b/drivers/usb/host/ehci-omap.h
index 9e4378f..c7566b2 100644
--- a/drivers/usb/host/ehci-omap.h
+++ b/drivers/usb/host/ehci-omap.h
@@ -29,7 +29,7 @@
 
 /*
  * OMAP USBHOST Register addresses: PHYSICAL ADDRESSES
- * 	Use omap_readl()/omap_writel() functions
+ * 	Use __raw_readl()/__raw_writel() functions
  */
 
 /* USBHOST: TLL, UUH, OHCI, EHCI */
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 43/59] omap: namespace cleanup to drivers/usb/host/ohci-omap.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/host/ohci-omap.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 91697bd..fe5a351 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -115,10 +115,10 @@ static int omap_ohci_transceiver_power(int on)
 static int omap_1510_local_bus_power(int on)
 {
 	if (on) {
-		omap_writel((1 << 1) | (1 << 0), OMAP1510_LB_MMU_CTL);
+		__raw_writel((1 << 1) | (1 << 0), OMAP1510_LB_MMU_CTL);
 		udelay(200);
 	} else {
-		omap_writel(0, OMAP1510_LB_MMU_CTL);
+		__raw_writel(0, OMAP1510_LB_MMU_CTL);
 	}
 
 	return 0;
@@ -136,24 +136,24 @@ static int omap_1510_local_bus_init(void)
 	unsigned int tlb;
 	unsigned long lbaddr, physaddr;
 
-	omap_writel((omap_readl(OMAP1510_LB_CLOCK_DIV) & 0xfffffff8) | 0x4,
+	__raw_writel((__raw_readl(OMAP1510_LB_CLOCK_DIV) & 0xfffffff8) | 0x4,
 	       OMAP1510_LB_CLOCK_DIV);
 
 	/* Configure the Local Bus MMU table */
 	for (tlb = 0; tlb < OMAP1510_LB_MEMSIZE; tlb++) {
 		lbaddr = tlb * 0x00100000 + OMAP1510_LB_OFFSET;
 		physaddr = tlb * 0x00100000 + PHYS_OFFSET;
-		omap_writel((lbaddr & 0x0fffffff) >> 22, OMAP1510_LB_MMU_CAM_H);
-		omap_writel(((lbaddr & 0x003ffc00) >> 6) | 0xc,
+		__raw_writel((lbaddr & 0x0fffffff) >> 22, OMAP1510_LB_MMU_CAM_H);
+		__raw_writel(((lbaddr & 0x003ffc00) >> 6) | 0xc,
 		       OMAP1510_LB_MMU_CAM_L);
-		omap_writel(physaddr >> 16, OMAP1510_LB_MMU_RAM_H);
-		omap_writel((physaddr & 0x0000fc00) | 0x300, OMAP1510_LB_MMU_RAM_L);
-		omap_writel(tlb << 4, OMAP1510_LB_MMU_LCK);
-		omap_writel(0x1, OMAP1510_LB_MMU_LD_TLB);
+		__raw_writel(physaddr >> 16, OMAP1510_LB_MMU_RAM_H);
+		__raw_writel((physaddr & 0x0000fc00) | 0x300, OMAP1510_LB_MMU_RAM_L);
+		__raw_writel(tlb << 4, OMAP1510_LB_MMU_LCK);
+		__raw_writel(0x1, OMAP1510_LB_MMU_LD_TLB);
 	}
 
 	/* Enable the walking table */
-	omap_writel(omap_readl(OMAP1510_LB_MMU_CTL) | (1 << 3), OMAP1510_LB_MMU_CTL);
+	__raw_writel(__raw_readl(OMAP1510_LB_MMU_CTL) | (1 << 3), OMAP1510_LB_MMU_CTL);
 	udelay(200);
 
 	return 0;
@@ -176,9 +176,9 @@ static void start_hnp(struct ohci_hcd *ohci)
 	local_irq_save(flags);
 	ohci->transceiver->state = OTG_STATE_A_SUSPEND;
 	writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]);
-	l = omap_readl(OTG_CTRL);
+	l = __raw_readl(OTG_CTRL);
 	l &= ~OTG_A_BUSREQ;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 	local_irq_restore(flags);
 }
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 44/59] omap: namespace cleanup to drivers/usb/musb/omap2430.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/omap2430.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index be4e779..4e18035 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -225,7 +225,7 @@ int __init musb_platform_init(struct musb *musb)
 	musb->xceiv = *x;
 	musb_platform_resume(musb);
 
-	l = omap_readl(OTG_SYSCONFIG);
+	l = __raw_readl(OTG_SYSCONFIG);
 	l &= ~ENABLEWAKEUP;	/* disable wakeup */
 	l &= ~NOSTDBY;		/* remove possible nostdby */
 	l |= SMARTSTDBY;	/* enable smart standby */
@@ -233,17 +233,17 @@ int __init musb_platform_init(struct musb *musb)
 	l &= ~NOIDLE;		/* remove possible noidle */
 	l |= SMARTIDLE;		/* enable smart idle */
 	l |= AUTOIDLE;		/* enable auto idle */
-	omap_writel(l, OTG_SYSCONFIG);
+	__raw_writel(l, OTG_SYSCONFIG);
 
-	l = omap_readl(OTG_INTERFSEL);
+	l = __raw_readl(OTG_INTERFSEL);
 	l |= ULPI_12PIN;
-	omap_writel(l, OTG_INTERFSEL);
+	__raw_writel(l, OTG_INTERFSEL);
 
 	pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, "
 			"sysstatus 0x%x, intrfsel 0x%x, simenable  0x%x\n",
-			omap_readl(OTG_REVISION), omap_readl(OTG_SYSCONFIG),
-			omap_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL),
-			omap_readl(OTG_SIMENABLE));
+			__raw_readl(OTG_REVISION), omap_readl(OTG_SYSCONFIG),
+			__raw_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL),
+			__raw_readl(OTG_SIMENABLE));
 
 	omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1);
 
@@ -266,13 +266,13 @@ int musb_platform_suspend(struct musb *musb)
 		return 0;
 
 	/* in any role */
-	l = omap_readl(OTG_FORCESTDBY);
+	l = __raw_readl(OTG_FORCESTDBY);
 	l |= ENABLEFORCE;	/* enable MSTANDBY */
-	omap_writel(l, OTG_FORCESTDBY);
+	__raw_writel(l, OTG_FORCESTDBY);
 
-	l = omap_readl(OTG_SYSCONFIG);
+	l = __raw_readl(OTG_SYSCONFIG);
 	l |= ENABLEWAKEUP;	/* enable wakeup */
-	omap_writel(l, OTG_SYSCONFIG);
+	__raw_writel(l, OTG_SYSCONFIG);
 
 	if (musb->xceiv.set_suspend)
 		musb->xceiv.set_suspend(&musb->xceiv, 1);
@@ -300,13 +300,13 @@ static int musb_platform_resume(struct musb *musb)
 	else
 		clk_enable(musb->clock);
 
-	l = omap_readl(OTG_SYSCONFIG);
+	l = __raw_readl(OTG_SYSCONFIG);
 	l &= ~ENABLEWAKEUP;	/* disable wakeup */
-	omap_writel(l, OTG_SYSCONFIG);
+	__raw_writel(l, OTG_SYSCONFIG);
 
-	l = omap_readl(OTG_FORCESTDBY);
+	l = __raw_readl(OTG_FORCESTDBY);
 	l &= ~ENABLEFORCE;	/* disable MSTANDBY */
-	omap_writel(l, OTG_FORCESTDBY);
+	__raw_writel(l, OTG_FORCESTDBY);
 
 	return 0;
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 45/59] omap: namespace cleanup to drivers/video/backlight/omap1_bl.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/backlight/omap1_bl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index cbad67e..12d4d50 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -41,12 +41,12 @@ struct omap_backlight {
 
 static void inline omapbl_send_intensity(int intensity)
 {
-	omap_writeb(intensity, OMAP_PWL_ENABLE);
+	__raw_writeb(intensity, OMAP_PWL_ENABLE);
 }
 
 static void inline omapbl_send_enable(int enable)
 {
-	omap_writeb(enable, OMAP_PWL_CLK_ENABLE);
+	__raw_writeb(enable, OMAP_PWL_CLK_ENABLE);
 }
 
 static void omapbl_blank(struct omap_backlight *bl, int mode)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 46/59] omap: namespace cleanup to drivers/video/omap/dispc.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/dispc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index c140c21..07d4076 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -1422,7 +1422,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 	l &= ~((3 << 12) | (3 << 3));
 	l |= (2 << 12) | (2 << 3) | (1 << 2) | (1 << 0);
 	dispc_write_reg(DISPC_SYSCONFIG, l);
-	omap_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG);
+	__raw_writel(1 << 0, DSS_BASE + DSS_SYSCONFIG);
 
 	/* Set functional clock autogating */
 	l = dispc_read_reg(DISPC_CONFIG);
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 47/59] omap: namespace cleanup to drivers/video/omap/lcd_ams_delta.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/lcd_ams_delta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 3fd5342..65afa79 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -51,8 +51,8 @@ static int ams_delta_panel_enable(struct lcd_panel *panel)
 	ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN,
 			AMS_DELTA_LATCH2_LCD_VBLEN);
 
-	omap_writeb(1, OMAP_PWL_CLK_ENABLE);
-	omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE);
+	__raw_writeb(1, OMAP_PWL_CLK_ENABLE);
+	__raw_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE);
 
 	return 0;
 }
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 48/59] omap: namespace cleanup to drivers/video/omap/lcd_osk.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/lcd_osk.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index 379c96d..51fb476 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -43,10 +43,10 @@ static int osk_panel_enable(struct lcd_panel *panel)
 	omap_cfg_reg(PWL);
 
 	/* Enable PWL unit */
-	omap_writeb(0x01, OMAP_PWL_CLK_ENABLE);
+	__raw_writeb(0x01, OMAP_PWL_CLK_ENABLE);
 
 	/* Set PWL level */
-	omap_writeb(0xFF, OMAP_PWL_ENABLE);
+	__raw_writeb(0xFF, OMAP_PWL_ENABLE);
 
 	/* set GPIO2 high (lcd power enabled) */
 	gpio_set_value(2, 1);
@@ -57,10 +57,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, OMAP_PWL_ENABLE);
+	__raw_writeb(0x00, OMAP_PWL_ENABLE);
 
 	/* Disable PWL unit */
-	omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
+	__raw_writeb(0x00, OMAP_PWL_CLK_ENABLE);
 
 	/* set GPIO2 low */
 	gpio_set_value(2, 0);
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 49/59] omap: namespace cleanup to drivers/video/omap/lcd_p2.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/lcd_p2.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/video/omap/lcd_p2.c b/drivers/video/omap/lcd_p2.c
index 8c66bf6..08aed16 100644
--- a/drivers/video/omap/lcd_p2.c
+++ b/drivers/video/omap/lcd_p2.c
@@ -171,14 +171,14 @@ static int p2_panel_enable(struct lcd_panel *panel)
 	omap_set_gpio_dataout(19, 1);
 
 		/* bits 31:28 -> 0  LCD_PXL_15 .. 12 */
-	value = omap_readl(OMAP730_IO_CONF_3) & 0x0FFFFFFF;
-	omap_writel(value, OMAP730_IO_CONF_3);
+	value = __raw_readl(OMAP730_IO_CONF_3) & 0x0FFFFFFF;
+	__raw_writel(value, OMAP730_IO_CONF_3);
 
 		/* bits 19:0 -> 0  LCD_VSYNC, AC, PXL_0, PCLK, HSYNC,
 		**                 PXL_9..1, PXL_10, PXL_11
 		*/
-	value = omap_readl(OMAP730_IO_CONF_4) & 0xFFF00000;
-	omap_writel(value, OMAP730_IO_CONF_4);
+	value = __raw_readl(OMAP730_IO_CONF_4) & 0xFFF00000;
+	__raw_writel(value, OMAP730_IO_CONF_4);
 
 	omap_uwire_configure_mode(0,16);
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 50/59] omap: namespace cleanup to drivers/video/omap/lcdc.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/lcdc.c |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 6e2ea75..5b97526 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -123,7 +123,7 @@ static void set_load_mode(enum lcdc_load_mode mode)
 {
 	u32 l;
 
-	l = omap_readl(OMAP_LCDC_CONTROL);
+	l = __raw_readl(OMAP_LCDC_CONTROL);
 	l &= ~(3 << 20);
 	switch (mode) {
 	case OMAP_LCDC_LOAD_PALETTE:
@@ -137,18 +137,18 @@ static void set_load_mode(enum lcdc_load_mode mode)
 	default:
 		BUG();
 	}
-	omap_writel(l, OMAP_LCDC_CONTROL);
+	__raw_writel(l, OMAP_LCDC_CONTROL);
 }
 
 static void enable_controller(void)
 {
 	u32 l;
 
-	l = omap_readl(OMAP_LCDC_CONTROL);
+	l = __raw_readl(OMAP_LCDC_CONTROL);
 	l |= OMAP_LCDC_CTRL_LCD_EN;
 	l &= ~OMAP_LCDC_IRQ_MASK;
 	l |= lcdc.irq_mask | OMAP_LCDC_IRQ_DONE;	/* enabled IRQs */
-	omap_writel(l, OMAP_LCDC_CONTROL);
+	__raw_writel(l, OMAP_LCDC_CONTROL);
 }
 
 static void disable_controller_async(void)
@@ -156,7 +156,7 @@ static void disable_controller_async(void)
 	u32 l;
 	u32 mask;
 
-	l = omap_readl(OMAP_LCDC_CONTROL);
+	l = __raw_readl(OMAP_LCDC_CONTROL);
 	mask = OMAP_LCDC_CTRL_LCD_EN | OMAP_LCDC_IRQ_MASK;
 	/*
 	 * Preserve the DONE mask, since we still want to get the
@@ -164,7 +164,7 @@ static void disable_controller_async(void)
 	 */
 	mask &= ~OMAP_LCDC_IRQ_DONE;
 	l &= ~mask;
-	omap_writel(l, OMAP_LCDC_CONTROL);
+	__raw_writel(l, OMAP_LCDC_CONTROL);
 }
 
 static void disable_controller(void)
@@ -272,7 +272,7 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 {
 	u32 status;
 
-	status = omap_readl(OMAP_LCDC_STATUS);
+	status = __raw_readl(OMAP_LCDC_STATUS);
 
 	if (status & (OMAP_LCDC_STAT_FUF | OMAP_LCDC_STAT_SYNC_LOST))
 		reset_controller(status);
@@ -285,9 +285,9 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 			 * only when the controller is reenabled and we don't
 			 * want to get more interrupts.
 			 */
-			l = omap_readl(OMAP_LCDC_CONTROL);
+			l = __raw_readl(OMAP_LCDC_CONTROL);
 			l &= ~OMAP_LCDC_IRQ_DONE;
-			omap_writel(l, OMAP_LCDC_CONTROL);
+			__raw_writel(l, OMAP_LCDC_CONTROL);
 			complete(&lcdc.last_frame_complete);
 		}
 		if (status & OMAP_LCDC_STAT_LOADED_PALETTE) {
@@ -307,7 +307,7 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 		    OMAP_LCDC_STAT_LOADED_PALETTE |
 		    OMAP_LCDC_STAT_ABC |
 		    OMAP_LCDC_STAT_LINE_INT);
-	omap_writel(status, OMAP_LCDC_STATUS);
+	__raw_writel(status, OMAP_LCDC_STATUS);
 	return IRQ_HANDLED;
 }
 
@@ -504,7 +504,7 @@ static void inline setup_regs(void)
 	unsigned long lck;
 	int pcd;
 
-	l = omap_readl(OMAP_LCDC_CONTROL);
+	l = __raw_readl(OMAP_LCDC_CONTROL);
 	l &= ~OMAP_LCDC_CTRL_LCD_TFT;
 	l |= is_tft ? OMAP_LCDC_CTRL_LCD_TFT : 0;
 #ifdef CONFIG_MACH_OMAP_PALMTE
@@ -513,26 +513,26 @@ static void inline setup_regs(void)
 		l |= (is_tft && panel->bpp == 8) ? 0x810000 : 0;
 /*	} */
 #endif
-	omap_writel(l, OMAP_LCDC_CONTROL);
+	__raw_writel(l, OMAP_LCDC_CONTROL);
 
-	l = omap_readl(OMAP_LCDC_TIMING2);
+	l = __raw_readl(OMAP_LCDC_TIMING2);
 	l &= ~(((1 << 6) - 1) << 20);
 	l |= (panel->config & OMAP_LCDC_SIGNAL_MASK) << 20;
-	omap_writel(l, OMAP_LCDC_TIMING2);
+	__raw_writel(l, OMAP_LCDC_TIMING2);
 
 	l = panel->x_res - 1;
 	l |= (panel->hsw - 1) << 10;
 	l |= (panel->hfp - 1) << 16;
 	l |= (panel->hbp - 1) << 24;
-	omap_writel(l, OMAP_LCDC_TIMING0);
+	__raw_writel(l, OMAP_LCDC_TIMING0);
 
 	l = panel->y_res - 1;
 	l |= (panel->vsw - 1) << 10;
 	l |= panel->vfp << 16;
 	l |= panel->vbp << 24;
-	omap_writel(l, OMAP_LCDC_TIMING1);
+	__raw_writel(l, OMAP_LCDC_TIMING1);
 
-	l = omap_readl(OMAP_LCDC_TIMING2);
+	l = __raw_readl(OMAP_LCDC_TIMING2);
 	l &= ~0xff;
 
 	lck = clk_get_rate(lcdc.lcd_ck);
@@ -550,7 +550,7 @@ static void inline setup_regs(void)
 	}
 	l |= pcd & 0xff;
 	l |= panel->acb << 8;
-	omap_writel(l, OMAP_LCDC_TIMING2);
+	__raw_writel(l, OMAP_LCDC_TIMING2);
 
 	/* update panel info with the exact clock */
 	panel->pixel_clock = lck / pcd / 1000;
@@ -795,7 +795,7 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode,
 	lcdc.ext_mode = ext_mode;
 
 	l = 0;
-	omap_writel(l, OMAP_LCDC_CONTROL);
+	__raw_writel(l, OMAP_LCDC_CONTROL);
 
 	/* FIXME:
 	 * According to errata some platforms have a clock rate limitiation
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 51/59] omap: namespace cleanup to drivers/video/omap/sossi.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/video/omap/sossi.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index cc697cc..8f1cf66 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -604,16 +604,16 @@ static int sossi_init(struct omapfb_device *fbdev)
 	sossi.fck = fck;
 
 	/* Reset and enable the SoSSI module */
-	l = omap_readl(MOD_CONF_CTRL_1);
+	l = __raw_readl(MOD_CONF_CTRL_1);
 	l |= CONF_SOSSI_RESET_R;
-	omap_writel(l, MOD_CONF_CTRL_1);
+	__raw_writel(l, MOD_CONF_CTRL_1);
 	l &= ~CONF_SOSSI_RESET_R;
-	omap_writel(l, MOD_CONF_CTRL_1);
+	__raw_writel(l, MOD_CONF_CTRL_1);
 
 	clk_enable(sossi.fck);
-	l = omap_readl(ARM_IDLECT2);
+	l = __raw_readl(ARM_IDLECT2);
 	l &= ~(1 << 8);			/* DMACK_REQ */
-	omap_writel(l, ARM_IDLECT2);
+	__raw_writel(l, ARM_IDLECT2);
 
 	l = sossi_read_reg(SOSSI_INIT2_REG);
 	/* Enable and reset the SoSSI block */
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 52/59] omap: namespace cleanup to fs/xfs/linux-2.6/xfs_aops.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 fs/xfs/linux-2.6/xfs_aops.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index a44d68e..64b6805 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -244,7 +244,7 @@ xfs_end_bio_unwritten(
 	if (likely(!ioend->io_error)) {
 		if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) {
 			int error;
-			error = xfs_iomap_write_unwritten(ip, offset, size);
+			error = xfs_i__raw_write_unwritten(ip, offset, size);
 			if (error)
 				ioend->io_error = error;
 		}
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 53/59] omap: namespace cleanup to fs/xfs/xfs_iomap.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 fs/xfs/xfs_iomap.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 67f22b2..40f2a17 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -244,10 +244,10 @@ xfs_iomap(
 		}
 
 		if (flags & (BMAPI_DIRECT|BMAPI_MMAP)) {
-			error = xfs_iomap_write_direct(ip, offset, count, flags,
+			error = xfs_i__raw_write_direct(ip, offset, count, flags,
 						       &imap, &nimaps, nimaps);
 		} else {
-			error = xfs_iomap_write_delay(ip, offset, count, flags,
+			error = xfs_i__raw_write_delay(ip, offset, count, flags,
 						      &imap, &nimaps);
 		}
 		if (!error) {
@@ -267,7 +267,7 @@ xfs_iomap(
 			break;
 		}
 
-		error = xfs_iomap_write_allocate(ip, offset, count,
+		error = xfs_i__raw_write_allocate(ip, offset, count,
 						 &imap, &nimaps);
 		break;
 	}
@@ -388,7 +388,7 @@ xfs_cmn_err_fsblock_zero(
 }
 
 int
-xfs_iomap_write_direct(
+xfs_i__raw_write_direct(
 	xfs_inode_t	*ip,
 	xfs_off_t	offset,
 	size_t		count,
@@ -602,7 +602,7 @@ xfs_iomap_eof_want_preallocate(
 }
 
 int
-xfs_iomap_write_delay(
+xfs_i__raw_write_delay(
 	xfs_inode_t	*ip,
 	xfs_off_t	offset,
 	size_t		count,
@@ -705,7 +705,7 @@ retry:
  * guarantee is that whatever we allocate fills the required range.
  */
 int
-xfs_iomap_write_allocate(
+xfs_i__raw_write_allocate(
 	xfs_inode_t	*ip,
 	xfs_off_t	offset,
 	size_t		count,
@@ -865,7 +865,7 @@ error0:
 }
 
 int
-xfs_iomap_write_unwritten(
+xfs_i__raw_write_unwritten(
 	xfs_inode_t	*ip,
 	xfs_off_t	offset,
 	size_t		count)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 54/59] omap: namespace cleanup to fs/xfs/xfs_iomap.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 fs/xfs/xfs_iomap.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index ee1a0c1..e2bfe91 100644
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -76,12 +76,12 @@ struct xfs_bmbt_irec;
 
 extern int xfs_iomap(struct xfs_inode *, xfs_off_t, ssize_t, int,
 		     struct xfs_iomap *, int *);
-extern int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
+extern int xfs_i__raw_write_direct(struct xfs_inode *, xfs_off_t, size_t,
 				  int, struct xfs_bmbt_irec *, int *, int);
-extern int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
+extern int xfs_i__raw_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
 				 struct xfs_bmbt_irec *, int *);
-extern int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
+extern int xfs_i__raw_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
 				struct xfs_bmbt_irec *, int *);
-extern int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
+extern int xfs_i__raw_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
 
 #endif /* __XFS_IOMAP_H__*/
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 55/59] omap: namespace cleanup to arch/arm/plat-omap/include/mach/mtd-xip.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/mach/mtd-xip.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h
index 39b591f..04f98b9 100644
--- a/arch/arm/plat-omap/include/mach/mtd-xip.h
+++ b/arch/arm/plat-omap/include/mach/mtd-xip.h
@@ -35,7 +35,7 @@ static inline unsigned long xip_omap_mpu_timer_read(int nr)
 }
 
 #define xip_irqpending()	\
-	(omap_readl(OMAP_IH1_ITR) & ~omap_readl(OMAP_IH1_MIR))
+	(__raw_readl(OMAP_IH1_ITR) & ~omap_readl(OMAP_IH1_MIR))
 #define xip_currtime()		(~xip_omap_mpu_timer_read(0))
 
 /*
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 56/59] omap: namespace cleanup to arch/arm/plat-omap/include/mach/pm.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/mach/pm.h |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index e4cf1c5..d87e507 100644
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -171,28 +171,28 @@ extern void omap_serial_wake_trigger(int enable);
 #define omap_serial_wake_trigger(x)	{}
 #endif	/* CONFIG_OMAP_SERIAL_WAKE */
 
-#define ARM_SAVE(x) arm_sleep_save[ARM_SLEEP_SAVE_##x] = omap_readl(x)
-#define ARM_RESTORE(x) omap_writel((arm_sleep_save[ARM_SLEEP_SAVE_##x]), (x))
+#define ARM_SAVE(x) arm_sleep_save[ARM_SLEEP_SAVE_##x] = __raw_readl(x)
+#define ARM_RESTORE(x) __raw_writel((arm_sleep_save[ARM_SLEEP_SAVE_##x]), (x))
 #define ARM_SHOW(x) arm_sleep_save[ARM_SLEEP_SAVE_##x]
 
 #define DSP_SAVE(x) dsp_sleep_save[DSP_SLEEP_SAVE_##x] = __raw_readw(x)
 #define DSP_RESTORE(x) __raw_writew((dsp_sleep_save[DSP_SLEEP_SAVE_##x]), (x))
 #define DSP_SHOW(x) dsp_sleep_save[DSP_SLEEP_SAVE_##x]
 
-#define ULPD_SAVE(x) ulpd_sleep_save[ULPD_SLEEP_SAVE_##x] = omap_readw(x)
-#define ULPD_RESTORE(x) omap_writew((ulpd_sleep_save[ULPD_SLEEP_SAVE_##x]), (x))
+#define ULPD_SAVE(x) ulpd_sleep_save[ULPD_SLEEP_SAVE_##x] = __raw_readw(x)
+#define ULPD_RESTORE(x) __raw_writew((ulpd_sleep_save[ULPD_SLEEP_SAVE_##x]), (x))
 #define ULPD_SHOW(x) ulpd_sleep_save[ULPD_SLEEP_SAVE_##x]
 
-#define MPUI730_SAVE(x) mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x] = omap_readl(x)
-#define MPUI730_RESTORE(x) omap_writel((mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x]), (x))
+#define MPUI730_SAVE(x) mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x] = __raw_readl(x)
+#define MPUI730_RESTORE(x) __raw_writel((mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x]), (x))
 #define MPUI730_SHOW(x) mpui730_sleep_save[MPUI730_SLEEP_SAVE_##x]
 
-#define MPUI1510_SAVE(x) mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x] = omap_readl(x)
-#define MPUI1510_RESTORE(x) omap_writel((mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x]), (x))
+#define MPUI1510_SAVE(x) mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x] = __raw_readl(x)
+#define MPUI1510_RESTORE(x) __raw_writel((mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x]), (x))
 #define MPUI1510_SHOW(x) mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_##x]
 
-#define MPUI1610_SAVE(x) mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x] = omap_readl(x)
-#define MPUI1610_RESTORE(x) omap_writel((mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x]), (x))
+#define MPUI1610_SAVE(x) mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x] = __raw_readl(x)
+#define MPUI1610_RESTORE(x) __raw_writel((mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x]), (x))
 #define MPUI1610_SHOW(x) mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_##x]
 
 /*
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 57/59] omap: namespace cleanup to arch/arm/plat-omap/include/mach/system.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/mach/system.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/system.h b/arch/arm/plat-omap/include/mach/system.h
index e9b9563..f975d6f 100644
--- a/arch/arm/plat-omap/include/mach/system.h
+++ b/arch/arm/plat-omap/include/mach/system.h
@@ -27,15 +27,15 @@ static inline void omap1_arch_reset(char mode)
 	 * "Global Software Reset Affects Traffic Controller Frequency".
 	 */
 	if (cpu_is_omap5912()) {
-		omap_writew(omap_readw(DPLL_CTL) & ~(1 << 4),
+		__raw_writew(__raw_readw(DPLL_CTL) & ~(1 << 4),
 				 DPLL_CTL);
-		omap_writew(0x8, ARM_RSTCT1);
+		__raw_writew(0x8, ARM_RSTCT1);
 	}
 
 	if (machine_is_voiceblue())
 		voiceblue_reset();
 	else
-		omap_writew(1, ARM_RSTCT1);
+		__raw_writew(1, ARM_RSTCT1);
 }
 
 static inline void arch_reset(char mode)
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 58/59] omap: namespace cleanup to arch/arm/plat-omap/include/mach/tc.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/mach/tc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/tc.h b/arch/arm/plat-omap/include/mach/tc.h
index d2fcd78..1706023 100644
--- a/arch/arm/plat-omap/include/mach/tc.h
+++ b/arch/arm/plat-omap/include/mach/tc.h
@@ -91,13 +91,13 @@
  */
 static inline u32 omap_cs0_phys(void)
 {
-	return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)
+	return (__raw_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)
 			?  OMAP_CS3_PHYS : 0;
 }
 
 static inline u32 omap_cs3_phys(void)
 {
-	return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)
+	return (__raw_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)
 			? 0 : OMAP_CS3_PHYS;
 }
 
-- 
1.6.0.2.307.gc427

[rft/rfc/patch-2.6.28-rc3+ 59/59] omap: namespace cleanup to arch/arm/plat-omap/include/mach/io.h

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/mach/io.h |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h
index ea55267..041fa30 100644
--- a/arch/arm/plat-omap/include/mach/io.h
+++ b/arch/arm/plat-omap/include/mach/io.h
@@ -170,23 +170,6 @@
 #else
 #define IOMEM(x)		((void __force __iomem *)(x))
 
-/*
- * Functions to access the OMAP IO region
- *
- * NOTE: - Use omap_read/write[bwl] for physical register addresses
- *	 - Use __raw_read/write[bwl]() for virtual register addresses
- *	 - Use IO_ADDRESS(phys_addr) to convert registers to virtual addresses
- *	 - DO NOT use hardcoded virtual addresses to allow changing the
- *	   IO address space again if needed
- */
-#define omap_readb(a)		__raw_readb(IO_ADDRESS(a))
-#define omap_readw(a)		__raw_readw(IO_ADDRESS(a))
-#define omap_readl(a)		__raw_readl(IO_ADDRESS(a))
-
-#define omap_writeb(v,a)	__raw_writeb(v, IO_ADDRESS(a))
-#define omap_writew(v,a)	__raw_writew(v, IO_ADDRESS(a))
-#define omap_writel(v,a)	__raw_writel(v, IO_ADDRESS(a))
-
 struct omap_sdrc_params;
 
 extern void omap1_map_common_io(void);
-- 
1.6.0.2.307.gc427

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Felipe Balbi]

On Wed, Nov 12, 2008 at 12:56:19AM +0200, Felipe Balbi wrote:
> From: Felipe Balbi <felipe.balbi@nokia.com>
> 
> Get rid of omap_{read,write}[bsl] defines.
> Virtual and physical addresses usage was fixed by Russel King and
> there's no need anymore for keeping a define to a standard kernel
> function. Get rid of those to keep the namespace cleaner.
> 
> Build tested with all omap defconfigs.
> Depends on my previous "make clk fwk build again on omap1" patch.

BTW, for the drivers, after I get Tony's s-o-b, I'll see which drivers
are already in mainline and send the patches via the proper maintainers
to avoid "forking" the code again.

-- 
balbi

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Felipe Balbi]

On Wed, Nov 12, 2008 at 12:56:19AM +0200, Felipe Balbi wrote:
> From: Felipe Balbi <felipe.balbi@nokia.com>
> 
> Get rid of omap_{read,write}[bsl] defines.
> Virtual and physical addresses usage was fixed by Russel King and
> there's no need anymore for keeping a define to a standard kernel
> function. Get rid of those to keep the namespace cleaner.
> 
> Build tested with all omap defconfigs.
> Depends on my previous "make clk fwk build again on omap1" patch.

for convinience, these patches plus the clock fix for omap1 and the mmc
fix are available at [1]

[1] http://felipebalbi.com/patches/omap/linux-omap-20081112.tar.gz

-- 
balbi

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [081111 15:22]:
> On Wed, Nov 12, 2008 at 12:56:19AM +0200, Felipe Balbi wrote:
> > From: Felipe Balbi <felipe.balbi@nokia.com>
> > 
> > Get rid of omap_{read,write}[bsl] defines.
> > Virtual and physical addresses usage was fixed by Russel King and
> > there's no need anymore for keeping a define to a standard kernel
> > function. Get rid of those to keep the namespace cleaner.
> > 
> > Build tested with all omap defconfigs.
> > Depends on my previous "make clk fwk build again on omap1" patch.
> 
> for convinience, these patches plus the clock fix for omap1 and the mmc
> fix are available at [1]

Felipe, have you tested any of these? To me looks like you're missing
the associated ioremap before you can use __raw_read/write instead of
omap_read/write.

Tony

> [1] http://felipebalbi.com/patches/omap/linux-omap-20081112.tar.gz

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Felipe Balbi]

On Tue, Nov 11, 2008 at 03:47:13PM -0800, Tony Lindgren wrote:
> * Felipe Balbi <me@felipebalbi.com> [081111 15:22]:
> > On Wed, Nov 12, 2008 at 12:56:19AM +0200, Felipe Balbi wrote:
> > > From: Felipe Balbi <felipe.balbi@nokia.com>
> > > 
> > > Get rid of omap_{read,write}[bsl] defines.
> > > Virtual and physical addresses usage was fixed by Russel King and
> > > there's no need anymore for keeping a define to a standard kernel
> > > function. Get rid of those to keep the namespace cleaner.
> > > 
> > > Build tested with all omap defconfigs.
> > > Depends on my previous "make clk fwk build again on omap1" patch.
> > 
> > for convinience, these patches plus the clock fix for omap1 and the mmc
> > fix are available at [1]
> 
> Felipe, have you tested any of these? To me looks like you're missing
> the associated ioremap before you can use __raw_read/write instead of
> omap_read/write.

You're right, I should at least use __raw_read/write(IO_ADDRESS(...));

I'll fix it by tomorrow and test on omap3.

-- 
balbi

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [081111 15:50]:
> On Tue, Nov 11, 2008 at 03:47:13PM -0800, Tony Lindgren wrote:
> > * Felipe Balbi <me@felipebalbi.com> [081111 15:22]:
> > > On Wed, Nov 12, 2008 at 12:56:19AM +0200, Felipe Balbi wrote:
> > > > From: Felipe Balbi <felipe.balbi@nokia.com>
> > > > 
> > > > Get rid of omap_{read,write}[bsl] defines.
> > > > Virtual and physical addresses usage was fixed by Russel King and
> > > > there's no need anymore for keeping a define to a standard kernel
> > > > function. Get rid of those to keep the namespace cleaner.
> > > > 
> > > > Build tested with all omap defconfigs.
> > > > Depends on my previous "make clk fwk build again on omap1" patch.
> > > 
> > > for convinience, these patches plus the clock fix for omap1 and the mmc
> > > fix are available at [1]
> > 
> > Felipe, have you tested any of these? To me looks like you're missing
> > the associated ioremap before you can use __raw_read/write instead of
> > omap_read/write.
> 
> You're right, I should at least use __raw_read/write(IO_ADDRESS(...));

Adding the IO_ADDRESS there is the wrong fix though, let's rather keep
what we have.

> I'll fix it by tomorrow and test on omap3.

How about we convert them one at a time to use ioremap +
__raw_read/write instead?

Pretty much the only place where ioremap cannot be used is in sram.c,
and that has a comment about it. And clock fwk stuff we should not
mess with right now.

Cheers,

Tony

Re: [rft/rfc/patch-2.6.28-rc3+ 00/59] namespace cleanup patches

[stanley.miao]

If you are using git-send-email, please provide the --no-chain-reply-to
option to avoid creating exceptionally deep nesting.

Stanley.

On Wed, 2008-11-12 at 00:56 +0200, Felipe Balbi wrote:
> From: Felipe Balbi <felipe.balbi@nokia.com>
> 
> Get rid of omap_{read,write}[bsl] defines.
> Virtual and physical addresses usage was fixed by Russel King and
> there's no need anymore for keeping a define to a standard kernel
> function. Get rid of those to keep the namespace cleaner.
> 
> Build tested with all omap defconfigs.
> Depends on my previous "make clk fwk build again on omap1" patch.