diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-03-24 16:12:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 11:33:34 +0200 |
| commit | e536fbe18f803b6bf9f2ea2d54d918e2b09724d8 (patch) | |
| tree | b5e361bd89142792ab58f98683e7e583ccdec021 | |
| parent | ARM: 6827/1: mach-netx: delete hardcoded periphid (diff) | |
| download | linux-e536fbe18f803b6bf9f2ea2d54d918e2b09724d8.tar.xz linux-e536fbe18f803b6bf9f2ea2d54d918e2b09724d8.zip | |
ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
This is redundant. The correct ID number is right there in the
hardware anyway. We will introduce a mechanism later to hard-code
this for deviant cells.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/hardware.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 9cc6f8f5d3e6..e341ad083365 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -25,7 +25,7 @@ static inline struct amba_device * db8500_add_ssp(const char *name, resource_size_t base, int irq, struct pl022_ssp_controller *pdata) { - return dbx500_add_amba_device(name, base, irq, pdata, SSP_PER_ID); + return dbx500_add_amba_device(name, base, irq, pdata, 0); } diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h index 2c6f71049f2e..470ac52663d6 100644 --- a/arch/arm/mach-ux500/include/mach/hardware.h +++ b/arch/arm/mach-ux500/include/mach/hardware.h @@ -29,9 +29,6 @@ #include <mach/db8500-regs.h> #include <mach/db5500-regs.h> -/* ST-Ericsson modified pl022 id */ -#define SSP_PER_ID 0x01080022 - #ifndef __ASSEMBLY__ #include <mach/id.h> |