diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-20 02:30:08 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-22 07:14:08 +0900 |
| commit | a3d9358406b7529373ccafbf6d264f811884959c (patch) | |
| tree | a02aaa2d1f033ccd86a95d02be13158a118c0255 /arch/arm/mach-s5p64x0/dev-spi.c | |
| parent | c06af3cc6a27991187fd513765fed943684d41bf (diff) | |
| download | kernel_samsung_smdk4412-a3d9358406b7529373ccafbf6d264f811884959c.zip kernel_samsung_smdk4412-a3d9358406b7529373ccafbf6d264f811884959c.tar.gz kernel_samsung_smdk4412-a3d9358406b7529373ccafbf6d264f811884959c.tar.bz2 | |
ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/dev-spi.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/dev-spi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-s5p64x0/dev-spi.c b/arch/arm/mach-s5p64x0/dev-spi.c index ac825e8..1fd9c79 100644 --- a/arch/arm/mach-s5p64x0/dev-spi.c +++ b/arch/arm/mach-s5p64x0/dev-spi.c @@ -21,6 +21,7 @@ #include <mach/regs-clock.h> #include <mach/spi-clocks.h> +#include <plat/cpu.h> #include <plat/s3c64xx-spi.h> #include <plat/gpio-cfg.h> @@ -185,11 +186,8 @@ struct platform_device s5p64x0_device_spi1 = { void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) { - unsigned int id; struct s3c64xx_spi_info *pd; - id = __raw_readl(S5P64X0_SYS_ID) & 0xFF000; - /* Reject invalid configuration */ if (!num_cs || src_clk_nr < 0 || src_clk_nr > S5P64X0_SPI_SRCCLK_SCLK) { @@ -199,7 +197,7 @@ void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) switch (cntrlr) { case 0: - if (id == 0x50000) + if (soc_is_s5p6450()) pd = &s5p6450_spi0_pdata; else pd = &s5p6440_spi0_pdata; @@ -207,7 +205,7 @@ void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) s5p64x0_device_spi0.dev.platform_data = pd; break; case 1: - if (id == 0x50000) + if (soc_is_s5p6450()) pd = &s5p6450_spi1_pdata; else pd = &s5p6440_spi1_pdata; |