diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-03-24 11:12:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 05:33:34 -0400 |
| commit | e536fbe18f803b6bf9f2ea2d54d918e2b09724d8 (patch) | |
| tree | b5e361bd89142792ab58f98683e7e583ccdec021 | |
| parent | 5de5a4dd872b2ca9fe8be380be5c1a78ce83b88c (diff) | |
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 * | |||
| 25 | db8500_add_ssp(const char *name, resource_size_t base, int irq, | 25 | db8500_add_ssp(const char *name, resource_size_t base, int irq, |
| 26 | struct pl022_ssp_controller *pdata) | 26 | struct pl022_ssp_controller *pdata) |
| 27 | { | 27 | { |
| 28 | return dbx500_add_amba_device(name, base, irq, pdata, SSP_PER_ID); | 28 | return dbx500_add_amba_device(name, base, irq, pdata, 0); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | 31 | ||
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 @@ | |||
| 29 | #include <mach/db8500-regs.h> | 29 | #include <mach/db8500-regs.h> |
| 30 | #include <mach/db5500-regs.h> | 30 | #include <mach/db5500-regs.h> |
| 31 | 31 | ||
| 32 | /* ST-Ericsson modified pl022 id */ | ||
| 33 | #define SSP_PER_ID 0x01080022 | ||
| 34 | |||
| 35 | #ifndef __ASSEMBLY__ | 32 | #ifndef __ASSEMBLY__ |
| 36 | 33 | ||
| 37 | #include <mach/id.h> | 34 | #include <mach/id.h> |
