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
92794a5d
Commit
92794a5d
authored
Apr 29, 2008
by
Russell King
Committed by
Russell King
Apr 29, 2008
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'pxa' and 'orion-fixes1'
parents
681587c5
7883938b
b46926bb
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
153 additions
and
167 deletions
+153
-167
arch/arm/configs/am200epdkit_defconfig
arch/arm/configs/am200epdkit_defconfig
+11
-11
arch/arm/kernel/kprobes-decode.c
arch/arm/kernel/kprobes-decode.c
+1
-1
arch/arm/kernel/kprobes.c
arch/arm/kernel/kprobes.c
+1
-1
arch/arm/mach-orion5x/addr-map.c
arch/arm/mach-orion5x/addr-map.c
+2
-2
arch/arm/mach-orion5x/common.c
arch/arm/mach-orion5x/common.c
+3
-3
arch/arm/mach-orion5x/common.h
arch/arm/mach-orion5x/common.h
+1
-2
arch/arm/mach-orion5x/db88f5281-setup.c
arch/arm/mach-orion5x/db88f5281-setup.c
+7
-4
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-orion5x/dns323-setup.c
+11
-6
arch/arm/mach-orion5x/kurobox_pro-setup.c
arch/arm/mach-orion5x/kurobox_pro-setup.c
+11
-5
arch/arm/mach-orion5x/pci.c
arch/arm/mach-orion5x/pci.c
+14
-6
arch/arm/mach-orion5x/rd88f5182-setup.c
arch/arm/mach-orion5x/rd88f5182-setup.c
+7
-4
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/mach-orion5x/ts209-setup.c
+8
-5
arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/Makefile
+3
-3
arch/arm/mach-pxa/gumstix.c
arch/arm/mach-pxa/gumstix.c
+1
-0
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/magician.c
+52
-9
arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/pm.c
+2
-2
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/pxa3xx.c
+2
-0
arch/arm/mm/Kconfig
arch/arm/mm/Kconfig
+1
-1
arch/arm/mm/proc-feroceon.S
arch/arm/mm/proc-feroceon.S
+0
-43
drivers/mfd/htc-pasic3.c
drivers/mfd/htc-pasic3.c
+5
-4
include/asm-arm/arch-orion5x/io.h
include/asm-arm/arch-orion5x/io.h
+4
-5
include/asm-arm/arch-pxa/irqs.h
include/asm-arm/arch-pxa/irqs.h
+4
-1
include/asm-arm/arch-pxa/magician.h
include/asm-arm/arch-pxa/magician.h
+0
-49
include/asm-arm/arch-pxa/system.h
include/asm-arm/arch-pxa/system.h
+2
-0
No files found.
arch/arm/configs/am200epdkit_defconfig
View file @
92794a5d
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25
-rc3
# Linux kernel version: 2.6.25
# Sun
Mar 9 06:33:33
2008
# Sun
Apr 20 00:29:49
2008
#
#
CONFIG_ARM=y
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
...
@@ -51,7 +51,8 @@ CONFIG_FAIR_GROUP_SCHED=y
...
@@ -51,7 +51,8 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_USER_SCHED=y
CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUP_SCHED is not set
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
# CONFIG_NAMESPACES is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_BLK_DEV_INITRD is not set
...
@@ -85,6 +86,7 @@ CONFIG_SLAB=y
...
@@ -85,6 +86,7 @@ CONFIG_SLAB=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
# CONFIG_KPROBES is not set
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_SLABINFO=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_RT_MUTEXES=y
...
@@ -115,7 +117,6 @@ CONFIG_IOSCHED_NOOP=y
...
@@ -115,7 +117,6 @@ CONFIG_IOSCHED_NOOP=y
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
CONFIG_DEFAULT_IOSCHED="noop"
CONFIG_CLASSIC_RCU=y
CONFIG_CLASSIC_RCU=y
# CONFIG_PREEMPT_RCU is not set
#
#
# System Type
# System Type
...
@@ -320,8 +321,6 @@ CONFIG_TCP_CONG_CUBIC=y
...
@@ -320,8 +321,6 @@ CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set
# CONFIG_NETFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_DCCP is not set
...
@@ -383,7 +382,6 @@ CONFIG_IEEE80211=m
...
@@ -383,7 +382,6 @@ CONFIG_IEEE80211=m
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_WEP=m
# CONFIG_IEEE80211_CRYPT_CCMP is not set
# CONFIG_IEEE80211_CRYPT_CCMP is not set
# CONFIG_IEEE80211_CRYPT_TKIP is not set
# CONFIG_IEEE80211_CRYPT_TKIP is not set
# CONFIG_IEEE80211_SOFTMAC is not set
# CONFIG_RFKILL is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
# CONFIG_NET_9P is not set
...
@@ -503,7 +501,7 @@ CONFIG_IDE_MAX_HWIFS=2
...
@@ -503,7 +501,7 @@ CONFIG_IDE_MAX_HWIFS=2
CONFIG_BLK_DEV_IDE=m
CONFIG_BLK_DEV_IDE=m
#
#
# Please see Documentation/ide.txt for help/info on IDE drives
# Please see Documentation/ide
/ide
.txt for help/info on IDE drives
#
#
# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=m
CONFIG_BLK_DEV_IDEDISK=m
...
@@ -518,10 +516,9 @@ CONFIG_IDE_PROC_FS=y
...
@@ -518,10 +516,9 @@ CONFIG_IDE_PROC_FS=y
#
#
# IDE chipset support/bugfixes
# IDE chipset support/bugfixes
#
#
CONFIG_IDE_GENERIC=m
# CONFIG_BLK_DEV_PLATFORM is not set
# CONFIG_BLK_DEV_PLATFORM is not set
# CONFIG_BLK_DEV_IDEDMA is not set
# CONFIG_BLK_DEV_IDEDMA is not set
CONFIG_IDE_ARCH_OBSOLETE_INIT=y
# CONFIG_BLK_DEV_HD_ONLY is not set
# CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_HD is not set
#
#
...
@@ -562,6 +559,7 @@ CONFIG_NETDEV_10000=y
...
@@ -562,6 +559,7 @@ CONFIG_NETDEV_10000=y
#
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_NET_PCMCIA is not set
# CONFIG_NET_PCMCIA is not set
# CONFIG_WAN is not set
# CONFIG_WAN is not set
# CONFIG_PPP is not set
# CONFIG_PPP is not set
...
@@ -707,6 +705,8 @@ CONFIG_SSB_POSSIBLE=y
...
@@ -707,6 +705,8 @@ CONFIG_SSB_POSSIBLE=y
#
#
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
#
#
# Multimedia devices
# Multimedia devices
...
@@ -745,6 +745,7 @@ CONFIG_FB_TILEBLITTING=y
...
@@ -745,6 +745,7 @@ CONFIG_FB_TILEBLITTING=y
CONFIG_FB_PXA=y
CONFIG_FB_PXA=y
CONFIG_FB_PXA_PARAMETERS=y
CONFIG_FB_PXA_PARAMETERS=y
CONFIG_FB_MBX=m
CONFIG_FB_MBX=m
# CONFIG_FB_METRONOME is not set
CONFIG_FB_VIRTUAL=m
CONFIG_FB_VIRTUAL=m
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
...
@@ -891,7 +892,6 @@ CONFIG_RTC_LIB=y
...
@@ -891,7 +892,6 @@ CONFIG_RTC_LIB=y
# CONFIG_JFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_DNOTIFY is not set
# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY=y
...
...
arch/arm/kernel/kprobes-decode.c
View file @
92794a5d
...
@@ -1176,7 +1176,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
...
@@ -1176,7 +1176,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
* *S (bit 20) updates condition codes
* *S (bit 20) updates condition codes
* ADC/SBC/RSC reads the C flag
* ADC/SBC/RSC reads the C flag
*/
*/
insn
&=
0xfff00ff
0
;
/* Rn = r0, Rd = r0 */
insn
&=
0xfff00ff
f
;
/* Rn = r0, Rd = r0 */
asi
->
insn
[
0
]
=
insn
;
asi
->
insn
[
0
]
=
insn
;
asi
->
insn_handler
=
(
insn
&
(
1
<<
20
))
?
/* S-bit */
asi
->
insn_handler
=
(
insn
&
(
1
<<
20
))
?
/* S-bit */
emulate_alu_imm_rwflags
:
emulate_alu_imm_rflags
;
emulate_alu_imm_rwflags
:
emulate_alu_imm_rflags
;
...
...
arch/arm/kernel/kprobes.c
View file @
92794a5d
...
@@ -66,7 +66,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
...
@@ -66,7 +66,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
return
-
ENOMEM
;
return
-
ENOMEM
;
for
(
is
=
0
;
is
<
MAX_INSN_SIZE
;
++
is
)
for
(
is
=
0
;
is
<
MAX_INSN_SIZE
;
++
is
)
p
->
ainsn
.
insn
[
is
]
=
tmp_insn
[
is
];
p
->
ainsn
.
insn
[
is
]
=
tmp_insn
[
is
];
flush_insns
(
&
p
->
ainsn
.
insn
,
MAX_INSN_SIZE
);
flush_insns
(
p
->
ainsn
.
insn
,
MAX_INSN_SIZE
);
break
;
break
;
case
INSN_GOOD_NO_SLOT
:
/* instruction doesn't need insn slot */
case
INSN_GOOD_NO_SLOT
:
/* instruction doesn't need insn slot */
...
...
arch/arm/mach-orion5x/addr-map.c
View file @
92794a5d
...
@@ -19,14 +19,14 @@
...
@@ -19,14 +19,14 @@
/*
/*
* The Orion has fully programable address map. There's a separate address
* The Orion has fully programable address map. There's a separate address
* map for each of the device _master_ interfaces, e.g. CPU, PCI, PCI
E
, USB,
* map for each of the device _master_ interfaces, e.g. CPU, PCI, PCI
e
, USB,
* Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
* Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
* address decode windows that allow it to access any of the Orion resources.
* address decode windows that allow it to access any of the Orion resources.
*
*
* CPU address decoding --
* CPU address decoding --
* Linux assumes that it is the boot loader that already setup the access to
* Linux assumes that it is the boot loader that already setup the access to
* DDR and internal registers.
* DDR and internal registers.
* Setup access to PCI and PCI
-E
IO/MEM space is issued by this file.
* Setup access to PCI and PCI
e
IO/MEM space is issued by this file.
* Setup access to various devices located on the device bus interface (e.g.
* Setup access to various devices located on the device bus interface (e.g.
* flashes, RTC, etc) should be issued by machine-setup.c according to
* flashes, RTC, etc) should be issued by machine-setup.c according to
* specific board population (by using orion5x_setup_*_win()).
* specific board population (by using orion5x_setup_*_win()).
...
...
arch/arm/mach-orion5x/common.c
View file @
92794a5d
...
@@ -132,7 +132,7 @@ static struct platform_device orion5x_uart = {
...
@@ -132,7 +132,7 @@ static struct platform_device orion5x_uart = {
static
struct
resource
orion5x_ehci0_resources
[]
=
{
static
struct
resource
orion5x_ehci0_resources
[]
=
{
{
{
.
start
=
ORION5X_USB0_PHYS_BASE
,
.
start
=
ORION5X_USB0_PHYS_BASE
,
.
end
=
ORION5X_USB0_PHYS_BASE
+
SZ_4K
,
.
end
=
ORION5X_USB0_PHYS_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
.
flags
=
IORESOURCE_MEM
,
},
},
{
{
...
@@ -145,7 +145,7 @@ static struct resource orion5x_ehci0_resources[] = {
...
@@ -145,7 +145,7 @@ static struct resource orion5x_ehci0_resources[] = {
static
struct
resource
orion5x_ehci1_resources
[]
=
{
static
struct
resource
orion5x_ehci1_resources
[]
=
{
{
{
.
start
=
ORION5X_USB1_PHYS_BASE
,
.
start
=
ORION5X_USB1_PHYS_BASE
,
.
end
=
ORION5X_USB1_PHYS_BASE
+
SZ_4K
,
.
end
=
ORION5X_USB1_PHYS_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
.
flags
=
IORESOURCE_MEM
,
},
},
{
{
...
@@ -317,7 +317,7 @@ struct sys_timer orion5x_timer = {
...
@@ -317,7 +317,7 @@ struct sys_timer orion5x_timer = {
****************************************************************************/
****************************************************************************/
/*
/*
* Identify device ID and rev from PCI
E
configuration header space '0'.
* Identify device ID and rev from PCI
e
configuration header space '0'.
*/
*/
static
void
__init
orion5x_id
(
u32
*
dev
,
u32
*
rev
,
char
**
dev_name
)
static
void
__init
orion5x_id
(
u32
*
dev
,
u32
*
rev
,
char
**
dev_name
)
{
{
...
...
arch/arm/mach-orion5x/common.h
View file @
92794a5d
...
@@ -33,10 +33,9 @@ struct pci_sys_data;
...
@@ -33,10 +33,9 @@ struct pci_sys_data;
struct
pci_bus
;
struct
pci_bus
;
void
orion5x_pcie_id
(
u32
*
dev
,
u32
*
rev
);
void
orion5x_pcie_id
(
u32
*
dev
,
u32
*
rev
);
int
orion5x_pcie_local_bus_nr
(
void
);
int
orion5x_pci_local_bus_nr
(
void
);
int
orion5x_pci_sys_setup
(
int
nr
,
struct
pci_sys_data
*
sys
);
int
orion5x_pci_sys_setup
(
int
nr
,
struct
pci_sys_data
*
sys
);
struct
pci_bus
*
orion5x_pci_sys_scan_bus
(
int
nr
,
struct
pci_sys_data
*
sys
);
struct
pci_bus
*
orion5x_pci_sys_scan_bus
(
int
nr
,
struct
pci_sys_data
*
sys
);
int
orion5x_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
);
/*
/*
* Valid GPIO pins according to MPP setup, used by machine-setup.
* Valid GPIO pins according to MPP setup, used by machine-setup.
...
...
arch/arm/mach-orion5x/db88f5281-setup.c
View file @
92794a5d
...
@@ -241,14 +241,17 @@ void __init db88f5281_pci_preinit(void)
...
@@ -241,14 +241,17 @@ void __init db88f5281_pci_preinit(void)
static
int
__init
db88f5281_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
static
int
__init
db88f5281_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
{
int
irq
;
/*
/*
*
PCIE IRQ is connected internally (not GPIO)
*
Check for devices with hard-wired IRQs.
*/
*/
if
(
dev
->
bus
->
number
==
orion5x_pcie_local_bus_nr
())
irq
=
orion5x_pci_map_irq
(
dev
,
slot
,
pin
);
return
IRQ_ORION5X_PCIE0_INT
;
if
(
irq
!=
-
1
)
return
irq
;
/*
/*
* PCI IRQs are connected via GPIOs
* PCI IRQs are connected via GPIOs
.
*/
*/
switch
(
slot
-
DB88F5281_PCI_SLOT0_OFFS
)
{
switch
(
slot
-
DB88F5281_PCI_SLOT0_OFFS
)
{
case
0
:
case
0
:
...
...
arch/arm/mach-orion5x/dns323-setup.c
View file @
92794a5d
...
@@ -43,11 +43,16 @@
...
@@ -43,11 +43,16 @@
static
int
__init
dns323_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
static
int
__init
dns323_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
{
/* PCI-E */
int
irq
;
if
(
dev
->
bus
->
number
==
orion5x_pcie_local_bus_nr
())
return
IRQ_ORION5X_PCIE0_INT
;
pr_err
(
"%s: requested mapping for unknown bus
\n
"
,
__func__
);
/*
* Check for devices with hard-wired IRQs.
*/
irq
=
orion5x_pci_map_irq
(
dev
,
slot
,
pin
);
if
(
irq
!=
-
1
)
return
irq
;
pr_err
(
"%s: requested mapping for unknown device
\n
"
,
__func__
);
return
-
1
;
return
-
1
;
}
}
...
@@ -253,9 +258,9 @@ static void __init dns323_init(void)
...
@@ -253,9 +258,9 @@ static void __init dns323_init(void)
*/
*/
orion5x_setup_dev_boot_win
(
DNS323_NOR_BOOT_BASE
,
DNS323_NOR_BOOT_SIZE
);
orion5x_setup_dev_boot_win
(
DNS323_NOR_BOOT_BASE
,
DNS323_NOR_BOOT_SIZE
);
/* DNS-323 has a Marvell 88X7042 SATA controller attached via PCI
E
/* DNS-323 has a Marvell 88X7042 SATA controller attached via PCI
e
*
*
* Open a special address decode windows for the PCI
E
WA.
* Open a special address decode windows for the PCI
e
WA.
*/
*/
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
ORION5X_PCIE_WA_SIZE
);
ORION5X_PCIE_WA_SIZE
);
...
...
arch/arm/mach-orion5x/kurobox_pro-setup.c
View file @
92794a5d
...
@@ -120,12 +120,18 @@ static struct platform_device kurobox_pro_nor_flash = {
...
@@ -120,12 +120,18 @@ static struct platform_device kurobox_pro_nor_flash = {
static
int
__init
kurobox_pro_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
static
int
__init
kurobox_pro_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
{
int
irq
;
/*
* Check for devices with hard-wired IRQs.
*/
irq
=
orion5x_pci_map_irq
(
dev
,
slot
,
pin
);
if
(
irq
!=
-
1
)
return
irq
;
/*
/*
* PCI isn't used on the Kuro
* PCI isn't used on the Kuro
*/
*/
if
(
dev
->
bus
->
number
==
orion5x_pcie_local_bus_nr
())
return
IRQ_ORION5X_PCIE0_INT
;
else
printk
(
KERN_ERR
"kurobox_pro_pci_map_irq failed, unknown bus
\n
"
);
printk
(
KERN_ERR
"kurobox_pro_pci_map_irq failed, unknown bus
\n
"
);
return
-
1
;
return
-
1
;
...
@@ -193,7 +199,7 @@ static void __init kurobox_pro_init(void)
...
@@ -193,7 +199,7 @@ static void __init kurobox_pro_init(void)
orion5x_setup_dev0_win
(
KUROBOX_PRO_NAND_BASE
,
KUROBOX_PRO_NAND_SIZE
);
orion5x_setup_dev0_win
(
KUROBOX_PRO_NAND_BASE
,
KUROBOX_PRO_NAND_SIZE
);
/*
/*
* Open a special address decode windows for the PCI
E
WA.
* Open a special address decode windows for the PCI
e
WA.
*/
*/
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
ORION5X_PCIE_WA_SIZE
);
ORION5X_PCIE_WA_SIZE
);
...
...
arch/arm/mach-orion5x/pci.c
View file @
92794a5d
...
@@ -41,11 +41,6 @@ void __init orion5x_pcie_id(u32 *dev, u32 *rev)
...
@@ -41,11 +41,6 @@ void __init orion5x_pcie_id(u32 *dev, u32 *rev)
*
rev
=
orion_pcie_rev
(
PCIE_BASE
);
*
rev
=
orion_pcie_rev
(
PCIE_BASE
);
}
}
int
__init
orion5x_pcie_local_bus_nr
(
void
)
{
return
orion_pcie_get_local_bus_nr
(
PCIE_BASE
);
}
static
int
pcie_valid_config
(
int
bus
,
int
dev
)
static
int
pcie_valid_config
(
int
bus
,
int
dev
)
{
{
/*
/*
...
@@ -269,7 +264,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
...
@@ -269,7 +264,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
*/
*/
static
DEFINE_SPINLOCK
(
orion5x_pci_lock
);
static
DEFINE_SPINLOCK
(
orion5x_pci_lock
);
int
orion5x_pci_local_bus_nr
(
void
)
static
int
orion5x_pci_local_bus_nr
(
void
)
{
{
u32
conf
=
orion5x_read
(
PCI_P2P_CONF
);
u32
conf
=
orion5x_read
(
PCI_P2P_CONF
);
return
((
conf
&
PCI_P2P_BUS_MASK
)
>>
PCI_P2P_BUS_OFFS
);
return
((
conf
&
PCI_P2P_BUS_MASK
)
>>
PCI_P2P_BUS_OFFS
);
...
@@ -557,3 +552,16 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys
...
@@ -557,3 +552,16 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys
return
bus
;
return
bus
;
}
}
int
__init
orion5x_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
int
bus
=
dev
->
bus
->
number
;
/*
* PCIe endpoint?
*/
if
(
bus
<
orion5x_pci_local_bus_nr
())
return
IRQ_ORION5X_PCIE0_INT
;
return
-
1
;
}
arch/arm/mach-orion5x/rd88f5182-setup.c
View file @
92794a5d
...
@@ -172,11 +172,14 @@ void __init rd88f5182_pci_preinit(void)
...
@@ -172,11 +172,14 @@ void __init rd88f5182_pci_preinit(void)
static
int
__init
rd88f5182_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
static
int
__init
rd88f5182_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
{
int
irq
;
/*
/*
*
PCI-E isn't used on the RD2
*
Check for devices with hard-wired IRQs.
*/
*/
if
(
dev
->
bus
->
number
==
orion5x_pcie_local_bus_nr
())
irq
=
orion5x_pci_map_irq
(
dev
,
slot
,
pin
);
return
IRQ_ORION5X_PCIE0_INT
;
if
(
irq
!=
-
1
)
return
irq
;
/*
/*
* PCI IRQs are connected via GPIOs
* PCI IRQs are connected via GPIOs
...
@@ -259,7 +262,7 @@ static void __init rd88f5182_init(void)
...
@@ -259,7 +262,7 @@ static void __init rd88f5182_init(void)
orion5x_setup_dev1_win
(
RD88F5182_NOR_BASE
,
RD88F5182_NOR_SIZE
);
orion5x_setup_dev1_win
(
RD88F5182_NOR_BASE
,
RD88F5182_NOR_SIZE
);
/*
/*
* Open a special address decode windows for the PCI
E
WA.
* Open a special address decode windows for the PCI
e
WA.
*/
*/
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
ORION5X_PCIE_WA_SIZE
);
ORION5X_PCIE_WA_SIZE
);
...
...
arch/arm/mach-orion5x/ts209-setup.c
View file @
92794a5d
...
@@ -141,14 +141,17 @@ void __init qnap_ts209_pci_preinit(void)
...
@@ -141,14 +141,17 @@ void __init qnap_ts209_pci_preinit(void)
static
int
__init
qnap_ts209_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
static
int
__init
qnap_ts209_pci_map_irq
(
struct
pci_dev
*
dev
,
u8
slot
,
u8
pin
)
{
{
int
irq
;
/*
/*
*
PCIE IRQ is connected internally (not GPIO)
*
Check for devices with hard-wired IRQs.
*/
*/
if
(
dev
->
bus
->
number
==
orion5x_pcie_local_bus_nr
())
irq
=
orion5x_pci_map_irq
(
dev
,
slot
,
pin
);
return
IRQ_ORION5X_PCIE0_INT
;
if
(
irq
!=
-
1
)
return
irq
;
/*
/*
* PCI IRQs are connected via GPIOs
* PCI IRQs are connected via GPIOs
.
*/
*/
switch
(
slot
-
QNAP_TS209_PCI_SLOT0_OFFS
)
{
switch
(
slot
-
QNAP_TS209_PCI_SLOT0_OFFS
)
{
case
0
:
case
0
:
...
@@ -373,7 +376,7 @@ static void __init qnap_ts209_init(void)
...
@@ -373,7 +376,7 @@ static void __init qnap_ts209_init(void)
QNAP_TS209_NOR_BOOT_SIZE
);
QNAP_TS209_NOR_BOOT_SIZE
);
/*
/*
* Open a special address decode windows for the PCI
E
WA.
* Open a special address decode windows for the PCI
e
WA.
*/
*/
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
orion5x_setup_pcie_wa_win
(
ORION5X_PCIE_WA_PHYS_BASE
,
ORION5X_PCIE_WA_SIZE
);
ORION5X_PCIE_WA_SIZE
);
...
...
arch/arm/mach-pxa/Makefile
View file @
92794a5d
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
# Common support (must be linked before board specific support)
# Common support (must be linked before board specific support)
obj-y
+=
clock.o devices.o generic.o irq.o dma.o
\
obj-y
+=
clock.o devices.o generic.o irq.o dma.o
\
time.o gpio.o
time.o gpio.o
obj-$(CONFIG_PXA25x)
+=
pxa25x.o mfp-pxa2x
x.o
obj-$(CONFIG_PXA25x)
+=
mfp-pxa2xx.o pxa25
x.o
obj-$(CONFIG_PXA27x)
+=
pxa27x.o mfp-pxa2x
x.o
obj-$(CONFIG_PXA27x)
+=
mfp-pxa2xx.o pxa27
x.o
obj-$(CONFIG_PXA3xx)
+=
pxa3xx.o mfp-
pxa3xx.o smemc.o
obj-$(CONFIG_PXA3xx)
+=
mfp-pxa3xx.o
pxa3xx.o smemc.o
obj-$(CONFIG_CPU_PXA300)
+=
pxa300.o
obj-$(CONFIG_CPU_PXA300)
+=
pxa300.o
obj-$(CONFIG_CPU_PXA320)
+=
pxa320.o
obj-$(CONFIG_CPU_PXA320)
+=
pxa320.o
...
...
arch/arm/mach-pxa/gumstix.c
View file @
92794a5d
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/pxa2xx-gpio.h>
#include "generic.h"
#include "generic.h"
...
...
arch/arm/mach-pxa/magician.c
View file @
92794a5d
...
@@ -114,6 +114,14 @@ static unsigned long magician_pin_config[] = {
...
@@ -114,6 +114,14 @@ static unsigned long magician_pin_config[] = {
GPIO82_CIF_DD_5
,
GPIO82_CIF_DD_5
,
GPIO84_CIF_FV
,
GPIO84_CIF_FV
,
GPIO85_CIF_LV
,
GPIO85_CIF_LV
,
/* Magician specific input GPIOs */
GPIO9_GPIO
,
/* unknown */
GPIO10_GPIO
,
/* GSM_IRQ */
GPIO13_GPIO
,
/* CPLD_IRQ */
GPIO107_GPIO
,
/* DS1WM_IRQ */
GPIO108_GPIO
,
/* GSM_READY */
GPIO115_GPIO
,
/* nPEN_IRQ */
};
};
/*
/*
...
@@ -438,7 +446,7 @@ static struct pasic3_led pasic3_leds[] = {
...
@@ -438,7 +446,7 @@ static struct pasic3_led pasic3_leds[] = {
static
struct
platform_device
pasic3
;
static
struct
platform_device
pasic3
;
static
struct
pasic3_leds_machinfo
__devinit
pasic3_leds_info
=
{
static
struct
pasic3_leds_machinfo
pasic3_leds_info
=
{
.
num_leds
=
ARRAY_SIZE
(
pasic3_leds
),
.
num_leds
=
ARRAY_SIZE
(
pasic3_leds
),
.
power_gpio
=
EGPIO_MAGICIAN_LED_POWER
,
.
power_gpio
=
EGPIO_MAGICIAN_LED_POWER
,
.
leds
=
pasic3_leds
,
.
leds
=
pasic3_leds
,
...
@@ -543,9 +551,28 @@ static struct platform_device power_supply = {
...
@@ -543,9 +551,28 @@ static struct platform_device power_supply = {
static
int
magician_mci_init
(
struct
device
*
dev
,
static
int
magician_mci_init
(
struct
device
*
dev
,
irq_handler_t
detect_irq
,
void
*
data
)
irq_handler_t
detect_irq
,
void
*
data
)
{
{
return
request_irq
(
IRQ_MAGICIAN_SD
,
detect_irq
,
int
err
;
err
=
request_irq
(
IRQ_MAGICIAN_SD
,
detect_irq
,
IRQF_DISABLED
|
IRQF_SAMPLE_RANDOM
,
IRQF_DISABLED
|
IRQF_SAMPLE_RANDOM
,
"MMC card detect"
,
data
);
"MMC card detect"
,
data
);
if
(
err
)
goto
err_request_irq
;
err
=
gpio_request
(
EGPIO_MAGICIAN_SD_POWER
,
"SD_POWER"
);
if
(
err
)
goto
err_request_power
;
err
=
gpio_request
(
EGPIO_MAGICIAN_nSD_READONLY
,
"nSD_READONLY"
);
if
(
err
)
goto
err_request_readonly
;
return
0
;
err_request_readonly:
gpio_free
(
EGPIO_MAGICIAN_SD_POWER
);
err_request_power:
free_irq
(
IRQ_MAGICIAN_SD
,
data
);
err_request_irq:
return
err
;
}
}
static
void
magician_mci_setpower
(
struct
device
*
dev
,
unsigned
int
vdd
)
static
void
magician_mci_setpower
(
struct
device
*
dev
,
unsigned
int
vdd
)
...
@@ -562,6 +589,8 @@ static int magician_mci_get_ro(struct device *dev)
...
@@ -562,6 +589,8 @@ static int magician_mci_get_ro(struct device *dev)
static
void
magician_mci_exit
(
struct
device
*
dev
,
void
*
data
)
static
void
magician_mci_exit
(
struct
device
*
dev
,
void
*
data
)
{
{
gpio_free
(
EGPIO_MAGICIAN_nSD_READONLY
);
gpio_free
(
EGPIO_MAGICIAN_SD_POWER
);
free_irq
(
IRQ_MAGICIAN_SD
,
data
);
free_irq
(
IRQ_MAGICIAN_SD
,
data
);
}
}
...
@@ -643,28 +672,42 @@ static void __init magician_init(void)
...
@@ -643,28 +672,42 @@ static void __init magician_init(void)
{
{
void
__iomem
*
cpld
;
void
__iomem
*
cpld
;
int
lcd_select
;
int
lcd_select
;
int
err
;
gpio_request
(
GPIO13_MAGICIAN_CPLD_IRQ
,
"CPLD_IRQ"
);
gpio_request
(
GPIO107_MAGICIAN_DS1WM_IRQ
,
"DS1WM_IRQ"
);
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
magician_pin_config
));
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
magician_pin_config
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
err
=
gpio_request
(
GPIO83_MAGICIAN_nIR_EN
,
"nIR_EN"
);
if
(
!
err
)
{
gpio_direction_output
(
GPIO83_MAGICIAN_nIR_EN
,
1
);
pxa_set_ficp_info
(
&
magician_ficp_info
);
}
pxa_set_i2c_info
(
NULL
);
pxa_set_i2c_info
(
NULL
);
pxa_set_mci_info
(
&
magician_mci_info
);
pxa_set_mci_info
(
&
magician_mci_info
);
pxa_set_ohci_info
(
&
magician_ohci_info
);
pxa_set_ohci_info
(
&
magician_ohci_info
);
pxa_set_ficp_info
(
&
magician_ficp_info
);
/* Check LCD type we have */
/* Check LCD type we have */
cpld
=
ioremap_nocache
(
PXA_CS3_PHYS
,
0x1000
);
cpld
=
ioremap_nocache
(
PXA_CS3_PHYS
,
0x1000
);
if
(
cpld
)
{
if
(
cpld
)
{
u8
board_id
=
__raw_readb
(
cpld
+
0x14
);
u8
board_id
=
__raw_readb
(
cpld
+
0x14
);
iounmap
(
cpld
);
system_rev
=
board_id
&
0x7
;
system_rev
=
board_id
&
0x7
;
lcd_select
=
board_id
&
0x8
;
lcd_select
=
board_id
&
0x8
;
iounmap
(
cpld
);
pr_info
(
"LCD type: %s
\n
"
,
lcd_select
?
"Samsung"
:
"Toppoly"
);
pr_info
(
"LCD type: %s
\n
"
,
lcd_select
?
"Samsung"
:
"Toppoly"
);
if
(
lcd_select
&&
(
system_rev
<
3
))
if
(
lcd_select
&&
(
system_rev
<
3
))
{
pxa_gpio_mode
(
GPIO75_MAGICIAN_SAMSUNG_POWER_MD
);
gpio_request
(
GPIO75_MAGICIAN_SAMSUNG_POWER
,
"SAMSUNG_POWER"
);
pxa_gpio_mode
(
GPIO104_MAGICIAN_LCD_POWER_1_MD
);
gpio_direction_output
(
GPIO75_MAGICIAN_SAMSUNG_POWER
,
0
);
pxa_gpio_mode
(
GPIO105_MAGICIAN_LCD_POWER_2_MD
);
}
pxa_gpio_mode
(
GPIO106_MAGICIAN_LCD_POWER_3_MD
);
gpio_request
(
GPIO104_MAGICIAN_LCD_POWER_1
,
"LCD_POWER_1"
);
gpio_request
(
GPIO105_MAGICIAN_LCD_POWER_2
,
"LCD_POWER_2"
);
gpio_request
(
GPIO106_MAGICIAN_LCD_POWER_3
,
"LCD_POWER_3"
);
gpio_direction_output
(
GPIO104_MAGICIAN_LCD_POWER_1
,
0
);
gpio_direction_output
(
GPIO105_MAGICIAN_LCD_POWER_2
,
0
);
gpio_direction_output
(
GPIO106_MAGICIAN_LCD_POWER_3
,
0
);
set_pxa_fb_info
(
lcd_select
?
&
samsung_info
:
&
toppoly_info
);
set_pxa_fb_info
(
lcd_select
?
&
samsung_info
:
&
toppoly_info
);
}
else
}
else
pr_err
(
"LCD detection: CPLD mapping failed
\n
"
);
pr_err
(
"LCD detection: CPLD mapping failed
\n
"
);
...
...
arch/arm/mach-pxa/pm.c
View file @
92794a5d
...
@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
...
@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
sleep_save_checksum
+=
sleep_save
[
i
];
sleep_save_checksum
+=
sleep_save
[
i
];
}
}
/* Clear
sleep
reset status */
/* Clear reset status */
RCSR
=
RCSR_
SM
R
;
RCSR
=
RCSR_
HWR
|
RCSR_WDR
|
RCSR_SMR
|
RCSR_GP
R
;
/* *** go zzz *** */
/* *** go zzz *** */
pxa_cpu_pm_fns
->
enter
(
state
);
pxa_cpu_pm_fns
->
enter
(
state
);
...
...
arch/arm/mach-pxa/pxa3xx.c
View file @
92794a5d
...
@@ -486,6 +486,8 @@ static int pxa3xx_set_wake(unsigned int irq, unsigned int on)
...
@@ -486,6 +486,8 @@ static int pxa3xx_set_wake(unsigned int irq, unsigned int on)
case
IRQ_MMC3
:
case
IRQ_MMC3
:
mask
=
ADXER_MFP_GEN12
;
mask
=
ADXER_MFP_GEN12
;
break
;
break
;
default:
return
-
EINVAL
;
}
}
local_irq_save
(
flags
);
local_irq_save
(
flags
);
...
...
arch/arm/mm/Kconfig
View file @
92794a5d
...
@@ -658,7 +658,7 @@ config CPU_DCACHE_SIZE
...
@@ -658,7 +658,7 @@ config CPU_DCACHE_SIZE
config CPU_DCACHE_WRITETHROUGH
config CPU_DCACHE_WRITETHROUGH
bool "Force write through D-cache"
bool "Force write through D-cache"
depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020
|| CPU_FEROCEON
) && !CPU_DCACHE_DISABLE
depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE
default y if CPU_ARM925T
default y if CPU_ARM925T
help
help
Say Y here to use the data cache in writethrough mode. Unless you
Say Y here to use the data cache in writethrough mode. Unless you
...
...
arch/arm/mm/proc-feroceon.S
View file @
92794a5d
...
@@ -118,12 +118,8 @@ ENTRY(feroceon_flush_kern_cache_all)
...
@@ -118,12 +118,8 @@ ENTRY(feroceon_flush_kern_cache_all)
mov
r2
,
#
VM_EXEC
mov
r2
,
#
VM_EXEC
mov
ip
,
#
0
mov
ip
,
#
0
__flush_whole_cache
:
__flush_whole_cache
:
#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
mcr
p15
,
0
,
ip
,
c7
,
c6
,
0
@
invalidate
D
cache
#else
1
:
mrc
p15
,
0
,
r15
,
c7
,
c14
,
3
@
test
,
clean
,
invalidate
1
:
mrc
p15
,
0
,
r15
,
c7
,
c14
,
3
@
test
,
clean
,
invalidate
bne
1
b
bne
1
b
#endif
tst
r2
,
#
VM_EXEC
tst
r2
,
#
VM_EXEC
mcrne
p15
,
0
,
ip
,
c7
,
c5
,
0
@
invalidate
I
cache
mcrne
p15
,
0
,
ip
,
c7
,
c5
,
0
@
invalidate
I
cache
mcrne
p15
,
0
,
ip
,
c7
,
c10
,
4
@
drain
WB
mcrne
p15
,
0
,
ip
,
c7
,
c10
,
4
@
drain
WB
...
@@ -145,21 +141,12 @@ ENTRY(feroceon_flush_user_cache_range)
...
@@ -145,21 +141,12 @@ ENTRY(feroceon_flush_user_cache_range)
cmp
r3
,
#
CACHE_DLIMIT
cmp
r3
,
#
CACHE_DLIMIT
bgt
__flush_whole_cache
bgt
__flush_whole_cache
1
:
tst
r2
,
#
VM_EXEC
1
:
tst
r2
,
#
VM_EXEC
#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
mcr
p15
,
0
,
r0
,
c7
,
c6
,
1
@
invalidate
D
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
mcr
p15
,
0
,
r0
,
c7
,
c6
,
1
@
invalidate
D
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
#else
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
and
invalidate
D
entry
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
and
invalidate
D
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
and
invalidate
D
entry
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
and
invalidate
D
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
mcrne
p15
,
0
,
r0
,
c7
,
c5
,
1
@
invalidate
I
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
#endif
cmp
r0
,
r1
cmp
r0
,
r1
blo
1
b
blo
1
b
tst
r2
,
#
VM_EXEC
tst
r2
,
#
VM_EXEC
...
@@ -232,12 +219,10 @@ ENTRY(feroceon_flush_kern_dcache_page)
...
@@ -232,12 +219,10 @@ ENTRY(feroceon_flush_kern_dcache_page)
*
(
same
as
v4wb
)
*
(
same
as
v4wb
)
*/
*/
ENTRY
(
feroceon_dma_inv_range
)
ENTRY
(
feroceon_dma_inv_range
)
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
tst
r0
,
#
CACHE_DLINESIZE
-
1
tst
r0
,
#
CACHE_DLINESIZE
-
1
mcrne
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
mcrne
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
tst
r1
,
#
CACHE_DLINESIZE
-
1
tst
r1
,
#
CACHE_DLINESIZE
-
1
mcrne
p15
,
0
,
r1
,
c7
,
c10
,
1
@
clean
D
entry
mcrne
p15
,
0
,
r1
,
c7
,
c10
,
1
@
clean
D
entry
#endif
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
1
:
mcr
p15
,
0
,
r0
,
c7
,
c6
,
1
@
invalidate
D
entry
1
:
mcr
p15
,
0
,
r0
,
c7
,
c6
,
1
@
invalidate
D
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
...
@@ -257,13 +242,11 @@ ENTRY(feroceon_dma_inv_range)
...
@@ -257,13 +242,11 @@ ENTRY(feroceon_dma_inv_range)
*
(
same
as
v4wb
)
*
(
same
as
v4wb
)
*/
*/
ENTRY
(
feroceon_dma_clean_range
)
ENTRY
(
feroceon_dma_clean_range
)
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
1
:
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
1
:
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
cmp
r0
,
r1
cmp
r0
,
r1
blo
1
b
blo
1
b
#endif
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
mov
pc
,
lr
mov
pc
,
lr
...
@@ -278,11 +261,7 @@ ENTRY(feroceon_dma_clean_range)
...
@@ -278,11 +261,7 @@ ENTRY(feroceon_dma_clean_range)
ENTRY
(
feroceon_dma_flush_range
)
ENTRY
(
feroceon_dma_flush_range
)
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
bic
r0
,
r0
,
#
CACHE_DLINESIZE
-
1
1
:
1
:
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
+
invalidate
D
entry
mcr
p15
,
0
,
r0
,
c7
,
c14
,
1
@
clean
+
invalidate
D
entry
#else
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
#endif
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
cmp
r0
,
r1
cmp
r0
,
r1
blo
1
b
blo
1
b
...
@@ -301,12 +280,10 @@ ENTRY(feroceon_cache_fns)
...
@@ -301,12 +280,10 @@ ENTRY(feroceon_cache_fns)
.
long
feroceon_dma_flush_range
.
long
feroceon_dma_flush_range
ENTRY
(
cpu_feroceon_dcache_clean_area
)
ENTRY
(
cpu_feroceon_dcache_clean_area
)
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
1
:
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
1
:
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
add
r0
,
r0
,
#
CACHE_DLINESIZE
add
r0
,
r0
,
#
CACHE_DLINESIZE
subs
r1
,
r1
,
#
CACHE_DLINESIZE
subs
r1
,
r1
,
#
CACHE_DLINESIZE
bhi
1
b
bhi
1
b
#endif
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
mov
pc
,
lr
mov
pc
,
lr
...
@@ -323,13 +300,9 @@ ENTRY(cpu_feroceon_dcache_clean_area)
...
@@ -323,13 +300,9 @@ ENTRY(cpu_feroceon_dcache_clean_area)
ENTRY
(
cpu_feroceon_switch_mm
)
ENTRY
(
cpu_feroceon_switch_mm
)
#ifdef CONFIG_MMU
#ifdef CONFIG_MMU
mov
ip
,
#
0
mov
ip
,
#
0
#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
mcr
p15
,
0
,
ip
,
c7
,
c6
,
0
@
invalidate
D
cache
#else
@
&
&
'Clean & Invalidate whole DCache'
@
&
&
'Clean & Invalidate whole DCache'
1
:
mrc
p15
,
0
,
r15
,
c7
,
c14
,
3
@
test
,
clean
,
invalidate
1
:
mrc
p15
,
0
,
r15
,
c7
,
c14
,
3
@
test
,
clean
,
invalidate
bne
1
b
bne
1
b
#endif
mcr
p15
,
0
,
ip
,
c7
,
c5
,
0
@
invalidate
I
cache
mcr
p15
,
0
,
ip
,
c7
,
c5
,
0
@
invalidate
I
cache
mcr
p15
,
0
,
ip
,
c7
,
c10
,
4
@
drain
WB
mcr
p15
,
0
,
ip
,
c7
,
c10
,
4
@
drain
WB
mcr
p15
,
0
,
r0
,
c2
,
c0
,
0
@
load
page
table
pointer
mcr
p15
,
0
,
r0
,
c2
,
c0
,
0
@
load
page
table
pointer
...
@@ -362,16 +335,9 @@ ENTRY(cpu_feroceon_set_pte_ext)
...
@@ -362,16 +335,9 @@ ENTRY(cpu_feroceon_set_pte_ext)
tst
r1
,
#
L_PTE_PRESENT
|
L_PTE_YOUNG
@
Present
and
Young
?
tst
r1
,
#
L_PTE_PRESENT
|
L_PTE_YOUNG
@
Present
and
Young
?
movne
r2
,
#
0
movne
r2
,
#
0
#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
eor
r3
,
r2
,
#
0x0a
@
C
&
small
page
?
tst
r3
,
#
0x0b
biceq
r2
,
r2
,
#
4
#endif
str
r2
,
[
r0
]
@
hardware
version
str
r2
,
[
r0
]
@
hardware
version
mov
r0
,
r0
mov
r0
,
r0
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
mcr
p15
,
0
,
r0
,
c7
,
c10
,
1
@
clean
D
entry
#endif
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
mcr
p15
,
0
,
r0
,
c7
,
c10
,
4
@
drain
WB
#endif
#endif
mov
pc
,
lr
mov
pc
,
lr
...
@@ -387,20 +353,11 @@ __feroceon_setup:
...
@@ -387,20 +353,11 @@ __feroceon_setup:
mcr
p15
,
0
,
r0
,
c8
,
c7
@
invalidate
I
,
D
TLBs
on
v4
mcr
p15
,
0
,
r0
,
c8
,
c7
@
invalidate
I
,
D
TLBs
on
v4
#endif
#endif
#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
mov
r0
,
#
4
@
disable
write
-
back
on
caches
explicitly
mcr
p15
,
7
,
r0
,
c15
,
c0
,
0
#endif
adr
r5
,
feroceon_crval
adr
r5
,
feroceon_crval
ldmia
r5
,
{
r5
,
r6
}
ldmia
r5
,
{
r5
,
r6
}
mrc
p15
,
0
,
r0
,
c1
,
c0
@
get
control
register
v4
mrc
p15
,
0
,
r0
,
c1
,
c0
@
get
control
register
v4
bic
r0
,
r0
,
r5
bic
r0
,
r0
,
r5
orr
r0
,
r0
,
r6
orr
r0
,
r0
,
r6
#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
orr
r0
,
r0
,
#
0x4000
@
.1..
....
....
....
#endif
mov
pc
,
lr
mov
pc
,
lr
.
size
__feroceon_setup
,
.
-
__feroceon_setup
.
size
__feroceon_setup
,
.
-
__feroceon_setup
...
...
drivers/mfd/htc-pasic3.c
View file @
92794a5d
...
@@ -132,8 +132,9 @@ static struct ds1wm_platform_data ds1wm_pdata = {
...
@@ -132,8 +132,9 @@ static struct ds1wm_platform_data ds1wm_pdata = {
.
disable
=
ds1wm_disable
,
.
disable
=
ds1wm_disable
,
};
};
static
int
ds1wm_device_add
(
struct
device
*
pasic3_
dev
,
int
bus_shift
)
static
int
ds1wm_device_add
(
struct
platform_device
*
pasic3_p
dev
,
int
bus_shift
)
{
{
struct
device
*
pasic3_dev
=
&
pasic3_pdev
->
dev
;
struct
pasic3_data
*
asic
=
pasic3_dev
->
driver_data
;
struct
pasic3_data
*
asic
=
pasic3_dev
->
driver_data
;
struct
platform_device
*
pdev
;
struct
platform_device
*
pdev
;
int
ret
;
int
ret
;
...
@@ -144,8 +145,8 @@ static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
...
@@ -144,8 +145,8 @@ static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
ret
=
platform_device_add_resources
(
pdev
,
pdev
->
resource
,
ret
=
platform_device_add_resources
(
pdev
,
p
asic3_p
dev
->
resource
,
pdev
->
num_resources
);
p
asic3_p
dev
->
num_resources
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
dev_dbg
(
pasic3_dev
,
"failed to add DS1WM resources
\n
"
);
dev_dbg
(
pasic3_dev
,
"failed to add DS1WM resources
\n
"
);
goto
exit_pdev_put
;
goto
exit_pdev_put
;
...
@@ -207,7 +208,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
...
@@ -207,7 +208,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
ret
=
ds1wm_device_add
(
dev
,
asic
->
bus_shift
);
ret
=
ds1wm_device_add
(
p
dev
,
asic
->
bus_shift
);
if
(
ret
<
0
)
if
(
ret
<
0
)
dev_warn
(
dev
,
"failed to register DS1WM
\n
"
);
dev_warn
(
dev
,
"failed to register DS1WM
\n
"
);
...
...
include/asm-arm/arch-orion5x/io.h
View file @
92794a5d
...
@@ -20,11 +20,10 @@ static inline void __iomem *
...
@@ -20,11 +20,10 @@ static inline void __iomem *
__arch_ioremap
(
unsigned
long
paddr
,
size_t
size
,
unsigned
int
mtype
)
__arch_ioremap
(
unsigned
long
paddr
,
size_t
size
,
unsigned
int
mtype
)
{
{
void
__iomem
*
retval
;
void
__iomem
*
retval
;
unsigned
long
offs
=
paddr
-
ORION5X_REGS_PHYS_BASE
;
if
(
mtype
==
MT_DEVICE
&&
size
&&
paddr
>=
ORION5X_REGS_PHYS_BASE
&&
if
(
mtype
==
MT_DEVICE
&&
size
&&
offs
<
ORION5X_REGS_SIZE
&&
paddr
+
size
<=
ORION5X_REGS_PHYS_BASE
+
ORION5X_REGS_SIZE
)
{
size
<=
ORION5X_REGS_SIZE
&&
offs
+
size
<=
ORION5X_REGS_SIZE
)
{
retval
=
(
void
__iomem
*
)
ORION5X_REGS_VIRT_BASE
+
retval
=
(
void
__iomem
*
)
ORION5X_REGS_VIRT_BASE
+
offs
;
(
paddr
-
ORION5X_REGS_PHYS_BASE
);
}
else
{
}
else
{
retval
=
__arm_ioremap
(
paddr
,
size
,
mtype
);
retval
=
__arm_ioremap
(
paddr
,
size
,
mtype
);
}
}
...
...
include/asm-arm/arch-pxa/irqs.h
View file @
92794a5d
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
/* ITE8152 irqs */
/* ITE8152 irqs */
/* add IT8152 IRQs beyond BOARD_END */
/* add IT8152 IRQs beyond BOARD_END */
#ifdef CONFIG_PCI_HOST_ITE8152
#ifdef CONFIG_PCI_HOST_ITE8152
#define IT8152_IRQ(x) (IRQ_
GPIO(IRQ_BOARD_END) + 1
+ (x))
#define IT8152_IRQ(x) (IRQ_
BOARD_END
+ (x))
/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
#define IT8152_LD_IRQ_COUNT 9
#define IT8152_LD_IRQ_COUNT 9
...
@@ -253,6 +253,9 @@
...
@@ -253,6 +253,9 @@
#define IT8152_LAST_IRQ IT8152_LD_IRQ(IT8152_LD_IRQ_COUNT - 1)
#define IT8152_LAST_IRQ IT8152_LD_IRQ(IT8152_LD_IRQ_COUNT - 1)
#if NR_IRQS < (IT8152_LAST_IRQ+1)
#undef NR_IRQS
#undef NR_IRQS
#define NR_IRQS (IT8152_LAST_IRQ+1)
#define NR_IRQS (IT8152_LAST_IRQ+1)
#endif
#endif
#endif
/* CONFIG_PCI_HOST_ITE8152 */
include/asm-arm/arch-pxa/magician.h
View file @
92794a5d
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
#define _MAGICIAN_H_
#define _MAGICIAN_H_
#include <asm/arch/irqs.h>
#include <asm/arch/irqs.h>
#include <asm/arch/pxa2xx-gpio.h>
/*
/*
* PXA GPIOs
* PXA GPIOs
...
@@ -63,54 +62,6 @@
...
@@ -63,54 +62,6 @@
#define GPIO119_MAGICIAN_UNKNOWN 119
#define GPIO119_MAGICIAN_UNKNOWN 119
#define GPIO120_MAGICIAN_UNKNOWN 120
#define GPIO120_MAGICIAN_UNKNOWN 120
/*
* PXA GPIO alternate function mode & direction
*/
#define GPIO0_MAGICIAN_KEY_POWER_MD (0 | GPIO_IN)
#define GPIO9_MAGICIAN_UNKNOWN_MD (9 | GPIO_IN)
#define GPIO10_MAGICIAN_GSM_IRQ_MD (10 | GPIO_IN)
#define GPIO11_MAGICIAN_GSM_OUT1_MD (11 | GPIO_OUT)
#define GPIO13_MAGICIAN_CPLD_IRQ_MD (13 | GPIO_IN)
#define GPIO18_MAGICIAN_UNKNOWN_MD (18 | GPIO_OUT)
#define GPIO22_MAGICIAN_VIBRA_EN_MD (22 | GPIO_OUT)
#define GPIO26_MAGICIAN_GSM_POWER_MD (26 | GPIO_OUT)
#define GPIO27_MAGICIAN_USBC_PUEN_MD (27 | GPIO_OUT)
#define GPIO30_MAGICIAN_nCHARGE_EN_MD (30 | GPIO_OUT)
#define GPIO37_MAGICIAN_KEY_HANGUP_MD (37 | GPIO_OUT)
#define GPIO38_MAGICIAN_KEY_CONTACTS_MD (38 | GPIO_OUT)
#define GPIO40_MAGICIAN_GSM_OUT2_MD (40 | GPIO_OUT)
#define GPIO48_MAGICIAN_UNKNOWN_MD (48 | GPIO_OUT)
#define GPIO56_MAGICIAN_UNKNOWN_MD (56 | GPIO_OUT)
#define GPIO57_MAGICIAN_CAM_RESET_MD (57 | GPIO_OUT)
#define GPIO75_MAGICIAN_SAMSUNG_POWER_MD (75 | GPIO_OUT)
#define GPIO83_MAGICIAN_nIR_EN_MD (83 | GPIO_OUT)
#define GPIO86_MAGICIAN_GSM_RESET_MD (86 | GPIO_OUT)
#define GPIO87_MAGICIAN_GSM_SELECT_MD (87 | GPIO_OUT)
#define GPIO90_MAGICIAN_KEY_CALENDAR_MD (90 | GPIO_OUT)
#define GPIO91_MAGICIAN_KEY_CAMERA_MD (91 | GPIO_OUT)
#define GPIO93_MAGICIAN_KEY_UP_MD (93 | GPIO_IN)
#define GPIO94_MAGICIAN_KEY_DOWN_MD (94 | GPIO_IN)
#define GPIO95_MAGICIAN_KEY_LEFT_MD (95 | GPIO_IN)
#define GPIO96_MAGICIAN_KEY_RIGHT_MD (96 | GPIO_IN)
#define GPIO97_MAGICIAN_KEY_ENTER_MD (97 | GPIO_IN)
#define GPIO98_MAGICIAN_KEY_RECORD_MD (98 | GPIO_IN)
#define GPIO99_MAGICIAN_HEADPHONE_IN_MD (99 | GPIO_IN)
#define GPIO100_MAGICIAN_KEY_VOL_UP_MD (100 | GPIO_IN)
#define GPIO101_MAGICIAN_KEY_VOL_DOWN_MD (101 | GPIO_IN)
#define GPIO102_MAGICIAN_KEY_PHONE_MD (102 | GPIO_IN)
#define GPIO103_MAGICIAN_LED_KP_MD (103 | GPIO_OUT)
#define GPIO104_MAGICIAN_LCD_POWER_1_MD (104 | GPIO_OUT)
#define GPIO105_MAGICIAN_LCD_POWER_2_MD (105 | GPIO_OUT)
#define GPIO106_MAGICIAN_LCD_POWER_3_MD (106 | GPIO_OUT)
#define GPIO107_MAGICIAN_DS1WM_IRQ_MD (107 | GPIO_IN)
#define GPIO108_MAGICIAN_GSM_READY_MD (108 | GPIO_IN)
#define GPIO114_MAGICIAN_UNKNOWN_MD (114 | GPIO_OUT)
#define GPIO115_MAGICIAN_nPEN_IRQ_MD (115 | GPIO_IN)
#define GPIO116_MAGICIAN_nCAM_EN_MD (116 | GPIO_OUT)
#define GPIO119_MAGICIAN_UNKNOWN_MD (119 | GPIO_OUT)
#define GPIO120_MAGICIAN_UNKNOWN_MD (120 | GPIO_OUT)
/*
/*
* CPLD IRQs
* CPLD IRQs
*/
*/
...
...
include/asm-arm/arch-pxa/system.h
View file @
92794a5d
...
@@ -22,6 +22,8 @@ static inline void arch_idle(void)
...
@@ -22,6 +22,8 @@ static inline void arch_idle(void)
static
inline
void
arch_reset
(
char
mode
)
static
inline
void
arch_reset
(
char
mode
)
{
{
RCSR
=
RCSR_HWR
|
RCSR_WDR
|
RCSR_SMR
|
RCSR_GPR
;
if
(
mode
==
's'
)
{
if
(
mode
==
's'
)
{
/* Jump into ROM at address 0 */
/* Jump into ROM at address 0 */
cpu_reset
(
0
);
cpu_reset
(
0
);
...
...
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