diff options
author | Padmavathi Venna <padma.v@samsung.com> | 2011-12-22 20:14:36 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-22 20:50:00 -0500 |
commit | 4566c7f7612fc2323cfae1556c012bb096380a90 (patch) | |
tree | 8b69f1970a199939ba85c6f9ed49a1514908d48b /arch/arm/plat-samsung | |
parent | 875a59374cd10200ac24f03877ccd8f73af590cc (diff) |
ARM: S3C64XX: Modified files for SPI consolidation work
As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Setup files are added for SPI GPIO configurations and platform data
initialization.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 8b27e61d034..080ea18d3f9 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -1498,6 +1498,9 @@ void __init s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd, | |||
1498 | 1498 | ||
1499 | pd->num_cs = num_cs; | 1499 | pd->num_cs = num_cs; |
1500 | pd->src_clk_nr = src_clk_nr; | 1500 | pd->src_clk_nr = src_clk_nr; |
1501 | if (!pd->cfg_gpio) | ||
1502 | pd->cfg_gpio = s3c64xx_spi0_cfg_gpio; | ||
1503 | |||
1501 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi0); | 1504 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi0); |
1502 | } | 1505 | } |
1503 | #endif /* CONFIG_S3C64XX_DEV_SPI0 */ | 1506 | #endif /* CONFIG_S3C64XX_DEV_SPI0 */ |
@@ -1537,6 +1540,9 @@ void __init s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd, | |||
1537 | 1540 | ||
1538 | pd->num_cs = num_cs; | 1541 | pd->num_cs = num_cs; |
1539 | pd->src_clk_nr = src_clk_nr; | 1542 | pd->src_clk_nr = src_clk_nr; |
1543 | if (!pd->cfg_gpio) | ||
1544 | pd->cfg_gpio = s3c64xx_spi1_cfg_gpio; | ||
1545 | |||
1540 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi1); | 1546 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi1); |
1541 | } | 1547 | } |
1542 | #endif /* CONFIG_S3C64XX_DEV_SPI1 */ | 1548 | #endif /* CONFIG_S3C64XX_DEV_SPI1 */ |
diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h index effca5394d1..d3e2209c809 100644 --- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | |||
@@ -71,4 +71,11 @@ extern void s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd, | |||
71 | int src_clk_nr, int num_cs); | 71 | int src_clk_nr, int num_cs); |
72 | extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd, | 72 | extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd, |
73 | int src_clk_nr, int num_cs); | 73 | int src_clk_nr, int num_cs); |
74 | |||
75 | /* defined by architecture to configure gpio */ | ||
76 | extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev); | ||
77 | extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev); | ||
78 | |||
79 | extern struct s3c64xx_spi_info s3c64xx_spi0_pdata; | ||
80 | extern struct s3c64xx_spi_info s3c64xx_spi1_pdata; | ||
74 | #endif /* __S3C64XX_PLAT_SPI_H */ | 81 | #endif /* __S3C64XX_PLAT_SPI_H */ |