joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-25 05:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ARM] 3817/1: iop3xx: split the iop3xx mach into iop32x and iop33x

Browse Source 
Split the iop3xx mach type into iop32x and iop33x -- split the config
symbols, and move the code in the mach-iop3xx directory to the mach-iop32x
and mach-iop33x directories.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Lennert Buytenhek 2006-09-18 23:10:26 +01:00 committed by Russell King
parent 98954df691
commit 3f7e5815f4
68 changed files with 499 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/Kconfig
View File

@ -202,12 +202,20 @@ config ARCH_IMX
help
Support for Motorola's i.MX family of processors (MX1, MXL).
config ARCH_IOP3XX
bool "IOP3xx-based"
config ARCH_IOP32X
bool "IOP32x-based"
depends on MMU
select PCI
help
Support for Intel's IOP3XX (XScale) family of processors.
Support for Intel's 80219 and IOP32X (XScale) family of
processors.
config ARCH_IOP33X
bool "IOP33x-based"
depends on MMU
select PCI
help
Support for Intel's IOP33X (XScale) family of processors.
config ARCH_IXP4XX
bool "IXP4xx-based"
@ -312,7 +320,9 @@ source "arch/arm/mach-footbridge/Kconfig"
source "arch/arm/mach-integrator/Kconfig"
source "arch/arm/mach-iop3xx/Kconfig"
source "arch/arm/mach-iop32x/Kconfig"
source "arch/arm/mach-iop33x/Kconfig"
source "arch/arm/mach-ixp4xx/Kconfig"
@ -848,7 +858,7 @@ source "drivers/block/Kconfig"
source "drivers/acorn/block/Kconfig"
if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \
if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
|| ARCH_IXP23XX

3
arch/arm/Makefile
View File

@ -101,7 +101,8 @@ endif
machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
machine-$(CONFIG_ARCH_CLPS711X) := clps711x
machine-$(CONFIG_ARCH_IOP3XX) := iop3xx
machine-$(CONFIG_ARCH_IOP32X) := iop32x
machine-$(CONFIG_ARCH_IOP33X) := iop33x
machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
machine-$(CONFIG_ARCH_IXP2000) := ixp2000
machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx

5
arch/arm/configs/ep80219_defconfig
View File

@ -66,7 +66,8 @@ CONFIG_KMOD=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
CONFIG_ARCH_IOP3XX=y
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_L7200 is not set
@ -93,8 +94,6 @@ CONFIG_ARCH_IQ31244=y
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
CONFIG_ARCH_EP80219=y
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
#
# IOP3xx Chipset Features

5
arch/arm/configs/iq31244_defconfig
View File

@ -67,7 +67,8 @@ CONFIG_KMOD=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
CONFIG_ARCH_IOP3XX=y
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_L7200 is not set
@ -94,8 +95,6 @@ CONFIG_ARCH_IQ31244=y
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
#
# IOP3xx Chipset Features

5
arch/arm/configs/iq80321_defconfig
View File

@ -66,7 +66,8 @@ CONFIG_KMOD=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
CONFIG_ARCH_IOP3XX=y
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_L7200 is not set
@ -93,8 +94,6 @@ CONFIG_ARCH_IQ80321=y
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
#
# IOP3xx Chipset Features

4
arch/arm/configs/iq80331_defconfig
View File

@ -66,7 +66,8 @@ CONFIG_KMOD=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
CONFIG_ARCH_IOP3XX=y
# CONFIG_ARCH_IOP32X is not set
CONFIG_ARCH_IOP33X=y
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_L7200 is not set
@ -93,7 +94,6 @@ CONFIG_ARCH_IOP3XX=y
CONFIG_ARCH_IQ80331=y
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set
CONFIG_ARCH_IOP33X=y
#
# IOP3xx Chipset Features

4
arch/arm/configs/iq80332_defconfig
View File

@ -66,7 +66,8 @@ CONFIG_KMOD=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
CONFIG_ARCH_IOP3XX=y
# CONFIG_ARCH_IOP32X is not set
CONFIG_ARCH_IOP33X=y
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_L7200 is not set
@ -93,7 +94,6 @@ CONFIG_ARCH_IOP3XX=y
# CONFIG_ARCH_IQ80331 is not set
CONFIG_MACH_IQ80332=y
# CONFIG_ARCH_EP80219 is not set
CONFIG_ARCH_IOP33X=y
#
# IOP3xx Chipset Features

28
arch/arm/mach-iop32x/Kconfig Normal file
View File

@ -0,0 +1,28 @@
if ARCH_IOP32X
menu "IOP32x Implementation Options"
comment "IOP32x Platform Types"
config ARCH_IQ80321
bool "Enable support for IQ80321"
help
Say Y here if you want to run your kernel on the Intel IQ80321
evaluation kit for the IOP321 chipset.
config ARCH_IQ31244
bool "Enable support for IQ31244"
help
Say Y here if you want to run your kernel on the Intel IQ31244
evaluation kit for the IOP321 chipset.
config ARCH_EP80219
bool "Enable support for EP80219"
select ARCH_IQ31244
help
Say Y here if you want to run your kernel on the Intel EP80219
evaluation kit for the Intel 80219 chipset (a IOP321 variant).
endmenu
endif

11
arch/arm/mach-iop32x/Makefile Normal file
View File

@ -0,0 +1,11 @@
#
# Makefile for the linux kernel.
#
obj-y := common.o setup.o irq.o pci.o time.o
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
obj-$(CONFIG_ARCH_IQ31244) += iq31244-mm.o iq31244-pci.o

3
arch/arm/mach-iop32x/Makefile.boot Normal file
View File

@ -0,0 +1,3 @@
zreladdr-y := 0xa0008000
params_phys-y := 0xa0000100
initrd_phys-y := 0xa0800000

2
arch/arm/mach-iop3xx/common.c → arch/arm/mach-iop32x/common.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/common.c
* arch/arm/mach-iop32x/common.c
*
* Common routines shared across all IOP3xx implementations
*

2
arch/arm/mach-iop3xx/iq31244-mm.c → arch/arm/mach-iop32x/iq31244-mm.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/mm.c
* linux/arch/arm/mach-iop32x/iq31244-mm.c
*
* Low level memory initialization for iq80321 platform
*

4
arch/arm/mach-iop3xx/iq31244-pci.c → arch/arm/mach-iop32x/iq31244-pci.c
View File

@ -1,7 +1,7 @@
/*
* arch/arm/mach-iop3xx/iq80321-pci.c
* arch/arm/mach-iop32x/iq31244-pci.c
*
* PCI support for the Intel IQ80321 reference board
* PCI support for the Intel IQ31244 reference board
*
* Author: Rory Bolt <rorybolt@pacbell.net>
* Copyright (C) 2002 Rory Bolt

2
arch/arm/mach-iop3xx/iq80321-mm.c → arch/arm/mach-iop32x/iq80321-mm.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/mm.c
* linux/arch/arm/mach-iop32x/iq80321-mm.c
*
* Low level memory initialization for iq80321 platform
*

2
arch/arm/mach-iop3xx/iq80321-pci.c → arch/arm/mach-iop32x/iq80321-pci.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iq80321-pci.c
* arch/arm/mach-iop32x/iq80321-pci.c
*
* PCI support for the Intel IQ80321 reference board
*

6
arch/arm/mach-iop3xx/iop321-irq.c → arch/arm/mach-iop32x/irq.c
View File

@ -1,7 +1,7 @@
/*
* linux/arch/arm/mach-iop3xx/iop321-irq.c
* linux/arch/arm/mach-iop32x/irq.c
*
* Generic IOP321 IRQ handling functionality
* Generic IOP32X IRQ handling functionality
*
* Author: Rory Bolt <rorybolt@pacbell.net>
* Copyright (C) 2002 Rory Bolt
@ -86,7 +86,7 @@ void __init iop321_init_irq(void)
machine_is_iq31244()) // all interrupts are inputs to chip
*IOP321_PCIIRSR = 0x0f;
for(i = IOP321_IRQ_OFS; i < NR_IOP321_IRQS; i++)
for(i = IOP321_IRQ_OFS; i < NR_IRQS; i++)
{
set_irq_chip(i, &ext_chip);
set_irq_handler(i, do_level_IRQ);

2
arch/arm/mach-iop3xx/iop321-pci.c → arch/arm/mach-iop32x/pci.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iop321-pci.c
* arch/arm/mach-iop32x/pci.c
*
* PCI support for the Intel IOP321 chipset
*

2
arch/arm/mach-iop3xx/iop321-setup.c → arch/arm/mach-iop32x/setup.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/iop321-setup.c
* linux/arch/arm/mach-iop32x/setup.c
*
* Author: Nicolas Pitre <nico@cam.org>
* Copyright (C) 2001 MontaVista Software, Inc.

2
arch/arm/mach-iop3xx/iop321-time.c → arch/arm/mach-iop32x/time.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iop321-time.c
* arch/arm/mach-iop32x/time.c
*
* Timer code for IOP321 based systems
*

27
arch/arm/mach-iop33x/Kconfig Normal file
View File

@ -0,0 +1,27 @@
if ARCH_IOP33X
menu "IOP33x Implementation Options"
comment "IOP33x Platform Types"
config ARCH_IQ80331
bool "Enable support for IQ80331"
help
Say Y here if you want to run your kernel on the Intel IQ80331
evaluation kit for the IOP331 chipset.
config MACH_IQ80332
bool "Enable support for IQ80332"
help
Say Y here if you want to run your kernel on the Intel IQ80332
evaluation kit for the IOP332 chipset.
config IOP331_STEPD
bool "Chip stepping D of the IOP80331 processor or IOP80333"
help
Say Y here if you have StepD of the IOP80331 or IOP8033
based platforms.
endmenu
endif

11
arch/arm/mach-iop33x/Makefile Normal file
View File

@ -0,0 +1,11 @@
#
# Makefile for the linux kernel.
#
obj-y := common.o setup.o irq.o pci.o time.o
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_ARCH_IQ80331) += iq80331-mm.o iq80331-pci.o
obj-$(CONFIG_MACH_IQ80332) += iq80332-mm.o iq80332-pci.o

3
arch/arm/mach-iop33x/Makefile.boot Normal file
View File

@ -0,0 +1,3 @@
zreladdr-y := 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

22
arch/arm/mach-iop33x/common.c Normal file
View File

@ -0,0 +1,22 @@
/*
* arch/arm/mach-iop33x/common.c
*
* Common routines shared across all IOP3xx implementations
*
* Author: Deepak Saxena <dsaxena@mvista.com>
*
* Copyright 2003 (c) MontaVista, Software, Inc.
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <linux/delay.h>
#include <asm/hardware.h>
/*
* Shared variables
*/
unsigned long iop3xx_pcibios_min_io = 0;
unsigned long iop3xx_pcibios_min_mem = 0;

2
arch/arm/mach-iop3xx/iq80331-mm.c → arch/arm/mach-iop33x/iq80331-mm.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/mm.c
* linux/arch/arm/mach-iop33x/iq80331-mm.c
*
* Low level memory initialization for iq80331 platform
*

2
arch/arm/mach-iop3xx/iq80331-pci.c → arch/arm/mach-iop33x/iq80331-pci.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iq80331-pci.c
* arch/arm/mach-iop33x/iq80331-pci.c
*
* PCI support for the Intel IQ80331 reference board
*

2
arch/arm/mach-iop3xx/iq80332-mm.c → arch/arm/mach-iop33x/iq80332-mm.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/mm.c
* linux/arch/arm/mach-iop33x/iq80332-mm.c
*
* Low level memory initialization for iq80332 platform
*

2
arch/arm/mach-iop3xx/iq80332-pci.c → arch/arm/mach-iop33x/iq80332-pci.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iq80332-pci.c
* arch/arm/mach-iop33x/iq80332-pci.c
*
* PCI support for the Intel IQ80332 reference board
*

4
arch/arm/mach-iop3xx/iop331-irq.c → arch/arm/mach-iop33x/irq.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/iop331-irq.c
* linux/arch/arm/mach-iop33x/irq.c
*
* Generic IOP331 IRQ handling functionality
*
@ -119,7 +119,7 @@ void __init iop331_init_irq(void)
if(machine_is_iq80331()) // all interrupts are inputs to chip
*IOP331_PCIIRSR = 0x0f;
for(i = IOP331_IRQ_OFS; i < NR_IOP331_IRQS; i++)
for(i = IOP331_IRQ_OFS; i < NR_IRQS; i++)
{
set_irq_chip(i, (i < 32) ? &iop331_irqchip1 : &iop331_irqchip2);
set_irq_handler(i, do_level_IRQ);

2
arch/arm/mach-iop3xx/iop331-pci.c → arch/arm/mach-iop33x/pci.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iop331-pci.c
* arch/arm/mach-iop33x/pci.c
*
* PCI support for the Intel IOP331 chipset
*

2
arch/arm/mach-iop3xx/iop331-setup.c → arch/arm/mach-iop33x/setup.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/arm/mach-iop3xx/iop331-setup.c
* linux/arch/arm/mach-iop33x/setup.c
*
* Author: Dave Jiang (dave.jiang@intel.com)
* Copyright (C) 2004 Intel Corporation.

2
arch/arm/mach-iop3xx/iop331-time.c → arch/arm/mach-iop33x/time.c
View File

@ -1,5 +1,5 @@
/*
* arch/arm/mach-iop3xx/iop331-time.c
* arch/arm/mach-iop33x/time.c
*
* Timer code for IOP331 based systems
*

66
arch/arm/mach-iop3xx/Kconfig
View File

@ -1,66 +0,0 @@
if ARCH_IOP3XX
menu "IOP3xx Implementation Options"
comment "IOP3xx Platform Types"
config ARCH_IQ80321
bool "Enable support for IQ80321"
select ARCH_IOP32X
help
Say Y here if you want to run your kernel on the Intel IQ80321
evaluation kit for the IOP321 chipset.
config ARCH_IQ31244
bool "Enable support for IQ31244"
select ARCH_IOP32X
help
Say Y here if you want to run your kernel on the Intel IQ31244
evaluation kit for the IOP321 chipset.
config ARCH_IQ80331
bool "Enable support for IQ80331"
select ARCH_IOP33X
help
Say Y here if you want to run your kernel on the Intel IQ80331
evaluation kit for the IOP331 chipset.
config MACH_IQ80332
bool "Enable support for IQ80332"
select ARCH_IOP33X
help
Say Y here if you want to run your kernel on the Intel IQ80332
evaluation kit for the IOP332 chipset.
config ARCH_EP80219
bool "Enable support for EP80219"
select ARCH_IOP32X
select ARCH_IQ31244
help
Say Y here if you want to run your kernel on the Intel EP80219
evaluation kit for the Intel 80219 chipset (a IOP321 variant).
# Which IOP variant are we running?
config ARCH_IOP32X
bool
help
The IQ80321 uses the IOP321 variant.
The IQ31244 and EP80219 uses the IOP321 variant.
config ARCH_IOP33X
bool
default ARCH_IQ80331
help
The IQ80331, IQ80332, and IQ80333 uses the IOP331 variant.
comment "IOP3xx Chipset Features"
config IOP331_STEPD
bool "Chip stepping D of the IOP80331 processor or IOP80333"
depends on ARCH_IOP33X
help
Say Y here if you have StepD of the IOP80331 or IOP8033
based platforms.
endmenu
endif

23
arch/arm/mach-iop3xx/Makefile
View File

@ -1,23 +0,0 @@
#
# Makefile for the linux kernel.
#
# Object file lists.
obj-y := common.o
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_ARCH_IOP32X) += iop321-setup.o iop321-irq.o iop321-pci.o iop321-time.o
obj-$(CONFIG_ARCH_IOP33X) += iop331-setup.o iop331-irq.o iop331-pci.o iop331-time.o
obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
obj-$(CONFIG_ARCH_IQ31244) += iq31244-mm.o iq31244-pci.o
obj-$(CONFIG_ARCH_IQ80331) += iq80331-mm.o iq80331-pci.o
obj-$(CONFIG_MACH_IQ80332) += iq80332-mm.o iq80332-pci.o

9
arch/arm/mach-iop3xx/Makefile.boot
View File

@ -1,9 +0,0 @@
zreladdr-y := 0xa0008000
params_phys-y := 0xa0000100
initrd_phys-y := 0xa0800000
ifeq ($(CONFIG_ARCH_IOP33X),y)
zreladdr-y := 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
endif

2
arch/arm/mm/Kconfig
View File

@ -232,7 +232,7 @@ config CPU_SA1100
# XScale
config CPU_XSCALE
bool
depends on ARCH_IOP3XX || ARCH_PXA || ARCH_IXP4XX || ARCH_IXP2000
depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_PXA || ARCH_IXP4XX || ARCH_IXP2000
default y
select CPU_32v5
select CPU_ABRT_EV5T

2
drivers/i2c/busses/Kconfig
View File

@ -196,7 +196,7 @@ config I2C_IBM_IIC
config I2C_IOP3XX
tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C
depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX) && I2C
help
Say Y here if you want to use the IIC bus controller on
the Intel IOP3xx I/O Processors or IXP4xx Network Processors.

20
include/asm-arm/arch-iop32x/debug-macro.S Normal file
View File

@ -0,0 +1,20 @@
/* linux/include/asm-arm/arch-iop32x/debug-macro.S
*
* Debugging macro include header
*
* Copyright (C) 1994-1999 Russell King
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
*
* 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.
*
*/
.macro addruart,rx
mov \rx, #0xfe000000 @ physical
orr \rx, \rx, #0x00800000 @ location of the UART
.endm
#define UART_SHIFT 0
#include <asm/hardware/debug-8250.S>

2
include/asm-arm/arch-iop3xx/dma.h → include/asm-arm/arch-iop32x/dma.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/dma.h
* linux/include/asm-arm/arch-iop32x/dma.h
*
* Copyright (C) 2004 Intel Corp.
*

28
include/asm-arm/arch-iop32x/entry-macro.S Normal file
View File

@ -0,0 +1,28 @@
/*
* include/asm-arm/arch-iop32x/entry-macro.S
*
* Low-level IRQ helper macros for IOP32x-based platforms
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <asm/arch/irqs.h>
.macro disable_fiq
.endm
/*
* Note: only deal with normal interrupts, not FIQ
*/
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
mov \irqnr, #0
mrc p6, 0, \irqstat, c8, c0, 0 @ Read IINTSRC
cmp \irqstat, #0
beq 1001f
clz \irqnr, \irqstat
mov \base, #31
subs \irqnr,\base,\irqnr
add \irqnr,\irqnr,#IRQ_IOP321_DMA0_EOT
1001:
.endm

5
include/asm-arm/arch-iop3xx/hardware.h → include/asm-arm/arch-iop32x/hardware.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/hardware.h
* linux/include/asm-arm/arch-iop32x/hardware.h
*/
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
@ -44,14 +44,11 @@ extern unsigned int processor_id;
*
*/
#include "iop321.h"
#include "iop331.h"
/*
* Board specific bits
*/
#include "iq80321.h"
#include "iq31244.h"
#include "iq80331.h"
#include "iq80332.h"
#endif /* _ASM_ARCH_HARDWARE_H */

2
include/asm-arm/arch-iop3xx/io.h → include/asm-arm/arch-iop32x/io.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/io.h
* linux/include/asm-arm/arch-iop32x/io.h
*
* Copyright (C) 2001 MontaVista Software, Inc.
*

8
include/asm-arm/arch-iop3xx/iop321.h → include/asm-arm/arch-iop32x/iop321.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iop321.h
* linux/include/asm/arch-iop32x/iop321.h
*
* Intel IOP321 Chip definitions
*
@ -21,11 +21,7 @@
* IOP3xx variants but behave slightly differently on each.
*/
#ifndef __ASSEMBLY__
#ifdef CONFIG_ARCH_IOP32X
#define iop_is_321() (((processor_id & 0xfffff5e0) == 0x69052420))
#else
#define iop_is_321() 0
#endif
#define iop_is_321() 1
#endif
/*

2
include/asm-arm/arch-iop3xx/iq31244.h → include/asm-arm/arch-iop32x/iq31244.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iq31244.h
* linux/include/asm/arch-iop32x/iq31244.h
*
* Intel IQ31244 evaluation board registers
*/

2
include/asm-arm/arch-iop3xx/iq80321.h → include/asm-arm/arch-iop32x/iq80321.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iq80321.h
* linux/include/asm/arch-iop32x/iq80321.h
*
* Intel IQ80321 evaluation board registers
*/

12
include/asm-arm/arch-iop3xx/iop321-irqs.h → include/asm-arm/arch-iop32x/irqs.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/irqs.h
* linux/include/asm-arm/arch-iop32x/irqs.h
*
* Author: Rory Bolt <rorybolt@pacbell.net>
* Copyright: (C) 2002 Rory Bolt
@ -9,8 +9,8 @@
* published by the Free Software Foundation.
*
*/
#ifndef _IOP321_IRQS_H_
#define _IOP321_IRQS_H_
#ifndef _IRQS_H_
#define _IRQS_H_
/*
* IOP80321 chipset interrupts
@ -54,9 +54,7 @@
#define IRQ_IOP321_XINT3 IOP321_IRQ(30)
#define IRQ_IOP321_HPI IOP321_IRQ(31)
#define NR_IOP321_IRQS (IOP321_IRQ(31) + 1)
#define NR_IRQS NR_IOP321_IRQS
#define NR_IRQS (IOP321_IRQ(31) + 1)
/*
@ -97,4 +95,4 @@
#define IRQ_IQ31244_INTC IRQ_IOP321_XINT2
#define IRQ_IQ31244_INTD IRQ_IOP321_XINT3
#endif // _IOP321_IRQ_H_
#endif // _IRQ_H_

13
include/asm-arm/arch-iop3xx/memory.h → include/asm-arm/arch-iop32x/memory.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/memory.h
* linux/include/asm-arm/arch-iop32x/memory.h
*/
#ifndef __ASM_ARCH_MEMORY_H
@ -10,11 +10,7 @@
/*
* Physical DRAM offset.
*/
#ifndef CONFIG_ARCH_IOP33X
#define PHYS_OFFSET UL(0xa0000000)
#else
#define PHYS_OFFSET UL(0x00000000)
#endif
/*
* Virtual view <-> PCI DMA view memory address translations
@ -23,16 +19,9 @@
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
#if defined(CONFIG_ARCH_IOP32X)
#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP321_IATVR2)) | ((*IOP321_IABAR2) & 0xfffffff0))
#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP321_IALR2)) | ( *IOP321_IATVR2)))
#elif defined(CONFIG_ARCH_IOP33X)
#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))
#endif
#endif

8
include/asm-arm/arch-iop3xx/system.h → include/asm-arm/arch-iop32x/system.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/system.h
* linux/include/asm-arm/arch-iop32x/system.h
*
* Copyright (C) 2001 MontaVista Software, Inc.
*
@ -16,13 +16,7 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode)
{
#ifdef CONFIG_ARCH_IOP32X
*IOP321_PCSR = 0x30;
#endif
#ifdef CONFIG_ARCH_IOP33X
*IOP331_PCSR = 0x30;
#endif
if ( 1 && mode == 's') {
/* Jump into ROM at address 0 */

8
include/asm-arm/arch-iop32x/timex.h Normal file
View File

@ -0,0 +1,8 @@
/*
* linux/include/asm-arm/arch-iop32x/timex.h
*
* IOP3xx architecture timex specifications
*/
#include <asm/hardware.h>
#define CLOCK_TICK_RATE IOP321_TICK_RATE

38
include/asm-arm/arch-iop32x/uncompress.h Normal file
View File

@ -0,0 +1,38 @@
/*
* linux/include/asm-arm/arch-iop32x/uncompress.h
*/
#include <asm/types.h>
#include <asm/mach-types.h>
#include <linux/serial_reg.h>
#include <asm/hardware.h>
static volatile u8 *uart_base;
#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
static inline void putc(char c)
{
while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
barrier();
*uart_base = c;
}
static inline void flush(void)
{
}
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
if (machine_is_iq80321())
uart_base = (volatile u8 *)IQ80321_UART;
else if (machine_is_iq31244())
uart_base = (volatile u8 *)IQ31244_UART;
else
uart_base = (volatile u8 *)0xfe800000;
}
/*
* nothing to do
*/
#define arch_decomp_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()

2
include/asm-arm/arch-iop3xx/vmalloc.h → include/asm-arm/arch-iop32x/vmalloc.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/vmalloc.h
* linux/include/asm-arm/arch-iop32x/vmalloc.h
*/
/*

24
include/asm-arm/arch-iop33x/debug-macro.S Normal file
View File

@ -0,0 +1,24 @@
/* linux/include/asm-arm/arch-iop33x/debug-macro.S
*
* Debugging macro include header
*
* Copyright (C) 1994-1999 Russell King
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
*
* 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.
*
*/
.macro addruart,rx
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ mmu enabled?
moveq \rx, #0xff000000 @ physical
movne \rx, #0xfe000000 @ virtual
orr \rx, \rx, #0x00ff0000
orr \rx, \rx, #0x0000f700
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

9
include/asm-arm/arch-iop33x/dma.h Normal file
View File

@ -0,0 +1,9 @@
/*
* linux/include/asm-arm/arch-iop33x/dma.h
*
* Copyright (C) 2004 Intel Corp.
*
* 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.
*/

29
include/asm-arm/arch-iop3xx/entry-macro.S → include/asm-arm/arch-iop33x/entry-macro.S
View File

@ -1,7 +1,7 @@
/*
* include/asm-arm/arch-iop3xx/entry-macro.S
* include/asm-arm/arch-iop33x/entry-macro.S
*
* Low-level IRQ helper macros for IOP3xx-based platforms
* Low-level IRQ helper macros for IOP33x-based platforms
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@ -9,26 +9,6 @@
*/
#include <asm/arch/irqs.h>
#if defined(CONFIG_ARCH_IOP32X)
.macro disable_fiq
.endm
/*
* Note: only deal with normal interrupts, not FIQ
*/
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
mov \irqnr, #0
mrc p6, 0, \irqstat, c8, c0, 0 @ Read IINTSRC
cmp \irqstat, #0
beq 1001f
clz \irqnr, \irqstat
mov \base, #31
subs \irqnr,\base,\irqnr
add \irqnr,\irqnr,#IRQ_IOP321_DMA0_EOT
1001:
.endm
#elif defined(CONFIG_ARCH_IOP33X)
.macro disable_fiq
.endm
@ -47,11 +27,8 @@
rsbs \irqnr,\irqnr,#31 @ recommend by RMK
add \irqnr,\irqnr,#IRQ_IOP331_XINT8
b 1001f
1002: clz \irqnr, \irqstat
1002: clz \irqnr, \irqstat
rsbs \irqnr,\irqnr,#31 @ recommend by RMK
add \irqnr,\irqnr,#IRQ_IOP331_DMA0_EOT
1001:
.endm
#endif

54
include/asm-arm/arch-iop33x/hardware.h Normal file
View File

@ -0,0 +1,54 @@
/*
* linux/include/asm-arm/arch-iop33x/hardware.h
*/
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
#include <asm/types.h>
/*
* Note about PCI IO space mappings
*
* To make IO space accesses efficient, we store virtual addresses in
* the IO resources.
*
* The PCI IO space is located at virtual 0xfe000000 from physical
* 0x90000000. The PCI BARs must be programmed with physical addresses,
* but when we read them, we convert them to virtual addresses. See
* arch/arm/mach-iop33x/pci.c
*/
#define pcibios_assign_all_busses() 1
/*
* The min PCI I/O and MEM space are dependent on what specific
* chipset/platform we are running on, so instead of hardcoding with
* #ifdefs, we just fill these in the platform level PCI init code.
*/
#ifndef __ASSEMBLY__
extern unsigned long iop3xx_pcibios_min_io;
extern unsigned long iop3xx_pcibios_min_mem;
extern unsigned int processor_id;
#endif
/*
* We just set these to zero since they are really bogus anyways
*/
#define PCIBIOS_MIN_IO (iop3xx_pcibios_min_io)
#define PCIBIOS_MIN_MEM (iop3xx_pcibios_min_mem)
/*
* Generic chipset bits
*
*/
#include "iop331.h"
/*
* Board specific bits
*/
#include "iq80331.h"
#include "iq80332.h"
#endif /* _ASM_ARCH_HARDWARE_H */

21
include/asm-arm/arch-iop33x/io.h Normal file
View File

@ -0,0 +1,21 @@
/*
* linux/include/asm-arm/arch-iop33x/io.h
*
* Copyright (C) 2001 MontaVista Software, Inc.
*
* 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 __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <asm/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff
#define __io(p) ((void __iomem *)(p))
#define __mem_pci(a) (a)
#endif

9
include/asm-arm/arch-iop3xx/iop331.h → include/asm-arm/arch-iop33x/iop331.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iop331.h
* linux/include/asm/arch-iop33x/iop331.h
*
* Intel IOP331 Chip definitions
*
@ -20,12 +20,7 @@
* IOP3xx variants but behave slightly differently on each.
*/
#ifndef __ASSEMBLY__
#ifdef CONFIG_ARCH_IOP33X
/*#define iop_is_331() ((processor_id & 0xffffffb0) == 0x69054090) */
#define iop_is_331() ((processor_id & 0xffffff30) == 0x69054010)
#else
#define iop_is_331() 0
#endif
#define iop_is_331() 1
#endif
/*

2
include/asm-arm/arch-iop3xx/iq80331.h → include/asm-arm/arch-iop33x/iq80331.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iq80331.h
* linux/include/asm/arch-iop33x/iq80331.h
*
* Intel IQ80331 evaluation board registers
*/

2
include/asm-arm/arch-iop3xx/iq80332.h → include/asm-arm/arch-iop33x/iq80332.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm/arch-iop3xx/iq80332.h
* linux/include/asm/arch-iop33x/iq80332.h
*
* Intel IQ80332 evaluation board registers
*/

12
include/asm-arm/arch-iop3xx/iop331-irqs.h → include/asm-arm/arch-iop33x/irqs.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-iop3xx/irqs.h
* linux/include/asm-arm/arch-iop33x/irqs.h
*
* Author: Dave Jiang (dave.jiang@intel.com)
* Copyright: (C) 2003 Intel Corp.
@ -9,8 +9,8 @@
* published by the Free Software Foundation.
*
*/
#ifndef _IOP331_IRQS_H_
#define _IOP331_IRQS_H_
#ifndef _IRQS_H_
#define _IRQS_H_
/*
* IOP80331 chipset interrupts
@ -86,9 +86,7 @@
#define IRQ_IOP331_MSG_ERR IOP331_IRQ(62) // 30
#define IRQ_IOP331_HPI IOP331_IRQ(63) // 31
#define NR_IOP331_IRQS (IOP331_IRQ(63) + 1)
#define NR_IRQS NR_IOP331_IRQS
#define NR_IRQS (IOP331_IRQ(63) + 1)
/*
@ -129,4 +127,4 @@
#define IRQ_IQ80332_INTC IRQ_IOP331_XINT2
#define IRQ_IQ80332_INTD IRQ_IOP331_XINT3
#endif // _IOP331_IRQ_H_
#endif // _IRQ_H_

26
include/asm-arm/arch-iop33x/memory.h Normal file
View File

@ -0,0 +1,26 @@
/*
* linux/include/asm-arm/arch-iop33x/memory.h
*/
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#include <asm/hardware.h>
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
/*
* Virtual view <-> PCI DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an
* address suitable to be passed to set_dma_addr
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))
#endif

29
include/asm-arm/arch-iop33x/system.h Normal file
View File

@ -0,0 +1,29 @@
/*
* linux/include/asm-arm/arch-iop33x/system.h
*
* Copyright (C) 2001 MontaVista Software, Inc.
*
* 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.
*/
static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode)
{
*IOP331_PCSR = 0x30;
if ( 1 && mode == 's') {
/* Jump into ROM at address 0 */
cpu_reset(0);
} else {
/* No on-chip reset capability */
cpu_reset(0);
}
}

8
include/asm-arm/arch-iop33x/timex.h Normal file
View File

@ -0,0 +1,8 @@
/*
* linux/include/asm-arm/arch-iop33x/timex.h
*
* IOP3xx architecture timex specifications
*/
#include <asm/hardware.h>
#define CLOCK_TICK_RATE IOP331_TICK_RATE

36
include/asm-arm/arch-iop33x/uncompress.h Normal file
View File

@ -0,0 +1,36 @@
/*
* linux/include/asm-arm/arch-iop33x/uncompress.h
*/
#include <asm/types.h>
#include <asm/mach-types.h>
#include <linux/serial_reg.h>
#include <asm/hardware.h>
static volatile u32 *uart_base;
#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
static inline void putc(char c)
{
while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
barrier();
*uart_base = c;
}
static inline void flush(void)
{
}
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
if (machine_is_iq80331() || machine_is_iq80332())
uart_base = (volatile u32 *)IOP331_UART0_PHYS;
else
uart_base = (volatile u32 *)0xfe800000;
}
/*
* nothing to do
*/
#define arch_decomp_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()

16
include/asm-arm/arch-iop33x/vmalloc.h Normal file
View File

@ -0,0 +1,16 @@
/*
* linux/include/asm-arm/arch-iop33x/vmalloc.h
*/
/*
* Just any arbitrary offset to the start of the vmalloc VM area: the
* current 8MB value just means that there will be a 8MB "hole" after the
* physical memory until the kernel virtual memory starts. That means that
* any out-of-bounds memory accesses will hopefully be caught.
* The vmalloc() routines leaves a hole of 4kB between each vmalloced
* area for the same reason. ;)
*/
//#define VMALLOC_END (0xe8000000)
/* increase usable physical RAM to ~992M per RMK */
#define VMALLOC_END (0xfe000000)

35
include/asm-arm/arch-iop3xx/debug-macro.S
View File

@ -1,35 +0,0 @@
/* linux/include/asm-arm/arch-iop3xx/debug-macro.S
*
* Debugging macro include header
*
* Copyright (C) 1994-1999 Russell King
* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
*
* 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.
*
*/
.macro addruart,rx
mov \rx, #0xfe000000 @ physical
#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
orr \rx, \rx, #0x00800000 @ location of the UART
#elif defined(CONFIG_ARCH_IOP33X)
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0x000fe000 @ Physical Base
movne \rx, #0
orr \rx, \rx, #0xfe000000
orr \rx, \rx, #0x00f00000 @ Virtual Base
orr \rx, \rx, #0x00001700 @ location of the UART
#else
#error Unknown IOP3XX implementation
#endif
.endm
#if !defined(CONFIG_ARCH_IQ80321) || !defined(CONFIG_ARCH_IQ31244) || !defined(CONFIG_ARCH_IQ80331)
#define FLOW_CONTROL
#endif
#define UART_SHIFT 0
#include <asm/hardware/debug-8250.S>

21
include/asm-arm/arch-iop3xx/irqs.h
View File

@ -1,21 +0,0 @@
/*
* linux/include/asm-arm/arch-iop3xx/irqs.h
*
* Copyright: (C) 2001-2003 MontaVista Software Inc.
*
* 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.
*
*/
/*
* Chipset-specific bits
*/
#ifdef CONFIG_ARCH_IOP32X
#include "iop321-irqs.h"
#endif
#ifdef CONFIG_ARCH_IOP33X
#include "iop331-irqs.h"
#endif

20
include/asm-arm/arch-iop3xx/timex.h
View File

@ -1,20 +0,0 @@
/*
* linux/include/asm-arm/arch-iop3xx/timex.h
*
* IOP3xx architecture timex specifications
*/
#include <asm/hardware.h>
#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
#define CLOCK_TICK_RATE IOP321_TICK_RATE
#elif defined(CONFIG_ARCH_IQ80331) || defined(CONFIG_MACH_IQ80332)
#define CLOCK_TICK_RATE IOP331_TICK_RATE
#else
#error "No IOP3xx timex information for this architecture"
#endif

48
include/asm-arm/arch-iop3xx/uncompress.h
View File

@ -1,48 +0,0 @@
/*
* linux/include/asm-arm/arch-iop3xx/uncompress.h
*/
#include <asm/types.h>
#include <asm/mach-types.h>
#include <linux/serial_reg.h>
#include <asm/hardware.h>
#ifdef CONFIG_ARCH_IOP32X
#define UTYPE unsigned char *
#elif defined(CONFIG_ARCH_IOP33X)
#define UTYPE u32 *
#else
#error "Missing IOP3xx arch type def"
#endif
static volatile UTYPE uart_base;
#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
static inline void putc(char c)
{
while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
barrier();
*uart_base = c;
}
static inline void flush(void)
{
}
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
if(machine_is_iq80321())
uart_base = (volatile UTYPE)IQ80321_UART;
else if(machine_is_iq31244())
uart_base = (volatile UTYPE)IQ31244_UART;
else if(machine_is_iq80331() || machine_is_iq80332())
uart_base = (volatile UTYPE)IOP331_UART0_PHYS;
else
uart_base = (volatile UTYPE)0xfe800000;
}
/*
* nothing to do
*/
#define arch_decomp_setup() __arch_decomp_setup(arch_id)
#define arch_decomp_wdog()