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
nexedi
linux
Commits
59136ef3
Commit
59136ef3
authored
Nov 21, 2011
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'restart-cleanup' into restart
parents
e879c862
3f1517a7
Changes
105
Show whitespace changes
Inline
Side-by-side
Showing
105 changed files
with
450 additions
and
470 deletions
+450
-470
arch/arm/mach-clps711x/Makefile
arch/arm/mach-clps711x/Makefile
+1
-1
arch/arm/mach-clps711x/common.c
arch/arm/mach-clps711x/common.c
+87
-8
arch/arm/mach-clps711x/mm.c
arch/arm/mach-clps711x/mm.c
+0
-48
arch/arm/mach-clps711x/time.c
arch/arm/mach-clps711x/time.c
+0
-84
arch/arm/mach-ep93xx/include/mach/system.h
arch/arm/mach-ep93xx/include/mach/system.h
+0
-2
arch/arm/mach-iop32x/include/mach/system.h
arch/arm/mach-iop32x/include/mach/system.h
+0
-2
arch/arm/mach-ixp2000/include/mach/system.h
arch/arm/mach-ixp2000/include/mach/system.h
+0
-2
arch/arm/mach-lpc32xx/include/mach/system.h
arch/arm/mach-lpc32xx/include/mach/system.h
+0
-3
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-ams-delta.c
+1
-1
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-fsample.c
+1
-1
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-generic.c
+1
-1
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h2.c
+1
-1
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-h3.c
+1
-1
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap1/board-htcherald.c
+1
-1
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-innovator.c
+1
-1
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-nokia770.c
+1
-1
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-osk.c
+1
-1
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmte.c
+1
-1
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmtt.c
+1
-1
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-palmz71.c
+1
-1
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-perseus2.c
+1
-1
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-sx1.c
+1
-1
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/board-voiceblue.c
+1
-1
arch/arm/mach-omap1/common.h
arch/arm/mach-omap1/common.h
+61
-0
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/devices.c
+1
-1
arch/arm/mach-omap1/time.c
arch/arm/mach-omap1/time.c
+1
-1
arch/arm/mach-omap1/timer32k.c
arch/arm/mach-omap1/timer32k.c
+1
-1
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-2430sdp.c
+1
-1
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
+1
-1
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-3630sdp.c
+1
-1
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
+1
-2
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-am3517crane.c
+1
-1
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-am3517evm.c
+1
-1
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-apollon.c
+1
-1
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t35.c
+1
-1
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-cm-t3517.c
+1
-1
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-devkit8000.c
+1
-1
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-generic.c
+1
-2
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-h4.c
+1
-1
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-igep0020.c
+1
-1
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-ldp.c
+1
-1
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-n8x0.c
+1
-1
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3beagle.c
+1
-1
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3evm.c
+1
-1
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3logic.c
+1
-1
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3pandora.c
+1
-1
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3stalker.c
+1
-1
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap3touchbook.c
+1
-1
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-omap4panda.c
+1
-2
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-overo.c
+1
-1
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rm680.c
+1
-1
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51-peripherals.c
+1
-1
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-rx51.c
+1
-1
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/board-ti8168evm.c
+1
-1
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-omap2/board-zoom-peripherals.c
+1
-1
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/board-zoom.c
+1
-1
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
+1
-1
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/common.h
+185
-0
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.c
+1
-1
arch/arm/mach-omap2/i2c.c
arch/arm/mach-omap2/i2c.c
+1
-1
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/id.c
+1
-1
arch/arm/mach-omap2/include/mach/omap4-common.h
arch/arm/mach-omap2/include/mach/omap4-common.h
+0
-43
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/io.c
+2
-2
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-hotplug.c
+2
-1
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-omap2/omap-smp.c
+2
-1
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-omap2/omap4-common.c
+2
-1
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.c
+1
-1
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/pm.c
+1
-1
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm24xx.c
+1
-0
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/pm34xx.c
+1
-0
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/pm44xx.c
+1
-1
arch/arm/mach-omap2/prcm.c
arch/arm/mach-omap2/prcm.c
+1
-1
arch/arm/mach-omap2/prcm_mpu44xx.c
arch/arm/mach-omap2/prcm_mpu44xx.c
+1
-1
arch/arm/mach-omap2/prm2xxx_3xxx.c
arch/arm/mach-omap2/prm2xxx_3xxx.c
+1
-1
arch/arm/mach-omap2/prm44xx.c
arch/arm/mach-omap2/prm44xx.c
+1
-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
+1
-1
arch/arm/mach-omap2/sdrc.c
arch/arm/mach-omap2/sdrc.c
+1
-1
arch/arm/mach-omap2/sdrc2xxx.c
arch/arm/mach-omap2/sdrc2xxx.c
+1
-1
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/serial.c
+1
-1
arch/arm/mach-omap2/smartreflex.c
arch/arm/mach-omap2/smartreflex.c
+1
-1
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/timer.c
+1
-1
arch/arm/mach-omap2/vc3xxx_data.c
arch/arm/mach-omap2/vc3xxx_data.c
+1
-1
arch/arm/mach-omap2/vc44xx_data.c
arch/arm/mach-omap2/vc44xx_data.c
+1
-1
arch/arm/mach-omap2/voltage.c
arch/arm/mach-omap2/voltage.c
+1
-1
arch/arm/mach-omap2/voltagedomains3xxx_data.c
arch/arm/mach-omap2/voltagedomains3xxx_data.c
+1
-1
arch/arm/mach-omap2/voltagedomains44xx_data.c
arch/arm/mach-omap2/voltagedomains44xx_data.c
+1
-1
arch/arm/mach-omap2/vp.c
arch/arm/mach-omap2/vp.c
+1
-1
arch/arm/mach-omap2/vp3xxx_data.c
arch/arm/mach-omap2/vp3xxx_data.c
+1
-1
arch/arm/mach-omap2/vp44xx_data.c
arch/arm/mach-omap2/vp44xx_data.c
+1
-1
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/poodle.c
+0
-6
arch/arm/mach-shark/core.c
arch/arm/mach-shark/core.c
+0
-1
arch/arm/mach-u300/include/mach/system.h
arch/arm/mach-u300/include/mach/system.h
+0
-2
arch/arm/mach-w90x900/irq.c
arch/arm/mach-w90x900/irq.c
+2
-0
arch/arm/mach-w90x900/nuc910.h
arch/arm/mach-w90x900/nuc910.h
+1
-8
arch/arm/mach-w90x900/nuc950.h
arch/arm/mach-w90x900/nuc950.h
+1
-8
arch/arm/mach-w90x900/nuc960.h
arch/arm/mach-w90x900/nuc960.h
+1
-8
arch/arm/mach-w90x900/nuc9xx.h
arch/arm/mach-w90x900/nuc9xx.h
+23
-0
arch/arm/mach-w90x900/time.c
arch/arm/mach-w90x900/time.c
+2
-0
arch/arm/plat-omap/include/plat/common.h
arch/arm/plat-omap/include/plat/common.h
+0
-82
arch/arm/plat-omap/include/plat/io.h
arch/arm/plat-omap/include/plat/io.h
+0
-68
arch/arm/plat-omap/include/plat/irqs.h
arch/arm/plat-omap/include/plat/irqs.h
+0
-10
No files found.
arch/arm/mach-clps711x/Makefile
View file @
59136ef3
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
# Object file lists.
# Object file lists.
obj-y
:=
irq.o mm.o time
.o
obj-y
:=
common
.o
obj-m
:=
obj-m
:=
obj-n
:=
obj-n
:=
obj-
:=
obj-
:=
...
...
arch/arm/mach-clps711x/
irq
.c
→
arch/arm/mach-clps711x/
common
.c
View file @
59136ef3
/*
/*
* linux/arch/arm/mach-clps711x/
irq
.c
* linux/arch/arm/mach-clps711x/
core
.c
*
*
* Copyright (C) 2000 Deep Blue Solutions Ltd.
* Core support for the CLPS711x-based machines.
*
* Copyright (C) 2001,2011 Deep Blue Solutions Ltd
*
*
* This program is free software; you can redistribute it and/or modify
* 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
* it under the terms of the GNU General Public License as published by
...
@@ -17,16 +19,42 @@
...
@@ -17,16 +19,42 @@
* along with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
*/
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/
lis
t.h>
#include <linux/
interrup
t.h>
#include <linux/io.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/sched.h>
#include <linux/timex.h>
#include <asm/
mach/irq
.h>
#include <asm/
sizes
.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/hardware/clps7111.h>
#include <asm/hardware/clps7111.h>
/*
* This maps the generic CLPS711x registers
*/
static
struct
map_desc
clps711x_io_desc
[]
__initdata
=
{
{
.
virtual
=
CLPS7111_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
CLPS7111_PHYS_BASE
),
.
length
=
SZ_1M
,
.
type
=
MT_DEVICE
}
};
void
__init
clps711x_map_io
(
void
)
{
iotable_init
(
clps711x_io_desc
,
ARRAY_SIZE
(
clps711x_io_desc
));
}
static
void
int1_mask
(
struct
irq_data
*
d
)
static
void
int1_mask
(
struct
irq_data
*
d
)
{
{
u32
intmr1
;
u32
intmr1
;
...
@@ -141,3 +169,54 @@ void __init clps711x_init_irq(void)
...
@@ -141,3 +169,54 @@ void __init clps711x_init_irq(void)
clps_writel
(
0
,
SYNCIO
);
clps_writel
(
0
,
SYNCIO
);
clps_writel
(
0
,
KBDEOI
);
clps_writel
(
0
,
KBDEOI
);
}
}
/*
* gettimeoffset() returns time since last timer tick, in usecs.
*
* 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
* 'tick' is usecs per jiffy.
*/
static
unsigned
long
clps711x_gettimeoffset
(
void
)
{
unsigned
long
hwticks
;
hwticks
=
LATCH
-
(
clps_readl
(
TC2D
)
&
0xffff
);
/* since last underflow */
return
(
hwticks
*
(
tick_nsec
/
1000
))
/
LATCH
;
}
/*
* IRQ handler for the timer
*/
static
irqreturn_t
p720t_timer_interrupt
(
int
irq
,
void
*
dev_id
)
{
timer_tick
();
return
IRQ_HANDLED
;
}
static
struct
irqaction
clps711x_timer_irq
=
{
.
name
=
"CLPS711x Timer Tick"
,
.
flags
=
IRQF_DISABLED
|
IRQF_TIMER
|
IRQF_IRQPOLL
,
.
handler
=
p720t_timer_interrupt
,
};
static
void
__init
clps711x_timer_init
(
void
)
{
struct
timespec
tv
;
unsigned
int
syscon
;
syscon
=
clps_readl
(
SYSCON1
);
syscon
|=
SYSCON1_TC2S
|
SYSCON1_TC2M
;
clps_writel
(
syscon
,
SYSCON1
);
clps_writel
(
LATCH
-
1
,
TC2D
);
/* 512kHz / 100Hz - 1 */
setup_irq
(
IRQ_TC2OI
,
&
clps711x_timer_irq
);
tv
.
tv_nsec
=
0
;
tv
.
tv_sec
=
clps_readl
(
RTCDR
);
do_settimeofday
(
&
tv
);
}
struct
sys_timer
clps711x_timer
=
{
.
init
=
clps711x_timer_init
,
.
offset
=
clps711x_gettimeoffset
,
};
arch/arm/mach-clps711x/mm.c
deleted
100644 → 0
View file @
e879c862
/*
* linux/arch/arm/mach-clps711x/mm.c
*
* Generic MM setup for the CLPS711x-based machines.
*
* Copyright (C) 2001 Deep Blue Solutions Ltd
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <asm/sizes.h>
#include <mach/hardware.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/mach/map.h>
#include <asm/hardware/clps7111.h>
/*
* This maps the generic CLPS711x registers
*/
static
struct
map_desc
clps711x_io_desc
[]
__initdata
=
{
{
.
virtual
=
CLPS7111_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
CLPS7111_PHYS_BASE
),
.
length
=
SZ_1M
,
.
type
=
MT_DEVICE
}
};
void
__init
clps711x_map_io
(
void
)
{
iotable_init
(
clps711x_io_desc
,
ARRAY_SIZE
(
clps711x_io_desc
));
}
arch/arm/mach-clps711x/time.c
deleted
100644 → 0
View file @
e879c862
/*
* linux/arch/arm/mach-clps711x/time.c
*
* Copyright (C) 2001 Deep Blue Solutions Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/sched.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/hardware/clps7111.h>
#include <asm/mach/time.h>
/*
* gettimeoffset() returns time since last timer tick, in usecs.
*
* 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
* 'tick' is usecs per jiffy.
*/
static
unsigned
long
clps711x_gettimeoffset
(
void
)
{
unsigned
long
hwticks
;
hwticks
=
LATCH
-
(
clps_readl
(
TC2D
)
&
0xffff
);
/* since last underflow */
return
(
hwticks
*
(
tick_nsec
/
1000
))
/
LATCH
;
}
/*
* IRQ handler for the timer
*/
static
irqreturn_t
p720t_timer_interrupt
(
int
irq
,
void
*
dev_id
)
{
timer_tick
();
return
IRQ_HANDLED
;
}
static
struct
irqaction
clps711x_timer_irq
=
{
.
name
=
"CLPS711x Timer Tick"
,
.
flags
=
IRQF_DISABLED
|
IRQF_TIMER
|
IRQF_IRQPOLL
,
.
handler
=
p720t_timer_interrupt
,
};
static
void
__init
clps711x_timer_init
(
void
)
{
struct
timespec
tv
;
unsigned
int
syscon
;
syscon
=
clps_readl
(
SYSCON1
);
syscon
|=
SYSCON1_TC2S
|
SYSCON1_TC2M
;
clps_writel
(
syscon
,
SYSCON1
);
clps_writel
(
LATCH
-
1
,
TC2D
);
/* 512kHz / 100Hz - 1 */
setup_irq
(
IRQ_TC2OI
,
&
clps711x_timer_irq
);
tv
.
tv_nsec
=
0
;
tv
.
tv_sec
=
clps_readl
(
RTCDR
);
do_settimeofday
(
&
tv
);
}
struct
sys_timer
clps711x_timer
=
{
.
init
=
clps711x_timer_init
,
.
offset
=
clps711x_gettimeoffset
,
};
arch/arm/mach-ep93xx/include/mach/system.h
View file @
59136ef3
...
@@ -11,8 +11,6 @@ static inline void arch_idle(void)
...
@@ -11,8 +11,6 @@ static inline void arch_idle(void)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
{
{
local_irq_disable
();
/*
/*
* Set then clear the SWRST bit to initiate a software reset
* Set then clear the SWRST bit to initiate a software reset
*/
*/
...
...
arch/arm/mach-iop32x/include/mach/system.h
View file @
59136ef3
...
@@ -18,8 +18,6 @@ static inline void arch_idle(void)
...
@@ -18,8 +18,6 @@ static inline void arch_idle(void)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
{
{
local_irq_disable
();
if
(
machine_is_n2100
())
{
if
(
machine_is_n2100
())
{
gpio_line_set
(
N2100_HARDWARE_RESET
,
GPIO_LOW
);
gpio_line_set
(
N2100_HARDWARE_RESET
,
GPIO_LOW
);
gpio_line_config
(
N2100_HARDWARE_RESET
,
GPIO_OUT
);
gpio_line_config
(
N2100_HARDWARE_RESET
,
GPIO_OUT
);
...
...
arch/arm/mach-ixp2000/include/mach/system.h
View file @
59136ef3
...
@@ -19,8 +19,6 @@ static inline void arch_idle(void)
...
@@ -19,8 +19,6 @@ static inline void arch_idle(void)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
static
inline
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
{
{
local_irq_disable
();
/*
/*
* Reset flash banking register so that we are pointing at
* Reset flash banking register so that we are pointing at
* RedBoot bank.
* RedBoot bank.
...
...
arch/arm/mach-lpc32xx/include/mach/system.h
View file @
59136ef3
...
@@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd)
...
@@ -33,9 +33,6 @@ static inline void arch_reset(char mode, const char *cmd)
case
'h'
:
case
'h'
:
printk
(
KERN_CRIT
"RESET: Rebooting system
\n
"
);
printk
(
KERN_CRIT
"RESET: Rebooting system
\n
"
);
/* Disable interrupts */
local_irq_disable
();
lpc32xx_watchdog_reset
();
lpc32xx_watchdog_reset
();
break
;
break
;
...
...
arch/arm/mach-omap1/board-ams-delta.c
View file @
59136ef3
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <mach/camera.h>
#include <mach/camera.h>
#include <mach/ams-delta-fiq.h>
#include <mach/ams-delta-fiq.h>
...
...
arch/arm/mach-omap1/board-fsample.c
View file @
59136ef3
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
/* fsample is pretty close to p2-sample */
/* fsample is pretty close to p2-sample */
...
...
arch/arm/mach-omap1/board-generic.c
View file @
59136ef3
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#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
<plat/common.h>
#include
"common.h"
/* assume no Mini-AB port */
/* assume no Mini-AB port */
...
...
arch/arm/mach-omap1/board-h2.c
View file @
59136ef3
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/flash.h>
#include <plat/flash.h>
#include "board-h2.h"
#include "board-h2.h"
...
...
arch/arm/mach-omap1/board-h3.c
View file @
59136ef3
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/flash.h>
#include <plat/flash.h>
#include "board-h3.h"
#include "board-h3.h"
...
...
arch/arm/mach-omap1/board-htcherald.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <plat/omap7xx.h>
#include <plat/omap7xx.h>
#include
<plat/common.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>
...
...
arch/arm/mach-omap1/board-innovator.c
View file @
59136ef3
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#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/common.h>
#include
"common.h"
#include <plat/mmc.h>
#include <plat/mmc.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-nokia770.c
View file @
59136ef3
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#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
<plat/common.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>
...
...
arch/arm/mach-omap1/board-osk.c
View file @
59136ef3
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
#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
<plat/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 */
#define OMAP_OSK_ETHR_START 0x04800300
#define OMAP_OSK_ETHR_START 0x04800300
...
...
arch/arm/mach-omap1/board-palmte.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#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
<plat/common.h>
#include
"common.h"
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1
#define PALMTE_USB_OR_DC_GPIO 1
...
...
arch/arm/mach-omap1/board-palmtt.c
View file @
59136ef3
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <linux/spi/spi.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/spi/ads7846.h>
...
...
arch/arm/mach-omap1/board-palmz71.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <linux/spi/spi.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/spi/ads7846.h>
...
...
arch/arm/mach-omap1/board-perseus2.c
View file @
59136ef3
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
static
const
unsigned
int
p2_keymap
[]
=
{
static
const
unsigned
int
p2_keymap
[]
=
{
...
...
arch/arm/mach-omap1/board-sx1.c
View file @
59136ef3
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/keypad.h>
#include <plat/keypad.h>
#include <plat/board-sx1.h>
#include <plat/board-sx1.h>
...
...
arch/arm/mach-omap1/board-voiceblue.c
View file @
59136ef3
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board-voiceblue.h>
#include <plat/board-voiceblue.h>
#include
<plat/common.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>
...
...
arch/arm/mach-omap1/common.h
0 → 100644
View file @
59136ef3
/*
*
* Header for code common to all OMAP1 machines.
*
* 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.
*/
#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
#define __ARCH_ARM_MACH_OMAP1_COMMON_H
#include <plat/common.h>
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void
omap7xx_map_io
(
void
);
#else
static
inline
void
omap7xx_map_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
void
omap15xx_map_io
(
void
);
#else
static
inline
void
omap15xx_map_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP16XX
void
omap16xx_map_io
(
void
);
#else
static
inline
void
omap16xx_map_io
(
void
)
{
}
#endif
void
omap1_init_early
(
void
);
void
omap1_init_irq
(
void
);
extern
struct
sys_timer
omap1_timer
;
extern
bool
omap_32k_timer_init
(
void
);
#endif
/* __ARCH_ARM_MACH_OMAP1_COMMON_H */
arch/arm/mach-omap1/devices.c
View file @
59136ef3
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include
<plat/common.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>
...
...
arch/arm/mach-omap1/time.c
View file @
59136ef3
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/time.h>
#include
<plat/common.h>
#include
"common.h"
#ifdef CONFIG_OMAP_MPU_TIMER
#ifdef CONFIG_OMAP_MPU_TIMER
...
...
arch/arm/mach-omap1/timer32k.c
View file @
59136ef3
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
#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
<plat/common.h>
#include
"common.h"
#include <plat/dmtimer.h>
#include <plat/dmtimer.h>
/*
/*
...
...
arch/arm/mach-omap2/board-2430sdp.c
View file @
59136ef3
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/gpmc-smc91x.h>
#include <plat/gpmc-smc91x.h>
...
...
arch/arm/mach-omap2/board-3430sdp.c
View file @
59136ef3
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
...
...
arch/arm/mach-omap2/board-3630sdp.c
View file @
59136ef3
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/gpmc-smc91x.h>
#include <plat/gpmc-smc91x.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-4430sdp.c
View file @
59136ef3
...
@@ -27,13 +27,12 @@
...
@@ -27,13 +27,12 @@
#include <linux/leds_pwm.h>
#include <linux/leds_pwm.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/omap4-common.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.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/mmc.h>
#include <plat/mmc.h>
#include <plat/omap4-keypad.h>
#include <plat/omap4-keypad.h>
...
...
arch/arm/mach-omap2/board-am3517crane.c
View file @
59136ef3
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include "mux.h"
#include "mux.h"
...
...
arch/arm/mach-omap2/board-am3517evm.c
View file @
59136ef3
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-generic-dpi.h>
...
...
arch/arm/mach-omap2/board-apollon.c
View file @
59136ef3
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#include <plat/led.h>
#include <plat/led.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
...
...
arch/arm/mach-omap2/board-cm-t35.c
View file @
59136ef3
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-cm-t3517.c
View file @
59136ef3
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
...
...
arch/arm/mach-omap2/board-devkit8000.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-generic.c
View file @
59136ef3
...
@@ -20,8 +20,7 @@
...
@@ -20,8 +20,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <plat/board.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <mach/omap4-common.h>
#include "common-board-devices.h"
#include "common-board-devices.h"
/*
/*
...
...
arch/arm/mach-omap2/board-h4.c
View file @
59136ef3
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/menelaus.h>
#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
...
...
arch/arm/mach-omap2/board-igep0020.c
View file @
59136ef3
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
...
...
arch/arm/mach-omap2/board-ldp.c
View file @
59136ef3
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <mach/board-zoom.h>
#include <mach/board-zoom.h>
...
...
arch/arm/mach-omap2/board-n8x0.c
View file @
59136ef3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/menelaus.h>
#include <plat/menelaus.h>
#include <mach/irqs.h>
#include <mach/irqs.h>
#include <plat/mcspi.h>
#include <plat/mcspi.h>
...
...
arch/arm/mach-omap2/board-omap3beagle.c
View file @
59136ef3
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <video/omapdss.h>
#include <video/omapdss.h>
#include <video/omap-panel-dvi.h>
#include <video/omap-panel-dvi.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
...
...
arch/arm/mach-omap2/board-omap3evm.c
View file @
59136ef3
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#include <plat/board.h>
#include <plat/board.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <video/omapdss.h>
#include <video/omapdss.h>
#include <video/omap-panel-dvi.h>
#include <video/omap-panel-dvi.h>
...
...
arch/arm/mach-omap2/board-omap3logic.c
View file @
59136ef3
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
#include <plat/mux.h>
#include <plat/mux.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc-smsc911x.h>
#include <plat/gpmc-smsc911x.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/sdrc.h>
#include <plat/sdrc.h>
...
...
arch/arm/mach-omap2/board-omap3pandora.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-omap3stalker.c
View file @
59136ef3
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-omap3touchbook.c
View file @
59136ef3
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-omap4panda.c
View file @
59136ef3
...
@@ -30,14 +30,13 @@
...
@@ -30,14 +30,13 @@
#include <linux/wl12xx.h>
#include <linux/wl12xx.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/omap4-common.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 <video/omapdss.h>
#include <video/omapdss.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/mmc.h>
#include <plat/mmc.h>
#include <video/omap-panel-dvi.h>
#include <video/omap-panel-dvi.h>
...
...
arch/arm/mach-omap2/board-overo.c
View file @
59136ef3
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <video/omapdss.h>
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h>
#include <video/omap-panel-dvi.h>
...
...
arch/arm/mach-omap2/board-rm680.c
View file @
59136ef3
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#include <plat/mmc.h>
#include <plat/mmc.h>
#include <plat/usb.h>
#include <plat/usb.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/onenand.h>
#include <plat/onenand.h>
#include "mux.h"
#include "mux.h"
...
...
arch/arm/mach-omap2/board-rx51-peripherals.c
View file @
59136ef3
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/onenand.h>
#include <plat/onenand.h>
...
...
arch/arm/mach-omap2/board-rx51.c
View file @
59136ef3
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#include <plat/mcspi.h>
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/board-ti8168evm.c
View file @
59136ef3
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include <plat/irqs.h>
#include <plat/irqs.h>
#include <plat/board.h>
#include <plat/board.h>
#include
<plat/common.h>
#include
"common.h"
static
struct
omap_board_config_kernel
ti8168_evm_config
[]
__initdata
=
{
static
struct
omap_board_config_kernel
ti8168_evm_config
[]
__initdata
=
{
};
};
...
...
arch/arm/mach-omap2/board-zoom-peripherals.c
View file @
59136ef3
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/usb.h>
#include <plat/usb.h>
#include <mach/board-zoom.h>
#include <mach/board-zoom.h>
...
...
arch/arm/mach-omap2/board-zoom.c
View file @
59136ef3
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/usb.h>
#include <plat/usb.h>
...
...
arch/arm/mach-omap2/cm2xxx_3xxx.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include "cm.h"
#include "cm.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
...
...
arch/arm/mach-omap2/cm44xx.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include "cm.h"
#include "cm.h"
#include "cm1_44xx.h"
#include "cm1_44xx.h"
...
...
arch/arm/mach-omap2/cminst44xx.c
View file @
59136ef3
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include "cm.h"
#include "cm.h"
#include "cm1_44xx.h"
#include "cm1_44xx.h"
...
...
arch/arm/mach-omap2/common.c
View file @
59136ef3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/mux.h>
#include <plat/mux.h>
...
...
arch/arm/mach-omap2/common.h
0 → 100644
View file @
59136ef3
/*
* Header for code common to all OMAP2+ machines.
*
* 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.
*/
#ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
#define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
#include <linux/delay.h>
#include <plat/common.h>
#ifdef CONFIG_SOC_OMAP2420
extern
void
omap242x_map_common_io
(
void
);
#else
static
inline
void
omap242x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_SOC_OMAP2430
extern
void
omap243x_map_common_io
(
void
);
#else
static
inline
void
omap243x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP3
extern
void
omap34xx_map_common_io
(
void
);
#else
static
inline
void
omap34xx_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_SOC_OMAPTI816X
extern
void
omapti816x_map_common_io
(
void
);
#else
static
inline
void
omapti816x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP4
extern
void
omap44xx_map_common_io
(
void
);
#else
static
inline
void
omap44xx_map_common_io
(
void
)
{
}
#endif
extern
void
omap2_init_common_infrastructure
(
void
);
extern
struct
sys_timer
omap2_timer
;
extern
struct
sys_timer
omap3_timer
;
extern
struct
sys_timer
omap3_secure_timer
;
extern
struct
sys_timer
omap4_timer
;
void
omap2420_init_early
(
void
);
void
omap2430_init_early
(
void
);
void
omap3430_init_early
(
void
);
void
omap35xx_init_early
(
void
);
void
omap3630_init_early
(
void
);
void
omap3_init_early
(
void
);
/* Do not use this one */
void
am35xx_init_early
(
void
);
void
ti816x_init_early
(
void
);
void
omap4430_init_early
(
void
);
/*
* IO bases for various OMAP processors
* Except the tap base, rest all the io bases
* listed are physical addresses.
*/
struct
omap_globals
{
u32
class
;
/* OMAP class to detect */
void
__iomem
*
tap
;
/* Control module ID code */
void
__iomem
*
sdrc
;
/* SDRAM Controller */
void
__iomem
*
sms
;
/* SDRAM Memory Scheduler */
void
__iomem
*
ctrl
;
/* System Control Module */
void
__iomem
*
ctrl_pad
;
/* PAD Control Module */
void
__iomem
*
prm
;
/* Power and Reset Management */
void
__iomem
*
cm
;
/* Clock Management */
void
__iomem
*
cm2
;
};
void
omap2_set_globals_242x
(
void
);
void
omap2_set_globals_243x
(
void
);
void
omap2_set_globals_3xxx
(
void
);
void
omap2_set_globals_443x
(
void
);
void
omap2_set_globals_ti816x
(
void
);
/* These get called from omap2_set_globals_xxxx(), do not call these */
void
omap2_set_globals_tap
(
struct
omap_globals
*
);
void
omap2_set_globals_sdrc
(
struct
omap_globals
*
);
void
omap2_set_globals_control
(
struct
omap_globals
*
);
void
omap2_set_globals_prcm
(
struct
omap_globals
*
);
void
omap242x_map_io
(
void
);
void
omap243x_map_io
(
void
);
void
omap3_map_io
(
void
);
void
omap4_map_io
(
void
);
/**
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
* @timeout: maximum number of microseconds in the timeout
* @index: loop index (integer)
*
* Loop waiting for @cond to become true or until at least @timeout
* microseconds have passed. To use, define some integer @index in the
* calling code. After running, if @index == @timeout, then the loop has
* timed out.
*/
#define omap_test_timeout(cond, timeout, index) \
({ \
for (index = 0; index < timeout; index++) { \
if (cond) \
break; \
udelay(1); \
} \
})
extern
struct
device
*
omap2_get_mpuss_device
(
void
);
extern
struct
device
*
omap2_get_iva_device
(
void
);
extern
struct
device
*
omap2_get_l3_device
(
void
);
extern
struct
device
*
omap4_get_dsp_device
(
void
);
void
omap2_init_irq
(
void
);
void
omap3_init_irq
(
void
);
void
ti816x_init_irq
(
void
);
extern
int
omap_irq_pending
(
void
);
void
omap_intc_save_context
(
void
);
void
omap_intc_restore_context
(
void
);
void
omap3_intc_suspend
(
void
);
void
omap3_intc_prepare_idle
(
void
);
void
omap3_intc_resume_idle
(
void
);
/*
* wfi used in low power code. Directly opcode is used instead
* of instruction to avoid mulit-omap build break
*/
#ifdef CONFIG_THUMB2_KERNEL
#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
#else
#define do_wfi() \
__asm__ __volatile__ (".word 0xe320f003" : : : "memory")
#endif
#ifdef CONFIG_CACHE_L2X0
extern
void
__iomem
*
l2cache_base
;
#endif
extern
void
__iomem
*
gic_dist_base_addr
;
extern
void
__init
gic_init_irq
(
void
);
extern
void
omap_smc1
(
u32
fn
,
u32
arg
);
#ifdef CONFIG_SMP
/* Needed for secondary core boot */
extern
void
omap_secondary_startup
(
void
);
extern
u32
omap_modify_auxcoreboot0
(
u32
set_mask
,
u32
clear_mask
);
extern
void
omap_auxcoreboot_addr
(
u32
cpu_addr
);
extern
u32
omap_read_auxcoreboot0
(
void
);
#endif
#endif
/* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
arch/arm/mach-omap2/control.c
View file @
59136ef3
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/sdrc.h>
#include <plat/sdrc.h>
#include "cm-regbits-34xx.h"
#include "cm-regbits-34xx.h"
...
...
arch/arm/mach-omap2/i2c.c
View file @
59136ef3
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/i2c.h>
#include <plat/i2c.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/omap_hwmod.h>
#include <plat/omap_hwmod.h>
#include "mux.h"
#include "mux.h"
...
...
arch/arm/mach-omap2/id.c
View file @
59136ef3
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#include <asm/cputype.h>
#include <asm/cputype.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <mach/id.h>
#include <mach/id.h>
...
...
arch/arm/mach-omap2/include/mach/omap4-common.h
deleted
100644 → 0
View file @
e879c862
/*
* omap4-common.h: OMAP4 specific common header file
*
* Copyright (C) 2010 Texas Instruments, Inc.
*
* Author:
* 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 version 2 as
* published by the Free Software Foundation.
*/
#ifndef OMAP_ARCH_OMAP4_COMMON_H
#define OMAP_ARCH_OMAP4_COMMON_H
/*
* wfi used in low power code. Directly opcode is used instead
* of instruction to avoid mulit-omap build break
*/
#ifdef CONFIG_THUMB2_KERNEL
#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
#else
#define do_wfi() \
__asm__ __volatile__ (".word 0xe320f003" : : : "memory")
#endif
#ifdef CONFIG_CACHE_L2X0
extern
void
__iomem
*
l2cache_base
;
#endif
extern
void
__iomem
*
gic_dist_base_addr
;
extern
void
__init
gic_init_irq
(
void
);
extern
void
omap_smc1
(
u32
fn
,
u32
arg
);
#ifdef CONFIG_SMP
/* Needed for secondary core boot */
extern
void
omap_secondary_startup
(
void
);
extern
u32
omap_modify_auxcoreboot0
(
u32
set_mask
,
u32
clear_mask
);
extern
void
omap_auxcoreboot_addr
(
u32
cpu_addr
);
extern
u32
omap_read_auxcoreboot0
(
void
);
#endif
#endif
arch/arm/mach-omap2/io.c
View file @
59136ef3
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#include "clock3xxx.h"
#include "clock3xxx.h"
#include "clock44xx.h"
#include "clock44xx.h"
#include
<plat/common.h>
#include
"common.h"
#include <plat/omap-pm.h>
#include <plat/omap-pm.h>
#include "voltage.h"
#include "voltage.h"
#include "powerdomain.h"
#include "powerdomain.h"
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#include "clockdomain.h"
#include "clockdomain.h"
#include <plat/omap_hwmod.h>
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
#include <plat/multi.h>
#include
<plat/common.h>
#include
"common.h"
/*
/*
* The machine specific code may provide the extra mapping besides the
* The machine specific code may provide the extra mapping besides the
...
...
arch/arm/mach-omap2/omap-hotplug.c
View file @
59136ef3
...
@@ -19,7 +19,8 @@
...
@@ -19,7 +19,8 @@
#include <linux/smp.h>
#include <linux/smp.h>
#include <asm/cacheflush.h>
#include <asm/cacheflush.h>
#include <mach/omap4-common.h>
#include "common.h"
int
platform_cpu_kill
(
unsigned
int
cpu
)
int
platform_cpu_kill
(
unsigned
int
cpu
)
{
{
...
...
arch/arm/mach-omap2/omap-smp.c
View file @
59136ef3
...
@@ -24,7 +24,8 @@
...
@@ -24,7 +24,8 @@
#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/omap4-common.h>
#include "common.h"
/* SCU base address */
/* SCU base address */
static
void
__iomem
*
scu_base
;
static
void
__iomem
*
scu_base
;
...
...
arch/arm/mach-omap2/omap4-common.c
View file @
59136ef3
...
@@ -22,7 +22,8 @@
...
@@ -22,7 +22,8 @@
#include <plat/irqs.h>
#include <plat/irqs.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/omap4-common.h>
#include "common.h"
#ifdef CONFIG_CACHE_L2X0
#ifdef CONFIG_CACHE_L2X0
void
__iomem
*
l2cache_base
;
void
__iomem
*
l2cache_base
;
...
...
arch/arm/mach-omap2/omap_hwmod.c
View file @
59136ef3
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
#include <linux/mutex.h>
#include <linux/mutex.h>
#include <linux/spinlock.h>
#include <linux/spinlock.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include "clockdomain.h"
#include "clockdomain.h"
#include "powerdomain.h"
#include "powerdomain.h"
...
...
arch/arm/mach-omap2/pm.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <plat/omap-pm.h>
#include <plat/omap-pm.h>
#include <plat/omap_device.h>
#include <plat/omap_device.h>
#include
<plat/common.h>
#include
"common.h"
#include "voltage.h"
#include "voltage.h"
#include "powerdomain.h"
#include "powerdomain.h"
...
...
arch/arm/mach-omap2/pm24xx.c
View file @
59136ef3
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#include <plat/dma.h>
#include <plat/dma.h>
#include <plat/board.h>
#include <plat/board.h>
#include "common.h"
#include "prm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#include "prm-regbits-24xx.h"
#include "prm-regbits-24xx.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
...
...
arch/arm/mach-omap2/pm34xx.c
View file @
59136ef3
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#include <plat/gpmc.h>
#include <plat/gpmc.h>
#include <plat/dma.h>
#include <plat/dma.h>
#include "common.h"
#include "cm2xxx_3xxx.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-34xx.h"
#include "cm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
...
...
arch/arm/mach-omap2/pm44xx.c
View file @
59136ef3
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include "common.h"
#include "powerdomain.h"
#include "powerdomain.h"
#include <mach/omap4-common.h>
struct
power_state
{
struct
power_state
{
struct
powerdomain
*
pwrdm
;
struct
powerdomain
*
pwrdm
;
...
...
arch/arm/mach-omap2/prcm.c
View file @
59136ef3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include <linux/export.h>
#include <linux/export.h>
#include <mach/system.h>
#include <mach/system.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/prcm.h>
#include <plat/prcm.h>
#include <plat/irqs.h>
#include <plat/irqs.h>
...
...
arch/arm/mach-omap2/prcm_mpu44xx.c
View file @
59136ef3
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/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/prm2xxx_3xxx.c
View file @
59136ef3
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/prcm.h>
#include <plat/prcm.h>
...
...
arch/arm/mach-omap2/prm44xx.c
View file @
59136ef3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/prcm.h>
#include <plat/prcm.h>
...
...
arch/arm/mach-omap2/prminst44xx.c
View file @
59136ef3
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm44xx.h"
#include "prm44xx.h"
#include "prminst44xx.h"
#include "prminst44xx.h"
...
...
arch/arm/mach-omap2/sdram-nokia.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/io.h>
#include <linux/io.h>
#include <plat/io.h>
#include <plat/io.h>
#include
<plat/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/sdrc.c
View file @
59136ef3
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
...
...
arch/arm/mach-omap2/sdrc2xxx.c
View file @
59136ef3
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include <linux/clk.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/io.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/sram.h>
#include <plat/sram.h>
...
...
arch/arm/mach-omap2/serial.c
View file @
59136ef3
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#include <plat/omap-serial.h>
#include <plat/omap-serial.h>
#endif
#endif
#include
<plat/common.h>
#include
"common.h"
#include <plat/board.h>
#include <plat/board.h>
#include <plat/clock.h>
#include <plat/clock.h>
#include <plat/dma.h>
#include <plat/dma.h>
...
...
arch/arm/mach-omap2/smartreflex.c
View file @
59136ef3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
#include <linux/pm_runtime.h>
#include
<plat/common.h>
#include
"common.h"
#include "pm.h"
#include "pm.h"
#include "smartreflex.h"
#include "smartreflex.h"
...
...
arch/arm/mach-omap2/timer.c
View file @
59136ef3
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <plat/dmtimer.h>
#include <plat/dmtimer.h>
#include <asm/localtimer.h>
#include <asm/localtimer.h>
#include <asm/sched_clock.h>
#include <asm/sched_clock.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/omap_hwmod.h>
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include <plat/omap_device.h>
#include <plat/omap-pm.h>
#include <plat/omap-pm.h>
...
...
arch/arm/mach-omap2/vc3xxx_data.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "voltage.h"
#include "voltage.h"
...
...
arch/arm/mach-omap2/vc44xx_data.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm44xx.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
...
...
arch/arm/mach-omap2/voltage.c
View file @
59136ef3
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <linux/slab.h>
#include <linux/slab.h>
#include <linux/clk.h>
#include <linux/clk.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
...
...
arch/arm/mach-omap2/voltagedomains3xxx_data.c
View file @
59136ef3
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include <plat/cpu.h>
#include <plat/cpu.h>
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
...
...
arch/arm/mach-omap2/voltagedomains44xx_data.c
View file @
59136ef3
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
#include "prm44xx.h"
#include "prm44xx.h"
...
...
arch/arm/mach-omap2/vp.c
View file @
59136ef3
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "voltage.h"
#include "voltage.h"
#include "vp.h"
#include "vp.h"
...
...
arch/arm/mach-omap2/vp3xxx_data.c
View file @
59136ef3
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-34xx.h"
#include "voltage.h"
#include "voltage.h"
...
...
arch/arm/mach-omap2/vp44xx_data.c
View file @
59136ef3
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/init.h>
#include
<plat/common.h>
#include
"common.h"
#include "prm44xx.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"
#include "prm-regbits-44xx.h"
...
...
arch/arm/mach-pxa/poodle.c
View file @
59136ef3
...
@@ -420,17 +420,11 @@ static void poodle_poweroff(void)
...
@@ -420,17 +420,11 @@ static void poodle_poweroff(void)
arm_machine_restart
(
'h'
,
NULL
);
arm_machine_restart
(
'h'
,
NULL
);
}
}
static
void
poodle_restart
(
char
mode
,
const
char
*
cmd
)
{
arm_machine_restart
(
'h'
,
cmd
);
}
static
void
__init
poodle_init
(
void
)
static
void
__init
poodle_init
(
void
)
{
{
int
ret
=
0
;
int
ret
=
0
;
pm_power_off
=
poodle_poweroff
;
pm_power_off
=
poodle_poweroff
;
arm_pm_restart
=
poodle_restart
;
PCFR
|=
PCFR_OPDE
;
PCFR
|=
PCFR_OPDE
;
...
...
arch/arm/mach-shark/core.c
View file @
59136ef3
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
void
arch_reset
(
char
mode
,
const
char
*
cmd
)
{
{
short
temp
;
short
temp
;
local_irq_disable
();
/* Reset the Machine via pc[3] of the sequoia chipset */
/* Reset the Machine via pc[3] of the sequoia chipset */
outw
(
0x09
,
0x24
);
outw
(
0x09
,
0x24
);
temp
=
inw
(
0x26
);
temp
=
inw
(
0x26
);
...
...
arch/arm/mach-u300/include/mach/system.h
View file @
59136ef3
...
@@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
...
@@ -27,8 +27,6 @@ static void arch_reset(char mode, const char *cmd)
case
's'
:
case
's'
:
case
'h'
:
case
'h'
:
printk
(
KERN_CRIT
"RESET: shutting down/rebooting system
\n
"
);
printk
(
KERN_CRIT
"RESET: shutting down/rebooting system
\n
"
);
/* Disable interrupts */
local_irq_disable
();
#ifdef CONFIG_COH901327_WATCHDOG
#ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset
();
coh901327_watchdog_reset
();
#endif
#endif
...
...
arch/arm/mach-w90x900/irq.c
View file @
59136ef3
...
@@ -28,6 +28,8 @@
...
@@ -28,6 +28,8 @@
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <mach/regs-irq.h>
#include <mach/regs-irq.h>
#include "nuc9xx.h"
struct
group_irq
{
struct
group_irq
{
unsigned
long
gpen
;
unsigned
long
gpen
;
unsigned
int
enabled
;
unsigned
int
enabled
;
...
...
arch/arm/mach-w90x900/nuc910.h
View file @
59136ef3
...
@@ -12,14 +12,7 @@
...
@@ -12,14 +12,7 @@
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*
*
*/
*/
#include "nuc9xx.h"
struct
map_desc
;
struct
sys_timer
;
/* core initialisation functions */
extern
void
nuc900_init_irq
(
void
);
extern
struct
sys_timer
nuc900_timer
;
/* extern file from nuc910.c */
/* extern file from nuc910.c */
...
...
arch/arm/mach-w90x900/nuc950.h
View file @
59136ef3
...
@@ -12,14 +12,7 @@
...
@@ -12,14 +12,7 @@
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*
*
*/
*/
#include "nuc9xx.h"
struct
map_desc
;
struct
sys_timer
;
/* core initialisation functions */
extern
void
nuc900_init_irq
(
void
);
extern
struct
sys_timer
nuc900_timer
;
/* extern file from nuc950.c */
/* extern file from nuc950.c */
...
...
arch/arm/mach-w90x900/nuc960.h
View file @
59136ef3
...
@@ -12,14 +12,7 @@
...
@@ -12,14 +12,7 @@
* published by the Free Software Foundation.
* published by the Free Software Foundation.
*
*
*/
*/
#include "nuc9xx.h"
struct
map_desc
;
struct
sys_timer
;
/* core initialisation functions */
extern
void
nuc900_init_irq
(
void
);
extern
struct
sys_timer
nuc900_timer
;
/* extern file from nuc960.c */
/* extern file from nuc960.c */
...
...
arch/arm/mach-w90x900/nuc9xx.h
0 → 100644
View file @
59136ef3
/*
* arch/arm/mach-w90x900/nuc9xx.h
*
* Copied from nuc910.h, which had:
*
* Copyright (c) 2008 Nuvoton corporation
*
* Header file for NUC900 CPU support
*
* Wan ZongShun <mcuos.com@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
*/
struct
map_desc
;
struct
sys_timer
;
/* core initialisation functions */
extern
void
nuc900_init_irq
(
void
);
extern
struct
sys_timer
nuc900_timer
;
arch/arm/mach-w90x900/time.c
View file @
59136ef3
...
@@ -33,6 +33,8 @@
...
@@ -33,6 +33,8 @@
#include <mach/map.h>
#include <mach/map.h>
#include <mach/regs-timer.h>
#include <mach/regs-timer.h>
#include "nuc9xx.h"
#define RESETINT 0x1f
#define RESETINT 0x1f
#define PERIOD (0x01 << 27)
#define PERIOD (0x01 << 27)
#define ONESHOT (0x00 << 27)
#define ONESHOT (0x00 << 27)
...
...
arch/arm/plat-omap/include/plat/common.h
View file @
59136ef3
...
@@ -27,94 +27,12 @@
...
@@ -27,94 +27,12 @@
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
#include <linux/delay.h>
#include <plat/i2c.h>
#include <plat/i2c.h>
struct
sys_timer
;
extern
void
omap_map_common_io
(
void
);
extern
struct
sys_timer
omap1_timer
;
extern
struct
sys_timer
omap2_timer
;
extern
struct
sys_timer
omap3_timer
;
extern
struct
sys_timer
omap3_secure_timer
;
extern
struct
sys_timer
omap4_timer
;
extern
bool
omap_32k_timer_init
(
void
);
extern
int
__init
omap_init_clocksource_32k
(
void
);
extern
int
__init
omap_init_clocksource_32k
(
void
);
extern
unsigned
long
long
notrace
omap_32k_sched_clock
(
void
);
extern
unsigned
long
long
notrace
omap_32k_sched_clock
(
void
);
extern
void
omap_reserve
(
void
);
extern
void
omap_reserve
(
void
);
void
omap2420_init_early
(
void
);
void
omap2430_init_early
(
void
);
void
omap3430_init_early
(
void
);
void
omap35xx_init_early
(
void
);
void
omap3630_init_early
(
void
);
void
omap3_init_early
(
void
);
/* Do not use this one */
void
am35xx_init_early
(
void
);
void
ti816x_init_early
(
void
);
void
omap4430_init_early
(
void
);
void
omap_sram_init
(
void
);
void
omap_sram_init
(
void
);
/*
* IO bases for various OMAP processors
* Except the tap base, rest all the io bases
* listed are physical addresses.
*/
struct
omap_globals
{
u32
class
;
/* OMAP class to detect */
void
__iomem
*
tap
;
/* Control module ID code */
void
__iomem
*
sdrc
;
/* SDRAM Controller */
void
__iomem
*
sms
;
/* SDRAM Memory Scheduler */
void
__iomem
*
ctrl
;
/* System Control Module */
void
__iomem
*
ctrl_pad
;
/* PAD Control Module */
void
__iomem
*
prm
;
/* Power and Reset Management */
void
__iomem
*
cm
;
/* Clock Management */
void
__iomem
*
cm2
;
};
void
omap2_set_globals_242x
(
void
);
void
omap2_set_globals_243x
(
void
);
void
omap2_set_globals_3xxx
(
void
);
void
omap2_set_globals_443x
(
void
);
void
omap2_set_globals_ti816x
(
void
);
/* These get called from omap2_set_globals_xxxx(), do not call these */
void
omap2_set_globals_tap
(
struct
omap_globals
*
);
void
omap2_set_globals_sdrc
(
struct
omap_globals
*
);
void
omap2_set_globals_control
(
struct
omap_globals
*
);
void
omap2_set_globals_prcm
(
struct
omap_globals
*
);
void
omap242x_map_io
(
void
);
void
omap243x_map_io
(
void
);
void
omap3_map_io
(
void
);
void
omap4_map_io
(
void
);
/**
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
* @timeout: maximum number of microseconds in the timeout
* @index: loop index (integer)
*
* Loop waiting for @cond to become true or until at least @timeout
* microseconds have passed. To use, define some integer @index in the
* calling code. After running, if @index == @timeout, then the loop has
* timed out.
*/
#define omap_test_timeout(cond, timeout, index) \
({ \
for (index = 0; index < timeout; index++) { \
if (cond) \
break; \
udelay(1); \
} \
})
extern
struct
device
*
omap2_get_mpuss_device
(
void
);
extern
struct
device
*
omap2_get_iva_device
(
void
);
extern
struct
device
*
omap2_get_l3_device
(
void
);
extern
struct
device
*
omap4_get_dsp_device
(
void
);
#endif
/* __ARCH_ARM_MACH_OMAP_COMMON_H */
#endif
/* __ARCH_ARM_MACH_OMAP_COMMON_H */
arch/arm/plat-omap/include/plat/io.h
View file @
59136ef3
...
@@ -257,74 +257,6 @@ extern void omap_writew(u16 v, u32 pa);
...
@@ -257,74 +257,6 @@ extern void omap_writew(u16 v, u32 pa);
extern
void
omap_writel
(
u32
v
,
u32
pa
);
extern
void
omap_writel
(
u32
v
,
u32
pa
);
struct
omap_sdrc_params
;
struct
omap_sdrc_params
;
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void
omap7xx_map_io
(
void
);
#else
static
inline
void
omap_map_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
void
omap15xx_map_io
(
void
);
#else
static
inline
void
omap15xx_map_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP16XX
void
omap16xx_map_io
(
void
);
#else
static
inline
void
omap16xx_map_io
(
void
)
{
}
#endif
void
omap1_init_early
(
void
);
#ifdef CONFIG_SOC_OMAP2420
extern
void
omap242x_map_common_io
(
void
);
#else
static
inline
void
omap242x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_SOC_OMAP2430
extern
void
omap243x_map_common_io
(
void
);
#else
static
inline
void
omap243x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP3
extern
void
omap34xx_map_common_io
(
void
);
#else
static
inline
void
omap34xx_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_SOC_OMAPTI816X
extern
void
omapti816x_map_common_io
(
void
);
#else
static
inline
void
omapti816x_map_common_io
(
void
)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP4
extern
void
omap44xx_map_common_io
(
void
);
#else
static
inline
void
omap44xx_map_common_io
(
void
)
{
}
#endif
extern
void
omap2_init_common_infrastructure
(
void
);
extern
void
omap_sdrc_init
(
struct
omap_sdrc_params
*
sdrc_cs0
,
extern
void
omap_sdrc_init
(
struct
omap_sdrc_params
*
sdrc_cs0
,
struct
omap_sdrc_params
*
sdrc_cs1
);
struct
omap_sdrc_params
*
sdrc_cs1
);
...
...
arch/arm/plat-omap/include/plat/irqs.h
View file @
59136ef3
...
@@ -438,16 +438,6 @@
...
@@ -438,16 +438,6 @@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
extern
void
__iomem
*
omap_irq_base
;
extern
void
__iomem
*
omap_irq_base
;
void
omap1_init_irq
(
void
);
void
omap2_init_irq
(
void
);
void
omap3_init_irq
(
void
);
void
ti816x_init_irq
(
void
);
extern
int
omap_irq_pending
(
void
);
void
omap_intc_save_context
(
void
);
void
omap_intc_restore_context
(
void
);
void
omap3_intc_suspend
(
void
);
void
omap3_intc_prepare_idle
(
void
);
void
omap3_intc_resume_idle
(
void
);
#endif
#endif
#include <mach/hardware.h>
#include <mach/hardware.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