Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a5bee307
Commit
a5bee307
authored
Feb 28, 2012
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'iomap' into cleanup
parents
0aac8812
acea7c7b
Changes
93
Hide whitespace changes
Inline
Side-by-side
Showing
93 changed files
with
444 additions
and
270 deletions
+444
-270
arch/arm/mach-omap1/ams-delta-fiq-handler.S
arch/arm/mach-omap1/ams-delta-fiq-handler.S
+2
-1
arch/arm/mach-omap1/ams-delta-fiq.c
arch/arm/mach-omap1/ams-delta-fiq.c
+1
-0
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-ams-delta.c
+6
-4
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-fsample.c
+5
-2
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h2.c
+3
-3
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-h3.c
+4
-4
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap1/board-htcherald.c
+2
-3
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-innovator.c
+5
-2
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-nokia770.c
+4
-2
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-osk.c
+3
-4
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmte.c
+3
-1
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmtt.c
+5
-4
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-palmz71.c
+5
-4
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-perseus2.c
+5
-2
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-sx1.c
+4
-2
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/board-voiceblue.c
+4
-2
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap1/clock.c
+4
-1
arch/arm/mach-omap1/clock_data.c
arch/arm/mach-omap1/clock_data.c
+4
-1
arch/arm/mach-omap1/common.h
arch/arm/mach-omap1/common.h
+1
-0
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/devices.c
+4
-4
arch/arm/mach-omap1/dma.c
arch/arm/mach-omap1/dma.c
+1
-1
arch/arm/mach-omap1/flash.c
arch/arm/mach-omap1/flash.c
+3
-1
arch/arm/mach-omap1/fpga.c
arch/arm/mach-omap1/fpga.c
+4
-1
arch/arm/mach-omap1/gpio16xx.c
arch/arm/mach-omap1/gpio16xx.c
+7
-0
arch/arm/mach-omap1/id.c
arch/arm/mach-omap1/id.c
+3
-0
arch/arm/mach-omap1/include/mach/entry-macro.S
arch/arm/mach-omap1/include/mach/entry-macro.S
+3
-1
arch/arm/mach-omap1/include/mach/hardware.h
arch/arm/mach-omap1/include/mach/hardware.h
+36
-0
arch/arm/mach-omap1/include/mach/io.h
arch/arm/mach-omap1/include/mach/io.h
+42
-1
arch/arm/mach-omap1/include/mach/memory.h
arch/arm/mach-omap1/include/mach/memory.h
+2
-1
arch/arm/mach-omap1/io.c
arch/arm/mach-omap1/io.c
+3
-0
arch/arm/mach-omap1/iomap.h
arch/arm/mach-omap1/iomap.h
+42
-0
arch/arm/mach-omap1/irq.c
arch/arm/mach-omap1/irq.c
+3
-1
arch/arm/mach-omap1/lcd_dma.c
arch/arm/mach-omap1/lcd_dma.c
+2
-1
arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap1/mcbsp.c
+4
-1
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap1/pm.c
+3
-1
arch/arm/mach-omap1/reset.c
arch/arm/mach-omap1/reset.c
+2
-1
arch/arm/mach-omap1/sleep.S
arch/arm/mach-omap1/sleep.S
+4
-0
arch/arm/mach-omap1/sram.S
arch/arm/mach-omap1/sram.S
+4
-0
arch/arm/mach-omap1/time.c
arch/arm/mach-omap1/time.c
+2
-1
arch/arm/mach-omap1/timer32k.c
arch/arm/mach-omap1/timer32k.c
+5
-2
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+1
-0
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/clkt_dpll.c
+1
-0
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock2420_data.c
+3
-0
arch/arm/mach-omap2/clock2430.c
arch/arm/mach-omap2/clock2430.c
+2
-0
arch/arm/mach-omap2/clock2430_data.c
arch/arm/mach-omap2/clock2430_data.c
+2
-0
arch/arm/mach-omap2/clock2xxx.c
arch/arm/mach-omap2/clock2xxx.c
+1
-0
arch/arm/mach-omap2/clock3xxx.c
arch/arm/mach-omap2/clock3xxx.c
+1
-0
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock3xxx_data.c
+2
-1
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/clock44xx_data.c
+3
-0
arch/arm/mach-omap2/cm2xxx_3xxx.c
arch/arm/mach-omap2/cm2xxx_3xxx.c
+1
-1
arch/arm/mach-omap2/cm44xx.c
arch/arm/mach-omap2/cm44xx.c
+1
-1
arch/arm/mach-omap2/cminst44xx.c
arch/arm/mach-omap2/cminst44xx.c
+1
-1
arch/arm/mach-omap2/common.c
arch/arm/mach-omap2/common.c
+2
-2
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/common.h
+7
-0
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.c
+2
-1
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/control.h
+0
-1
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/devices.c
+1
-1
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/display.c
+1
-0
arch/arm/mach-omap2/emu.c
arch/arm/mach-omap2/emu.c
+2
-0
arch/arm/mach-omap2/gpmc-nand.c
arch/arm/mach-omap2/gpmc-nand.c
+1
-0
arch/arm/mach-omap2/gpmc-onenand.c
arch/arm/mach-omap2/gpmc-onenand.c
+1
-0
arch/arm/mach-omap2/include/mach/io.h
arch/arm/mach-omap2/include/mach/io.h
+45
-1
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/io.c
+7
-50
arch/arm/mach-omap2/iomap.h
arch/arm/mach-omap2/iomap.h
+3
-77
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/irq.c
+4
-1
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-omap2/omap-smp.c
+2
-1
arch/arm/mach-omap2/opp2420_data.c
arch/arm/mach-omap2/opp2420_data.c
+2
-0
arch/arm/mach-omap2/opp2430_data.c
arch/arm/mach-omap2/opp2430_data.c
+2
-0
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm24xx.c
+3
-24
arch/arm/mach-omap2/prcm_mpu44xx.c
arch/arm/mach-omap2/prcm_mpu44xx.c
+1
-1
arch/arm/mach-omap2/prm44xx.c
arch/arm/mach-omap2/prm44xx.c
+2
-1
arch/arm/mach-omap2/prminst44xx.c
arch/arm/mach-omap2/prminst44xx.c
+1
-1
arch/arm/mach-omap2/sdram-nokia.c
arch/arm/mach-omap2/sdram-nokia.c
+0
-1
arch/arm/mach-omap2/sdrc2xxx.c
arch/arm/mach-omap2/sdrc2xxx.c
+3
-2
arch/arm/mach-omap2/sleep24xx.S
arch/arm/mach-omap2/sleep24xx.S
+0
-1
arch/arm/mach-omap2/sleep34xx.S
arch/arm/mach-omap2/sleep34xx.S
+4
-1
arch/arm/mach-omap2/sram242x.S
arch/arm/mach-omap2/sram242x.S
+3
-1
arch/arm/mach-omap2/sram243x.S
arch/arm/mach-omap2/sram243x.S
+3
-1
arch/arm/mach-omap2/sram34xx.S
arch/arm/mach-omap2/sram34xx.S
+3
-2
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-omap/counter_32k.c
+1
-0
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/dma.c
+2
-0
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/dmtimer.c
+2
-0
arch/arm/plat-omap/include/plat/hardware.h
arch/arm/plat-omap/include/plat/hardware.h
+6
-0
arch/arm/plat-omap/include/plat/keypad.h
arch/arm/plat-omap/include/plat/keypad.h
+2
-0
arch/arm/plat-omap/include/plat/tc.h
arch/arm/plat-omap/include/plat/tc.h
+0
-17
arch/arm/plat-omap/include/plat/usb.h
arch/arm/plat-omap/include/plat/usb.h
+41
-0
arch/arm/plat-omap/mux.c
arch/arm/plat-omap/mux.c
+4
-1
arch/arm/plat-omap/sram.c
arch/arm/plat-omap/sram.c
+4
-5
arch/arm/plat-omap/usb.c
arch/arm/plat-omap/usb.c
+4
-0
drivers/char/hw_random/omap-rng.c
drivers/char/hw_random/omap-rng.c
+2
-0
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-omap.c
+0
-7
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dispc.c
+0
-5
drivers/video/omap2/dss/dss.c
drivers/video/omap2/dss/dss.c
+3
-0
No files found.
arch/arm/mach-omap1/ams-delta-fiq-handler.S
View file @
a5bee307
...
@@ -15,11 +15,12 @@
...
@@ -15,11 +15,12 @@
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <plat/io.h>
#include <plat/board-ams-delta.h>
#include <plat/board-ams-delta.h>
#include <mach/ams-delta-fiq.h>
#include <mach/ams-delta-fiq.h>
#include "iomap.h"
/*
/*
*
GPIO
related
definitions
,
copied
from
arch
/
arm
/
plat
-
omap
/
gpio
.
c
.
*
GPIO
related
definitions
,
copied
from
arch
/
arm
/
plat
-
omap
/
gpio
.
c
.
*
Unfortunately
,
those
were
not
placed
in
a
separate
header
file
.
*
Unfortunately
,
those
were
not
placed
in
a
separate
header
file
.
...
...
arch/arm/mach-omap1/ams-delta-fiq.c
View file @
a5bee307
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <plat/board-ams-delta.h>
#include <plat/board-ams-delta.h>
#include <asm/fiq.h>
#include <asm/fiq.h>
#include <mach/ams-delta-fiq.h>
#include <mach/ams-delta-fiq.h>
static
struct
fiq_handler
fh
=
{
static
struct
fiq_handler
fh
=
{
...
...
arch/arm/mach-omap1/board-ams-delta.c
View file @
a5bee307
...
@@ -20,25 +20,27 @@
...
@@ -20,25 +20,27 @@
#include <linux/platform_device.h>
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <linux/serial_8250.h>
#include <linux/export.h>
#include <linux/export.h>
#include <linux/io.h>
#include <media/soc_camera.h>
#include <media/soc_camera.h>
#include <asm/serial.h>
#include <asm/serial.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/io.h>
#include <plat/board-ams-delta.h>
#include <plat/board-ams-delta.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/board.h>
#include "common.h"
#include <mach/camera.h>
#include <mach/hardware.h>
#include <mach/ams-delta-fiq.h>
#include <mach/ams-delta-fiq.h>
#include <mach/camera.h>
#include "iomap.h"
#include "common.h"
static
u8
ams_delta_latch1_reg
;
static
u8
ams_delta_latch1_reg
;
static
u16
ams_delta_latch2_reg
;
static
u16
ams_delta_latch2_reg
;
...
...
arch/arm/mach-omap1/board-fsample.c
View file @
a5bee307
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
#include <linux/input.h>
#include <linux/input.h>
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -32,9 +31,13 @@
...
@@ -32,9 +31,13 @@
#include <plat/flash.h>
#include <plat/flash.h>
#include <plat/fpga.h>
#include <plat/fpga.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
/* fsample is pretty close to p2-sample */
/* fsample is pretty close to p2-sample */
#define fsample_cpld_read(reg) __raw_readb(reg)
#define fsample_cpld_read(reg) __raw_readb(reg)
...
...
arch/arm/mach-omap1/board-h2.c
View file @
a5bee307
...
@@ -31,8 +31,6 @@
...
@@ -31,8 +31,6 @@
#include <linux/i2c/tps65010.h>
#include <linux/i2c/tps65010.h>
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -43,9 +41,11 @@
...
@@ -43,9 +41,11 @@
#include <plat/irda.h>
#include <plat/irda.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <plat/flash.h>
#include <plat/flash.h>
#include <mach/hardware.h>
#include "common.h"
#include "board-h2.h"
#include "board-h2.h"
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
...
...
arch/arm/mach-omap1/board-h3.c
View file @
a5bee307
...
@@ -33,21 +33,21 @@
...
@@ -33,21 +33,21 @@
#include <asm/setup.h>
#include <asm/setup.h>
#include <asm/page.h>
#include <asm/page.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <mach/irqs.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include "common.h"
#include <plat/flash.h>
#include <plat/flash.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include "common.h"
#include "board-h3.h"
#include "board-h3.h"
/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
...
...
arch/arm/mach-omap1/board-htcherald.c
View file @
a5bee307
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <linux/init.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/input.h>
#include <linux/
io
.h>
#include <linux/
delay
.h>
#include <linux/gpio.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
#include <linux/gpio_keys.h>
#include <linux/i2c.h>
#include <linux/i2c.h>
...
@@ -41,7 +41,6 @@
...
@@ -41,7 +41,6 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <plat/omap7xx.h>
#include <plat/omap7xx.h>
#include "common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
@@ -49,7 +48,7 @@
...
@@ -49,7 +48,7 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include
<linux/delay.h>
#include
"common.h"
/* LCD register definition */
/* LCD register definition */
#define OMAP_LCDC_CONTROL (0xfffec000 + 0x00)
#define OMAP_LCDC_CONTROL (0xfffec000 + 0x00)
...
...
arch/arm/mach-omap1/board-innovator.c
View file @
a5bee307
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#include <linux/input.h>
#include <linux/input.h>
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -37,9 +36,13 @@
...
@@ -37,9 +36,13 @@
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <plat/mmc.h>
#include <plat/mmc.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
#define INNOVATOR1610_ETHR_START 0x04000300
#define INNOVATOR1610_ETHR_START 0x04000300
...
...
arch/arm/mach-omap1/board-nokia770.c
View file @
a5bee307
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
#include <linux/workqueue.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/delay.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -30,12 +29,15 @@
...
@@ -30,12 +29,15 @@
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <plat/hwa742.h>
#include <plat/hwa742.h>
#include <plat/lcd_mipid.h>
#include <plat/lcd_mipid.h>
#include <plat/mmc.h>
#include <plat/mmc.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <mach/hardware.h>
#include "common.h"
#define ADS7846_PENDOWN_GPIO 15
#define ADS7846_PENDOWN_GPIO 15
static
const
unsigned
int
nokia770_keymap
[]
=
{
static
const
unsigned
int
nokia770_keymap
[]
=
{
...
...
arch/arm/mach-omap1/board-osk.c
View file @
a5bee307
...
@@ -34,15 +34,11 @@
...
@@ -34,15 +34,11 @@
#include <linux/i2c.h>
#include <linux/i2c.h>
#include <linux/leds.h>
#include <linux/leds.h>
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/physmap.h>
#include <linux/i2c/tps65010.h>
#include <linux/i2c/tps65010.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -51,6 +47,9 @@
...
@@ -51,6 +47,9 @@
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include <mach/hardware.h>
#include "common.h"
#include "common.h"
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */
...
...
arch/arm/mach-omap1/board-palmte.c
View file @
a5bee307
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/apm-emulation.h>
#include <linux/apm-emulation.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -41,6 +40,9 @@
...
@@ -41,6 +40,9 @@
#include <plat/board.h>
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <mach/hardware.h>
#include "common.h"
#include "common.h"
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USBDETECT_GPIO 0
...
...
arch/arm/mach-omap1/board-palmtt.c
View file @
a5bee307
...
@@ -24,8 +24,9 @@
...
@@ -24,8 +24,9 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/physmap.h>
#include <linux/leds.h>
#include <linux/leds.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -39,10 +40,10 @@
...
@@ -39,10 +40,10 @@
#include <plat/board.h>
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <linux/spi/spi.h>
#include <mach/hardware.h>
#include <linux/spi/ads7846.h>
#include "common.h"
#define PALMTT_USBDETECT_GPIO 0
#define PALMTT_USBDETECT_GPIO 0
#define PALMTT_CABLE_GPIO 1
#define PALMTT_CABLE_GPIO 1
...
...
arch/arm/mach-omap1/board-palmz71.c
View file @
a5bee307
...
@@ -27,8 +27,9 @@
...
@@ -27,8 +27,9 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/physmap.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -41,10 +42,10 @@
...
@@ -41,10 +42,10 @@
#include <plat/board.h>
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <linux/spi/spi.h>
#include <mach/hardware.h>
#include <linux/spi/ads7846.h>
#include "common.h"
#define PALMZ71_USBDETECT_GPIO 0
#define PALMZ71_USBDETECT_GPIO 0
#define PALMZ71_PENIRQ_GPIO 6
#define PALMZ71_PENIRQ_GPIO 6
...
...
arch/arm/mach-omap1/board-perseus2.c
View file @
a5bee307
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
#include <linux/input.h>
#include <linux/input.h>
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -32,9 +31,13 @@
...
@@ -32,9 +31,13 @@
#include <plat/fpga.h>
#include <plat/fpga.h>
#include <plat/flash.h>
#include <plat/flash.h>
#include <plat/keypad.h>
#include <plat/keypad.h>
#include "common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
static
const
unsigned
int
p2_keymap
[]
=
{
static
const
unsigned
int
p2_keymap
[]
=
{
KEY
(
0
,
0
,
KEY_UP
),
KEY
(
0
,
0
,
KEY_UP
),
KEY
(
1
,
0
,
KEY_RIGHT
),
KEY
(
1
,
0
,
KEY_RIGHT
),
...
...
arch/arm/mach-omap1/board-sx1.c
View file @
a5bee307
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#include <linux/errno.h>
#include <linux/errno.h>
#include <linux/export.h>
#include <linux/export.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
...
@@ -40,10 +39,13 @@
...
@@ -40,10 +39,13 @@
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/board.h>
#include "common.h"
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <plat/board-sx1.h>
#include <plat/board-sx1.h>
#include <mach/hardware.h>
#include "common.h"
/* Write to I2C device */
/* Write to I2C device */
int
sx1_i2c_write_byte
(
u8
devaddr
,
u8
regoffset
,
u8
value
)
int
sx1_i2c_write_byte
(
u8
devaddr
,
u8
regoffset
,
u8
value
)
{
{
...
...
arch/arm/mach-omap1/board-voiceblue.c
View file @
a5bee307
...
@@ -27,18 +27,20 @@
...
@@ -27,18 +27,20 @@
#include <linux/smc91x.h>
#include <linux/smc91x.h>
#include <linux/export.h>
#include <linux/export.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board-voiceblue.h>
#include <plat/board-voiceblue.h>
#include "common.h"
#include <plat/flash.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <mach/hardware.h>
#include "common.h"
static
struct
plat_serial8250_port
voiceblue_ports
[]
=
{
static
struct
plat_serial8250_port
voiceblue_ports
[]
=
{
{
{
.
mapbase
=
(
unsigned
long
)(
OMAP_CS1_PHYS
+
0x40000
),
.
mapbase
=
(
unsigned
long
)(
OMAP_CS1_PHYS
+
0x40000
),
...
...
arch/arm/mach-omap1/clock.c
View file @
a5bee307
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
#include <linux/list.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/clkdev.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
...
@@ -27,6 +27,9 @@
...
@@ -27,6 +27,9 @@
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/clkdev_omap.h>
#include <plat/clkdev_omap.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "opp.h"
#include "opp.h"
...
...
arch/arm/mach-omap1/clock_data.c
View file @
a5bee307
...
@@ -15,10 +15,10 @@
...
@@ -15,10 +15,10 @@
*/
*/
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/cpufreq.h>
#include <linux/cpufreq.h>
#include <linux/delay.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <asm/mach-types.h>
/* for machine_is_* */
#include <asm/mach-types.h>
/* for machine_is_* */
...
@@ -28,6 +28,9 @@
...
@@ -28,6 +28,9 @@
#include <plat/sram.h>
/* for omap_sram_reprogram_clock() */
#include <plat/sram.h>
/* for omap_sram_reprogram_clock() */
#include <plat/usb.h>
/* for OTG_BASE */
#include <plat/usb.h>
/* for OTG_BASE */
#include <mach/hardware.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
/* Some ARM_IDLECT1 bit shifts - used in struct arm_idlect1_clk */
/* Some ARM_IDLECT1 bit shifts - used in struct arm_idlect1_clk */
...
...
arch/arm/mach-omap1/common.h
View file @
a5bee307
...
@@ -58,5 +58,6 @@ void omap1_restart(char, const char *);
...
@@ -58,5 +58,6 @@ void omap1_restart(char, const char *);
extern
struct
sys_timer
omap1_timer
;
extern
struct
sys_timer
omap1_timer
;
extern
bool
omap_32k_timer_init
(
void
);
extern
bool
omap_32k_timer_init
(
void
);
extern
void
__init
omap_init_consistent_dma_size
(
void
);
#endif
/* __ARCH_ARM_MACH_OMAP1_COMMON_H */
#endif
/* __ARCH_ARM_MACH_OMAP1_COMMON_H */
arch/arm/mach-omap1/devices.c
View file @
a5bee307
...
@@ -15,14 +15,10 @@
...
@@ -15,14 +15,10 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi.h>
#include <mach/camera.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include "common.h"
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/mux.h>
#include <plat/mux.h>
...
@@ -30,6 +26,10 @@
...
@@ -30,6 +26,10 @@
#include <plat/omap7xx.h>
#include <plat/omap7xx.h>
#include <plat/mcbsp.h>
#include <plat/mcbsp.h>
#include <mach/camera.h>
#include <mach/hardware.h>
#include "common.h"
#include "clock.h"
#include "clock.h"
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
...
...
arch/arm/mach-omap1/dma.c
View file @
a5bee307
...
@@ -19,11 +19,11 @@
...
@@ -19,11 +19,11 @@
*/
*/
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/device.h>
#include <linux/io.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/tc.h>
#include <plat/tc.h>
...
...
arch/arm/mach-omap1/flash.c
View file @
a5bee307
...
@@ -6,13 +6,15 @@
...
@@ -6,13 +6,15 @@
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*/
*/
#include <linux/io.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/map.h>
#include <plat/io.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include <plat/flash.h>
#include <plat/flash.h>
#include <mach/hardware.h>
void
omap1_set_vpp
(
struct
platform_device
*
pdev
,
int
enable
)
void
omap1_set_vpp
(
struct
platform_device
*
pdev
,
int
enable
)
{
{
static
int
count
;
static
int
count
;
...
...
arch/arm/mach-omap1/fpga.c
View file @
a5bee307
...
@@ -24,12 +24,15 @@
...
@@ -24,12 +24,15 @@
#include <linux/errno.h>
#include <linux/errno.h>
#include <linux/io.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <plat/fpga.h>
#include <plat/fpga.h>
#include <mach/hardware.h>
#include "iomap.h"
static
void
fpga_mask_irq
(
struct
irq_data
*
d
)
static
void
fpga_mask_irq
(
struct
irq_data
*
d
)
{
{
unsigned
int
irq
=
d
->
irq
-
OMAP_FPGA_IRQ_BASE
;
unsigned
int
irq
=
d
->
irq
-
OMAP_FPGA_IRQ_BASE
;
...
...
arch/arm/mach-omap1/gpio16xx.c
View file @
a5bee307
...
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
...
@@ -218,6 +218,13 @@ static int __init omap16xx_gpio_init(void)
if
(
!
cpu_is_omap16xx
())
if
(
!
cpu_is_omap16xx
())
return
-
EINVAL
;
return
-
EINVAL
;
/*
* Enable system clock for GPIO module.
* The CAM_CLK_CTRL *is* really the right place.
*/
omap_writel
(
omap_readl
(
ULPD_CAM_CLK_CTRL
)
|
0x04
,
ULPD_CAM_CLK_CTRL
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
omap16xx_gpio_dev
);
i
++
)
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
omap16xx_gpio_dev
);
i
++
)
platform_device_register
(
omap16xx_gpio_dev
[
i
]);
platform_device_register
(
omap16xx_gpio_dev
[
i
]);
...
...
arch/arm/mach-omap1/id.c
View file @
a5bee307
...
@@ -15,8 +15,11 @@
...
@@ -15,8 +15,11 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <mach/hardware.h>
#define OMAP_DIE_ID_0 0xfffe1800
#define OMAP_DIE_ID_0 0xfffe1800
#define OMAP_DIE_ID_1 0xfffe1804
#define OMAP_DIE_ID_1 0xfffe1804
#define OMAP_PRODUCTION_ID_0 0xfffe2000
#define OMAP_PRODUCTION_ID_0 0xfffe2000
...
...
arch/arm/mach-omap1/include/mach/entry-macro.S
View file @
a5bee307
...
@@ -9,10 +9,12 @@
...
@@ -9,10 +9,12 @@
*
License
version
2
.
This
program
is
licensed
"as is"
without
any
*
License
version
2
.
This
program
is
licensed
"as is"
without
any
*
warranty
of
any
kind
,
whether
express
or
implied
.
*
warranty
of
any
kind
,
whether
express
or
implied
.
*/
*/
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/io.h>
#include <mach/io.h>
#include <mach/irqs.h>
#include <mach/irqs.h>
#include <asm/hardware/gic.h>
#include "../../iomap.h"
.
macro
get_irqnr_preamble
,
base
,
tmp
.
macro
get_irqnr_preamble
,
base
,
tmp
.
endm
.
endm
...
...
arch/arm/mach-omap1/include/mach/hardware.h
View file @
a5bee307
...
@@ -2,4 +2,40 @@
...
@@ -2,4 +2,40 @@
* arch/arm/mach-omap1/include/mach/hardware.h
* arch/arm/mach-omap1/include/mach/hardware.h
*/
*/
#ifndef __MACH_HARDWARE_H
#define __MACH_HARDWARE_H
#ifndef __ASSEMBLER__
/*
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
*/
extern
u8
omap_readb
(
u32
pa
);
extern
u16
omap_readw
(
u32
pa
);
extern
u32
omap_readl
(
u32
pa
);
extern
void
omap_writeb
(
u8
v
,
u32
pa
);
extern
void
omap_writew
(
u16
v
,
u32
pa
);
extern
void
omap_writel
(
u32
v
,
u32
pa
);
#include <plat/tc.h>
/* Almost all documentation for chip and board memory maps assumes
* BM is clear. Most devel boards have a switch to control booting
* from NOR flash (using external chipselect 3) rather than mask ROM,
* which uses BM to interchange the physical CS0 and CS3 addresses.
*/
static
inline
u32
omap_cs0m_phys
(
void
)
{
return
(
omap_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
)
?
0
:
OMAP_CS3_PHYS
;
}
#endif
#endif
#include <plat/hardware.h>
#include <plat/hardware.h>
arch/arm/mach-omap1/include/mach/io.h
View file @
a5bee307
/*
/*
* arch/arm/mach-omap1/include/mach/io.h
* arch/arm/mach-omap1/include/mach/io.h
*
* IO definitions for TI OMAP processors and boards
*
* Copied from arch/arm/mach-sa1100/include/mach/io.h
* Copyright (C) 1997-1999 Russell King
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Modifications:
* 06-12-1997 RMK Created.
* 07-04-1999 RMK Major cleanup
*/
*/
#include <plat/io.h>
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#define IO_SPACE_LIMIT 0xffffffff
/*
* We don't actually have real ISA nor PCI buses, but there is so many
* drivers out there that might just work if we fake them...
*/
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)
#endif
arch/arm/mach-omap1/include/mach/memory.h
View file @
a5bee307
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
* Note that the is_lbus_device() test is not very efficient on 1510
* Note that the is_lbus_device() test is not very efficient on 1510
* because of the strncmp().
* because of the strncmp().
*/
*/
#ifdef CONFIG_ARCH_OMAP15XX
#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__)
#include <plat/cpu.h>
/*
/*
* OMAP-1510 Local Bus address offset
* OMAP-1510 Local Bus address offset
...
...
arch/arm/mach-omap1/io.c
View file @
a5bee307
...
@@ -15,9 +15,12 @@
...
@@ -15,9 +15,12 @@
#include <asm/tlb.h>
#include <asm/tlb.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/tc.h>
#include <plat/tc.h>
#include "iomap.h"
#include "common.h"
#include "clock.h"
#include "clock.h"
extern
void
omap_check_revision
(
void
);
extern
void
omap_check_revision
(
void
);
...
...
arch/arm/mach-omap1/iomap.h
0 → 100644
View file @
a5bee307
/*
* IO mappings for OMAP1
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifdef __ASSEMBLER__
#define IOMEM(x) (x)
#else
#define IOMEM(x) ((void __force __iomem *)(x))
#endif
#define OMAP1_IO_OFFSET 0x01000000
/* Virtual IO = 0xfefb0000 */
#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET)
/*
* ----------------------------------------------------------------------------
* Omap1 specific IO mapping
* ----------------------------------------------------------------------------
*/
#define OMAP1_IO_PHYS 0xFFFB0000
#define OMAP1_IO_SIZE 0x40000
#define OMAP1_IO_VIRT (OMAP1_IO_PHYS - OMAP1_IO_OFFSET)
arch/arm/mach-omap1/irq.c
View file @
a5bee307
...
@@ -42,11 +42,13 @@
...
@@ -42,11 +42,13 @@
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <mach/hardware.h>
#define IRQ_BANK(irq) ((irq) >> 5)
#define IRQ_BANK(irq) ((irq) >> 5)
#define IRQ_BIT(irq) ((irq) & 0x1f)
#define IRQ_BIT(irq) ((irq) & 0x1f)
...
...
arch/arm/mach-omap1/lcd_dma.c
View file @
a5bee307
...
@@ -27,9 +27,10 @@
...
@@ -27,9 +27,10 @@
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/dma.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/lcdc.h>
#include <mach/lcdc.h>
#include <plat/dma.h>
int
omap_lcd_dma_running
(
void
)
int
omap_lcd_dma_running
(
void
)
{
{
...
...
arch/arm/mach-omap1/mcbsp.c
View file @
a5bee307
...
@@ -19,12 +19,15 @@
...
@@ -19,12 +19,15 @@
#include <linux/platform_device.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include <mach/irqs.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
#include <plat/mcbsp.h>
#include <mach/irqs.h>
#include "iomap.h"
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
...
...
arch/arm/mach-omap1/pm.c
View file @
a5bee307
...
@@ -49,7 +49,6 @@
...
@@ -49,7 +49,6 @@
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <mach/irqs.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/tc.h>
#include <plat/tc.h>
...
@@ -57,6 +56,9 @@
...
@@ -57,6 +56,9 @@
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/dmtimer.h>
#include <plat/dmtimer.h>
#include <mach/irqs.h>
#include "iomap.h"
#include "pm.h"
#include "pm.h"
static
unsigned
int
arm_sleep_save
[
ARM_SLEEP_SAVE_SIZE
];
static
unsigned
int
arm_sleep_save
[
ARM_SLEEP_SAVE_SIZE
];
...
...
arch/arm/mach-omap1/reset.c
View file @
a5bee307
...
@@ -4,9 +4,10 @@
...
@@ -4,9 +4,10 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <plat/prcm.h>
#include <plat/prcm.h>
#include <mach/hardware.h>
void
omap1_restart
(
char
mode
,
const
char
*
cmd
)
void
omap1_restart
(
char
mode
,
const
char
*
cmd
)
{
{
/*
/*
...
...
arch/arm/mach-omap1/sleep.S
View file @
a5bee307
...
@@ -33,8 +33,12 @@
...
@@ -33,8 +33,12 @@
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/io.h>
#include <mach/io.h>
#include "iomap.h"
#include "pm.h"
#include "pm.h"
.
text
.
text
...
...
arch/arm/mach-omap1/sram.S
View file @
a5bee307
...
@@ -9,10 +9,14 @@
...
@@ -9,10 +9,14 @@
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/io.h>
#include <mach/io.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include "iomap.h"
.
text
.
text
/*
/*
...
...
arch/arm/mach-omap1/time.c
View file @
a5bee307
...
@@ -45,14 +45,15 @@
...
@@ -45,14 +45,15 @@
#include <linux/io.h>
#include <linux/io.h>
#include <asm/system.h>
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/leds.h>
#include <asm/leds.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/sched_clock.h>
#include <asm/sched_clock.h>
#include <mach/hardware.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#ifdef CONFIG_OMAP_MPU_TIMER
#ifdef CONFIG_OMAP_MPU_TIMER
...
...
arch/arm/mach-omap1/timer32k.c
View file @
a5bee307
...
@@ -47,14 +47,17 @@
...
@@ -47,14 +47,17 @@
#include <linux/io.h>
#include <linux/io.h>
#include <asm/system.h>
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/leds.h>
#include <asm/leds.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>
#include "common.h"
#include <plat/dmtimer.h>
#include <plat/dmtimer.h>
#include <mach/hardware.h>
#include "common.h"
/*
/*
* ---------------------------------------------------------------------------
* ---------------------------------------------------------------------------
* 32KHz OS timer
* 32KHz OS timer
...
...
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
View file @
a5bee307
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#include <linux/cpufreq.h>
#include <linux/cpufreq.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/sdrc.h>
#include <plat/sdrc.h>
...
...
arch/arm/mach-omap2/clkt_dpll.c
View file @
a5bee307
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <asm/div64.h>
#include <asm/div64.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/cpu.h>
#include "clock.h"
#include "clock.h"
#include "cm-regbits-24xx.h"
#include "cm-regbits-24xx.h"
...
...
arch/arm/mach-omap2/clock2420_data.c
View file @
a5bee307
...
@@ -14,11 +14,14 @@
...
@@ -14,11 +14,14 @@
*/
*/
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/list.h>
#include <linux/list.h>
#include <plat/hardware.h>
#include <plat/clkdev_omap.h>
#include <plat/clkdev_omap.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "clock2xxx.h"
#include "clock2xxx.h"
#include "opp2xxx.h"
#include "opp2xxx.h"
...
...
arch/arm/mach-omap2/clock2430.c
View file @
a5bee307
...
@@ -21,8 +21,10 @@
...
@@ -21,8 +21,10 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/hardware.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "clock2xxx.h"
#include "clock2xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
...
...
arch/arm/mach-omap2/clock2430_data.c
View file @
a5bee307
...
@@ -17,8 +17,10 @@
...
@@ -17,8 +17,10 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/list.h>
#include <linux/list.h>
#include <plat/hardware.h>
#include <plat/clkdev_omap.h>
#include <plat/clkdev_omap.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "clock2xxx.h"
#include "clock2xxx.h"
#include "opp2xxx.h"
#include "opp2xxx.h"
...
...
arch/arm/mach-omap2/clock2xxx.c
View file @
a5bee307
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include "clock.h"
#include "clock.h"
...
...
arch/arm/mach-omap2/clock3xxx.c
View file @
a5bee307
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/hardware.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include "clock.h"
#include "clock.h"
...
...
arch/arm/mach-omap2/clock3xxx_data.c
View file @
a5bee307
...
@@ -20,14 +20,15 @@
...
@@ -20,14 +20,15 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/list.h>
#include <linux/list.h>
#include <plat/hardware.h>
#include <plat/clkdev_omap.h>
#include <plat/clkdev_omap.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "clock3xxx.h"
#include "clock3xxx.h"
#include "clock34xx.h"
#include "clock34xx.h"
#include "clock36xx.h"
#include "clock36xx.h"
#include "clock3517.h"
#include "clock3517.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-34xx.h"
#include "cm-regbits-34xx.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
...
...
arch/arm/mach-omap2/clock44xx_data.c
View file @
a5bee307
...
@@ -26,8 +26,11 @@
...
@@ -26,8 +26,11 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/list.h>
#include <linux/clk.h>
#include <linux/clk.h>
#include <plat/hardware.h>
#include <plat/clkdev_omap.h>
#include <plat/clkdev_omap.h>
#include "iomap.h"
#include "clock.h"
#include "clock.h"
#include "clock44xx.h"
#include "clock44xx.h"
#include "cm1_44xx.h"
#include "cm1_44xx.h"
...
...
arch/arm/mach-omap2/cm2xxx_3xxx.c
View file @
a5bee307
...
@@ -18,8 +18,8 @@
...
@@ -18,8 +18,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "cm.h"
#include "cm.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-24xx.h"
#include "cm-regbits-24xx.h"
...
...
arch/arm/mach-omap2/cm44xx.c
View file @
a5bee307
...
@@ -18,8 +18,8 @@
...
@@ -18,8 +18,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "cm.h"
#include "cm.h"
#include "cm1_44xx.h"
#include "cm1_44xx.h"
#include "cm2_44xx.h"
#include "cm2_44xx.h"
...
...
arch/arm/mach-omap2/cminst44xx.c
View file @
a5bee307
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "cm.h"
#include "cm.h"
#include "cm1_44xx.h"
#include "cm1_44xx.h"
#include "cm2_44xx.h"
#include "cm2_44xx.h"
...
...
arch/arm/mach-omap2/common.c
View file @
a5bee307
...
@@ -17,12 +17,12 @@
...
@@ -17,12 +17,12 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include "common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include "iomap.h"
#include "common.h"
#include "sdrc.h"
#include "sdrc.h"
#include "control.h"
#include "control.h"
...
...
arch/arm/mach-omap2/common.h
View file @
a5bee307
...
@@ -133,6 +133,8 @@ void am33xx_map_io(void);
...
@@ -133,6 +133,8 @@ void am33xx_map_io(void);
void
omap4_map_io
(
void
);
void
omap4_map_io
(
void
);
void
ti81xx_map_io
(
void
);
void
ti81xx_map_io
(
void
);
extern
void
__init
omap_init_consistent_dma_size
(
void
);
/**
/**
* omap_test_timeout - busy-loop, testing a condition
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
* @cond: condition to test until it evaluates to true
...
@@ -235,5 +237,10 @@ static inline u32 omap4_mpuss_read_prev_context_state(void)
...
@@ -235,5 +237,10 @@ static inline u32 omap4_mpuss_read_prev_context_state(void)
return
0
;
return
0
;
}
}
#endif
#endif
struct
omap_sdrc_params
;
extern
void
omap_sdrc_init
(
struct
omap_sdrc_params
*
sdrc_cs0
,
struct
omap_sdrc_params
*
sdrc_cs1
);
#endif
/* __ASSEMBLER__ */
#endif
/* __ASSEMBLER__ */
#endif
/* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
#endif
/* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
arch/arm/mach-omap2/control.c
View file @
a5bee307
...
@@ -15,9 +15,10 @@
...
@@ -15,9 +15,10 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/io.h>
#include "common.h"
#include <plat/sdrc.h>
#include <plat/sdrc.h>
#include "iomap.h"
#include "common.h"
#include "cm-regbits-34xx.h"
#include "cm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
...
...
arch/arm/mach-omap2/control.h
View file @
a5bee307
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
#ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
#ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
#define __ARCH_ARM_MACH_OMAP2_CONTROL_H
#define __ARCH_ARM_MACH_OMAP2_CONTROL_H
#include <mach/io.h>
#include <mach/ctrl_module_core_44xx.h>
#include <mach/ctrl_module_core_44xx.h>
#include <mach/ctrl_module_wkup_44xx.h>
#include <mach/ctrl_module_wkup_44xx.h>
#include <mach/ctrl_module_pad_core_44xx.h>
#include <mach/ctrl_module_pad_core_44xx.h>
...
...
arch/arm/mach-omap2/devices.c
View file @
a5bee307
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <asm/pmu.h>
#include <asm/pmu.h>
#include
<plat/tc.h>
#include
"iomap.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/mcbsp.h>
#include <plat/mcbsp.h>
#include <plat/mmc.h>
#include <plat/mmc.h>
...
...
arch/arm/mach-omap2/display.c
View file @
a5bee307
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#include <plat/omap-pm.h>
#include <plat/omap-pm.h>
#include "common.h"
#include "common.h"
#include "iomap.h"
#include "mux.h"
#include "mux.h"
#include "control.h"
#include "control.h"
#include "display.h"
#include "display.h"
...
...
arch/arm/mach-omap2/emu.c
View file @
a5bee307
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/err.h>
#include "iomap.h"
MODULE_LICENSE
(
"GPL"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_AUTHOR
(
"Alexander Shishkin"
);
MODULE_AUTHOR
(
"Alexander Shishkin"
);
...
...
arch/arm/mach-omap2/gpmc-nand.c
View file @
a5bee307
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/cpu.h>
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
...
...
arch/arm/mach-omap2/gpmc-onenand.c
View file @
a5bee307
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/cpu.h>
#include <plat/onenand.h>
#include <plat/onenand.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
...
...
arch/arm/mach-omap2/include/mach/io.h
View file @
a5bee307
/*
/*
* arch/arm/mach-omap2/include/mach/io.h
* arch/arm/mach-omap2/include/mach/io.h
*
* IO definitions for TI OMAP processors and boards
*
* Copied from arch/arm/mach-sa1100/include/mach/io.h
* Copyright (C) 1997-1999 Russell King
*
* Copyright (C) 2009 Texas Instruments
* Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Modifications:
* 06-12-1997 RMK Created.
* 07-04-1999 RMK Major cleanup
*/
*/
#include <plat/io.h>
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#define IO_SPACE_LIMIT 0xffffffff
/*
* We don't actually have real ISA nor PCI buses, but there is so many
* drivers out there that might just work if we fake them...
*/
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)
#endif
arch/arm/mach-omap2/io.c
View file @
a5bee307
...
@@ -24,26 +24,23 @@
...
@@ -24,26 +24,23 @@
#include <linux/omapfb.h>
#include <linux/omapfb.h>
#include <asm/tlb.h>
#include <asm/tlb.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/sdrc.h>
#include <plat/sdrc.h>
#include <plat/serial.h>
#include <plat/serial.h>
#include "clock2xxx.h"
#include "clock3xxx.h"
#include "clock44xx.h"
#include "common.h"
#include <plat/omap-pm.h>
#include <plat/omap-pm.h>
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
#include "iomap.h"
#include "voltage.h"
#include "voltage.h"
#include "powerdomain.h"
#include "powerdomain.h"
#include "clockdomain.h"
#include "clockdomain.h"
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
#include "common.h"
#include "common.h"
#include "clock2xxx.h"
#include "clock3xxx.h"
#include "clock44xx.h"
/*
/*
* The machine specific code may provide the extra mapping besides the
* The machine specific code may provide the extra mapping besides the
...
@@ -490,43 +487,3 @@ void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
...
@@ -490,43 +487,3 @@ void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
_omap2_init_reprogram_sdrc
();
_omap2_init_reprogram_sdrc
();
}
}
}
}
/*
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
*/
u8
omap_readb
(
u32
pa
)
{
return
__raw_readb
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_readb
);
u16
omap_readw
(
u32
pa
)
{
return
__raw_readw
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_readw
);
u32
omap_readl
(
u32
pa
)
{
return
__raw_readl
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_readl
);
void
omap_writeb
(
u8
v
,
u32
pa
)
{
__raw_writeb
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_writeb
);
void
omap_writew
(
u16
v
,
u32
pa
)
{
__raw_writew
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_writew
);
void
omap_writel
(
u32
v
,
u32
pa
)
{
__raw_writel
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
EXPORT_SYMBOL
(
omap_writel
);
arch/arm/
plat-omap/include/plat/io
.h
→
arch/arm/
mach-omap2/iomap
.h
View file @
a5bee307
/*
/*
* arch/arm/plat-omap/include/mach/io.h
* IO mappings for OMAP2+
*
* IO definitions for TI OMAP processors and boards
*
* Copied from arch/arm/mach-sa1100/include/mach/io.h
* Copyright (C) 1997-1999 Russell King
*
* Copyright (C) 2009 Texas Instruments
* Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com>
*
*
* This program is free software; you can redistribute it and/or modify it
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* under the terms of the GNU General Public License as published by the
...
@@ -25,33 +17,9 @@
...
@@ -25,33 +17,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* You should have received a copy of the GNU General Public License along
* You should have received a copy of the
GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* with this program; if not, write
to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Modifications:
* 06-12-1997 RMK Created.
* 07-04-1999 RMK Major cleanup
*/
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <mach/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff
/*
* We don't actually have real ISA nor PCI buses, but there is so many
* drivers out there that might just work if we fake them...
*/
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)
/*
* ----------------------------------------------------------------------------
* I/O mapping
* ----------------------------------------------------------------------------
*/
*/
#ifdef __ASSEMBLER__
#ifdef __ASSEMBLER__
...
@@ -60,13 +28,9 @@
...
@@ -60,13 +28,9 @@
#define IOMEM(x) ((void __force __iomem *)(x))
#define IOMEM(x) ((void __force __iomem *)(x))
#endif
#endif
#define OMAP1_IO_OFFSET 0x01000000
/* Virtual IO = 0xfefb0000 */
#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET)
#define OMAP2_L3_IO_OFFSET 0x90000000
#define OMAP2_L3_IO_OFFSET 0x90000000
#define OMAP2_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L3_IO_OFFSET)
/* L3 */
#define OMAP2_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L3_IO_OFFSET)
/* L3 */
#define OMAP2_L4_IO_OFFSET 0xb2000000
#define OMAP2_L4_IO_OFFSET 0xb2000000
#define OMAP2_L4_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L4_IO_OFFSET)
/* L4 */
#define OMAP2_L4_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L4_IO_OFFSET)
/* L4 */
...
@@ -85,16 +49,6 @@
...
@@ -85,16 +49,6 @@
#define OMAP2_EMU_IO_OFFSET 0xaa800000
/* Emulation */
#define OMAP2_EMU_IO_OFFSET 0xaa800000
/* Emulation */
#define OMAP2_EMU_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
#define OMAP2_EMU_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
/*
* ----------------------------------------------------------------------------
* Omap1 specific IO mapping
* ----------------------------------------------------------------------------
*/
#define OMAP1_IO_PHYS 0xFFFB0000
#define OMAP1_IO_SIZE 0x40000
#define OMAP1_IO_VIRT (OMAP1_IO_PHYS - OMAP1_IO_OFFSET)
/*
/*
* ----------------------------------------------------------------------------
* ----------------------------------------------------------------------------
* Omap2 specific IO mapping
* Omap2 specific IO mapping
...
@@ -247,31 +201,3 @@
...
@@ -247,31 +201,3 @@
/* 0x4e000000 --> 0xfd300000 */
/* 0x4e000000 --> 0xfd300000 */
#define OMAP44XX_DMM_SIZE SZ_1M
#define OMAP44XX_DMM_SIZE SZ_1M
#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE)
#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE)
/*
* ----------------------------------------------------------------------------
* Omap specific register access
* ----------------------------------------------------------------------------
*/
#ifndef __ASSEMBLER__
/*
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
*/
extern
u8
omap_readb
(
u32
pa
);
extern
u16
omap_readw
(
u32
pa
);
extern
u32
omap_readl
(
u32
pa
);
extern
void
omap_writeb
(
u8
v
,
u32
pa
);
extern
void
omap_writew
(
u16
v
,
u32
pa
);
extern
void
omap_writel
(
u32
v
,
u32
pa
);
struct
omap_sdrc_params
;
extern
void
omap_sdrc_init
(
struct
omap_sdrc_params
*
sdrc_cs0
,
struct
omap_sdrc_params
*
sdrc_cs1
);
extern
void
__init
omap_init_consistent_dma_size
(
void
);
#endif
#endif
arch/arm/mach-omap2/irq.c
View file @
a5bee307
...
@@ -14,10 +14,13 @@
...
@@ -14,10 +14,13 @@
#include <linux/init.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/exception.h>
#include <asm/exception.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include "iomap.h"
/* selected INTC register offsets */
/* selected INTC register offsets */
...
...
arch/arm/mach-omap2/omap-smp.c
View file @
a5bee307
...
@@ -23,11 +23,12 @@
...
@@ -23,11 +23,12 @@
#include <asm/cacheflush.h>
#include <asm/cacheflush.h>
#include <asm/hardware/gic.h>
#include <asm/hardware/gic.h>
#include <asm/smp_scu.h>
#include <asm/smp_scu.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/omap-secure.h>
#include <mach/omap-secure.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "clockdomain.h"
#include "clockdomain.h"
/* SCU base address */
/* SCU base address */
...
...
arch/arm/mach-omap2/opp2420_data.c
View file @
a5bee307
...
@@ -28,6 +28,8 @@
...
@@ -28,6 +28,8 @@
* http://repository.maemo.org/pool/diablo/free/k/kernel-source-diablo/
* http://repository.maemo.org/pool/diablo/free/k/kernel-source-diablo/
*/
*/
#include <plat/hardware.h>
#include "opp2xxx.h"
#include "opp2xxx.h"
#include "sdrc.h"
#include "sdrc.h"
#include "clock.h"
#include "clock.h"
...
...
arch/arm/mach-omap2/opp2430_data.c
View file @
a5bee307
...
@@ -26,6 +26,8 @@
...
@@ -26,6 +26,8 @@
* This is technically part of the OMAP2xxx clock code.
* This is technically part of the OMAP2xxx clock code.
*/
*/
#include <plat/hardware.h>
#include "opp2xxx.h"
#include "opp2xxx.h"
#include "sdrc.h"
#include "sdrc.h"
#include "clock.h"
#include "clock.h"
...
...
arch/arm/mach-omap2/pm24xx.c
View file @
a5bee307
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/delay.h>
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/irq.h>
#include <linux/time.h>
#include <linux/time.h>
#include <linux/gpio.h>
#include <linux/gpio.h>
...
@@ -35,12 +34,13 @@
...
@@ -35,12 +34,13 @@
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <mach/irqs.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/board.h>
#include <plat/board.h>
#include <mach/irqs.h>
#include "common.h"
#include "common.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "prm-regbits-24xx.h"
#include "prm-regbits-24xx.h"
...
@@ -49,7 +49,6 @@
...
@@ -49,7 +49,6 @@
#include "sdrc.h"
#include "sdrc.h"
#include "pm.h"
#include "pm.h"
#include "control.h"
#include "control.h"
#include "powerdomain.h"
#include "powerdomain.h"
#include "clockdomain.h"
#include "clockdomain.h"
...
@@ -258,26 +257,6 @@ static int omap2_pm_begin(suspend_state_t state)
...
@@ -258,26 +257,6 @@ static int omap2_pm_begin(suspend_state_t state)
return
0
;
return
0
;
}
}
static
int
omap2_pm_suspend
(
void
)
{
u32
wken_wkup
,
mir1
;
wken_wkup
=
omap2_prm_read_mod_reg
(
WKUP_MOD
,
PM_WKEN
);
wken_wkup
&=
~
OMAP24XX_EN_GPT1_MASK
;
omap2_prm_write_mod_reg
(
wken_wkup
,
WKUP_MOD
,
PM_WKEN
);
/* Mask GPT1 */
mir1
=
omap_readl
(
0x480fe0a4
);
omap_writel
(
1
<<
5
,
0x480fe0ac
);
omap2_enter_full_retention
();
omap_writel
(
mir1
,
0x480fe0a4
);
omap2_prm_write_mod_reg
(
wken_wkup
,
WKUP_MOD
,
PM_WKEN
);
return
0
;
}
static
int
omap2_pm_enter
(
suspend_state_t
state
)
static
int
omap2_pm_enter
(
suspend_state_t
state
)
{
{
int
ret
=
0
;
int
ret
=
0
;
...
@@ -285,7 +264,7 @@ static int omap2_pm_enter(suspend_state_t state)
...
@@ -285,7 +264,7 @@ static int omap2_pm_enter(suspend_state_t state)
switch
(
state
)
{
switch
(
state
)
{
case
PM_SUSPEND_STANDBY
:
case
PM_SUSPEND_STANDBY
:
case
PM_SUSPEND_MEM
:
case
PM_SUSPEND_MEM
:
ret
=
omap2_pm_suspend
();
omap2_enter_full_retention
();
break
;
break
;
default:
default:
ret
=
-
EINVAL
;
ret
=
-
EINVAL
;
...
...
arch/arm/mach-omap2/prcm_mpu44xx.c
View file @
a5bee307
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "prcm_mpu44xx.h"
#include "prcm_mpu44xx.h"
#include "cm-regbits-44xx.h"
#include "cm-regbits-44xx.h"
...
...
arch/arm/mach-omap2/prm44xx.c
View file @
a5bee307
...
@@ -17,10 +17,11 @@
...
@@ -17,10 +17,11 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/prcm.h>
#include <plat/prcm.h>
#include "iomap.h"
#include "common.h"
#include "vp.h"
#include "vp.h"
#include "prm44xx.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
...
...
arch/arm/mach-omap2/prminst44xx.c
View file @
a5bee307
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include "iomap.h"
#include "common.h"
#include "common.h"
#include "prm44xx.h"
#include "prm44xx.h"
#include "prminst44xx.h"
#include "prminst44xx.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
...
...
arch/arm/mach-omap2/sdram-nokia.c
View file @
a5bee307
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include <plat/io.h>
#include "common.h"
#include "common.h"
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sdrc.h>
#include <plat/sdrc.h>
...
...
arch/arm/mach-omap2/sdrc2xxx.c
View file @
a5bee307
...
@@ -24,13 +24,14 @@
...
@@ -24,13 +24,14 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include "common.h"
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <plat/sdrc.h>
#include "iomap.h"
#include "common.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "clock.h"
#include "clock.h"
#include <plat/sdrc.h>
#include "sdrc.h"
#include "sdrc.h"
/* Memory timing, DLL mode flags */
/* Memory timing, DLL mode flags */
...
...
arch/arm/mach-omap2/sleep24xx.S
View file @
a5bee307
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/io.h>
#include <plat/omap24xx.h>
#include <plat/omap24xx.h>
...
...
arch/arm/mach-omap2/sleep34xx.S
View file @
a5bee307
...
@@ -23,10 +23,13 @@
...
@@ -23,10 +23,13 @@
*
MA
02111
-
1307
USA
*
MA
02111
-
1307
USA
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <plat/hardware.h>
#include <plat/sram.h>
#include <plat/sram.h>
#include <mach/io.h>
#include "iomap.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "sdrc.h"
#include "sdrc.h"
...
...
arch/arm/mach-omap2/sram242x.S
View file @
a5bee307
...
@@ -29,10 +29,12 @@
...
@@ -29,10 +29,12 @@
*
These
crashes
may
be
intermittent
.
*
These
crashes
may
be
intermittent
.
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/io.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "sdrc.h"
#include "sdrc.h"
...
...
arch/arm/mach-omap2/sram243x.S
View file @
a5bee307
...
@@ -29,10 +29,12 @@
...
@@ -29,10 +29,12 @@
*
These
crashes
may
be
intermittent
.
*
These
crashes
may
be
intermittent
.
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/io.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include "iomap.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "sdrc.h"
#include "sdrc.h"
...
...
arch/arm/mach-omap2/sram34xx.S
View file @
a5bee307
...
@@ -26,11 +26,12 @@
...
@@ -26,11 +26,12 @@
*
MA
02111
-
1307
USA
*
MA
02111
-
1307
USA
*/
*/
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <mach/hardware.h>
#include <mach/
io
.h>
#include <mach/
hardware
.h>
#include "iomap.h"
#include "sdrc.h"
#include "sdrc.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
...
...
arch/arm/plat-omap/counter_32k.c
View file @
a5bee307
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include <asm/sched_clock.h>
#include <asm/sched_clock.h>
#include <plat/hardware.h>
#include <plat/common.h>
#include <plat/common.h>
#include <plat/board.h>
#include <plat/board.h>
...
...
arch/arm/plat-omap/dma.c
View file @
a5bee307
...
@@ -164,6 +164,8 @@ static inline void set_gdma_dev(int req, int dev)
...
@@ -164,6 +164,8 @@ static inline void set_gdma_dev(int req, int dev)
}
}
#else
#else
#define set_gdma_dev(req, dev) do {} while (0)
#define set_gdma_dev(req, dev) do {} while (0)
#define omap_readl(reg) 0
#define omap_writel(val, reg) do {} while (0)
#endif
#endif
void
omap_set_dma_priority
(
int
lch
,
int
dst_port
,
int
priority
)
void
omap_set_dma_priority
(
int
lch
,
int
dst_port
,
int
priority
)
...
...
arch/arm/plat-omap/dmtimer.c
View file @
a5bee307
...
@@ -43,6 +43,8 @@
...
@@ -43,6 +43,8 @@
#include <plat/dmtimer.h>
#include <plat/dmtimer.h>
#include <mach/hardware.h>
static
LIST_HEAD
(
omap_timer_list
);
static
LIST_HEAD
(
omap_timer_list
);
static
DEFINE_SPINLOCK
(
dm_timer_lock
);
static
DEFINE_SPINLOCK
(
dm_timer_lock
);
...
...
arch/arm/plat-omap/include/plat/hardware.h
View file @
a5bee307
...
@@ -43,6 +43,12 @@
...
@@ -43,6 +43,12 @@
#endif
#endif
#include <plat/serial.h>
#include <plat/serial.h>
#ifdef __ASSEMBLER__
#define IOMEM(x) (x)
#else
#define IOMEM(x) ((void __force __iomem *)(x))
#endif
/*
/*
* ---------------------------------------------------------------------------
* ---------------------------------------------------------------------------
* Common definitions for all OMAP processors
* Common definitions for all OMAP processors
...
...
arch/arm/plat-omap/include/plat/keypad.h
View file @
a5bee307
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
#ifndef CONFIG_ARCH_OMAP1
#ifndef CONFIG_ARCH_OMAP1
#warning Please update the board to use matrix-keypad driver
#warning Please update the board to use matrix-keypad driver
#define omap_readw(reg) 0
#define omap_writew(val, reg) do {} while (0)
#endif
#endif
#include <linux/input/matrix_keypad.h>
#include <linux/input/matrix_keypad.h>
...
...
arch/arm/plat-omap/include/plat/tc.h
View file @
a5bee307
...
@@ -84,23 +84,6 @@
...
@@ -84,23 +84,6 @@
#define EMIFS_CCS(n) (EMIFS_CS0_CONFIG + (4 * (n)))
#define EMIFS_CCS(n) (EMIFS_CS0_CONFIG + (4 * (n)))
#define EMIFS_ACS(n) (EMIFS_ACS0 + (4 * (n)))
#define EMIFS_ACS(n) (EMIFS_ACS0 + (4 * (n)))
/* Almost all documentation for chip and board memory maps assumes
* BM is clear. Most devel boards have a switch to control booting
* from NOR flash (using external chipselect 3) rather than mask ROM,
* which uses BM to interchange the physical CS0 and CS3 addresses.
*/
static
inline
u32
omap_cs0_phys
(
void
)
{
return
(
omap_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
)
?
0
:
OMAP_CS3_PHYS
;
}
#endif
/* __ASSEMBLER__ */
#endif
/* __ASSEMBLER__ */
#endif
/* __ASM_ARCH_TC_H */
#endif
/* __ASM_ARCH_TC_H */
arch/arm/plat-omap/include/plat/usb.h
View file @
a5bee307
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
#ifndef __ASM_ARCH_OMAP_USB_H
#ifndef __ASM_ARCH_OMAP_USB_H
#define __ASM_ARCH_OMAP_USB_H
#define __ASM_ARCH_OMAP_USB_H
#include <linux/io.h>
#include <linux/usb/musb.h>
#include <linux/usb/musb.h>
#include <plat/board.h>
#include <plat/board.h>
...
@@ -105,6 +106,46 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
...
@@ -105,6 +106,46 @@ extern int omap4430_phy_set_clk(struct device *dev, int on);
extern
int
omap4430_phy_init
(
struct
device
*
dev
);
extern
int
omap4430_phy_init
(
struct
device
*
dev
);
extern
int
omap4430_phy_exit
(
struct
device
*
dev
);
extern
int
omap4430_phy_exit
(
struct
device
*
dev
);
extern
int
omap4430_phy_suspend
(
struct
device
*
dev
,
int
suspend
);
extern
int
omap4430_phy_suspend
(
struct
device
*
dev
,
int
suspend
);
/*
* NOTE: Please update omap USB drivers to use ioremap + read/write
*/
#define OMAP2_L4_IO_OFFSET 0xb2000000
#define IOMEM(x) ((void __force __iomem *)(x))
#define OMAP2_L4_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L4_IO_OFFSET)
static
inline
u8
omap_readb
(
u32
pa
)
{
return
__raw_readb
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
static
inline
u16
omap_readw
(
u32
pa
)
{
return
__raw_readw
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
static
inline
u32
omap_readl
(
u32
pa
)
{
return
__raw_readl
(
OMAP2_L4_IO_ADDRESS
(
pa
));
}
static
inline
void
omap_writeb
(
u8
v
,
u32
pa
)
{
__raw_writeb
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
static
inline
void
omap_writew
(
u16
v
,
u32
pa
)
{
__raw_writew
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
static
inline
void
omap_writel
(
u32
v
,
u32
pa
)
{
__raw_writel
(
v
,
OMAP2_L4_IO_ADDRESS
(
pa
));
}
#endif
#endif
extern
void
am35x_musb_reset
(
void
);
extern
void
am35x_musb_reset
(
void
);
...
...
arch/arm/plat-omap/mux.c
View file @
a5bee307
...
@@ -26,8 +26,11 @@
...
@@ -26,8 +26,11 @@
#include <linux/init.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/io.h>
#include <asm/system.h>
#include <linux/spinlock.h>
#include <linux/spinlock.h>
#include <asm/system.h>
#include <plat/cpu.h>
#include <plat/mux.h>
#include <plat/mux.h>
#ifdef CONFIG_OMAP_MUX
#ifdef CONFIG_OMAP_MUX
...
...
arch/arm/plat-omap/sram.c
View file @
a5bee307
...
@@ -31,11 +31,10 @@
...
@@ -31,11 +31,10 @@
#include "sram.h"
#include "sram.h"
/* XXX These "sideways" includes are a sign that something is wrong */
/* XXX These "sideways" includes will disappear when sram.c becomes a driver */
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
#include "../mach-omap2/iomap.h"
# include "../mach-omap2/prm2xxx_3xxx.h"
#include "../mach-omap2/prm2xxx_3xxx.h"
# include "../mach-omap2/sdrc.h"
#include "../mach-omap2/sdrc.h"
#endif
#define OMAP1_SRAM_PA 0x20000000
#define OMAP1_SRAM_PA 0x20000000
#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)
#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)
...
...
arch/arm/plat-omap/usb.c
View file @
a5bee307
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/board.h>
#include <mach/hardware.h>
#include "../mach-omap2/common.h"
#ifdef CONFIG_ARCH_OMAP_OTG
#ifdef CONFIG_ARCH_OMAP_OTG
void
__init
void
__init
...
...
drivers/char/hw_random/omap-rng.c
View file @
a5bee307
...
@@ -26,6 +26,8 @@
...
@@ -26,6 +26,8 @@
#include <asm/io.h>
#include <asm/io.h>
#include <plat/cpu.h>
#define RNG_OUT_REG 0x00
/* Output register */
#define RNG_OUT_REG 0x00
/* Output register */
#define RNG_STAT_REG 0x04
/* Status register
#define RNG_STAT_REG 0x04
/* Status register
[0] = STAT_BUSY */
[0] = STAT_BUSY */
...
...
drivers/gpio/gpio-omap.c
View file @
a5bee307
...
@@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, int id)
...
@@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, int id)
+
OMAP1610_GPIO_IRQSTATUS1
);
+
OMAP1610_GPIO_IRQSTATUS1
);
__raw_writew
(
0x0014
,
bank
->
base
__raw_writew
(
0x0014
,
bank
->
base
+
OMAP1610_GPIO_SYSCONFIG
);
+
OMAP1610_GPIO_SYSCONFIG
);
/*
* Enable system clock for GPIO module.
* The CAM_CLK_CTRL *is* really the right place.
*/
omap_writel
(
omap_readl
(
ULPD_CAM_CLK_CTRL
)
|
0x04
,
ULPD_CAM_CLK_CTRL
);
}
}
if
(
cpu_is_omap7xx
()
&&
bank
->
method
==
METHOD_GPIO_7XX
)
{
if
(
cpu_is_omap7xx
()
&&
bank
->
method
==
METHOD_GPIO_7XX
)
{
__raw_writel
(
0xffffffff
,
bank
->
base
__raw_writel
(
0xffffffff
,
bank
->
base
...
...
drivers/video/omap2/dss/dispc.c
View file @
a5bee307
...
@@ -3272,11 +3272,6 @@ static void _omap_dispc_initial_config(void)
...
@@ -3272,11 +3272,6 @@ static void _omap_dispc_initial_config(void)
if
(
dss_has_feature
(
FEAT_FUNCGATED
))
if
(
dss_has_feature
(
FEAT_FUNCGATED
))
REG_FLD_MOD
(
DISPC_CONFIG
,
1
,
9
,
9
);
REG_FLD_MOD
(
DISPC_CONFIG
,
1
,
9
,
9
);
/* L3 firewall setting: enable access to OCM RAM */
/* XXX this should be somewhere in plat-omap */
if
(
cpu_is_omap24xx
())
__raw_writel
(
0x402000b0
,
OMAP2_L3_IO_ADDRESS
(
0x680050a0
));
_dispc_setup_color_conv_coef
();
_dispc_setup_color_conv_coef
();
dispc_set_loadmode
(
OMAP_DSS_LOAD_FRAME_ONLY
);
dispc_set_loadmode
(
OMAP_DSS_LOAD_FRAME_ONLY
);
...
...
drivers/video/omap2/dss/dss.c
View file @
a5bee307
...
@@ -33,7 +33,10 @@
...
@@ -33,7 +33,10 @@
#include <linux/pm_runtime.h>
#include <linux/pm_runtime.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include "dss.h"
#include "dss.h"
#include "dss_features.h"
#include "dss_features.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment