diff options
author | Padmavathi Venna <padma.v@samsung.com> | 2011-12-22 20:14:45 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-22 20:50:01 -0500 |
commit | 323d7717455e7709a2c923f42349bf2ed36992a3 (patch) | |
tree | 2aeb882223d8b4502bce64208c75dad659221a30 /arch/arm/plat-samsung | |
parent | 4566c7f7612fc2323cfae1556c012bb096380a90 (diff) |
ARM: S5PC100: 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.
Added SPI Setup file for 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 | 3 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 080ea18d3f9..de0d88d6a0f 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -1582,6 +1582,9 @@ void __init s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd, | |||
1582 | 1582 | ||
1583 | pd->num_cs = num_cs; | 1583 | pd->num_cs = num_cs; |
1584 | pd->src_clk_nr = src_clk_nr; | 1584 | pd->src_clk_nr = src_clk_nr; |
1585 | if (!pd->cfg_gpio) | ||
1586 | pd->cfg_gpio = s3c64xx_spi2_cfg_gpio; | ||
1587 | |||
1585 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi2); | 1588 | s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi2); |
1586 | } | 1589 | } |
1587 | #endif /* CONFIG_S3C64XX_DEV_SPI2 */ | 1590 | #endif /* CONFIG_S3C64XX_DEV_SPI2 */ |
diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h index d3e2209c809..aea68b60ef9 100644 --- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | |||
@@ -75,7 +75,9 @@ extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd, | |||
75 | /* defined by architecture to configure gpio */ | 75 | /* defined by architecture to configure gpio */ |
76 | extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev); | 76 | extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev); |
77 | extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev); | 77 | extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev); |
78 | extern int s3c64xx_spi2_cfg_gpio(struct platform_device *dev); | ||
78 | 79 | ||
79 | extern struct s3c64xx_spi_info s3c64xx_spi0_pdata; | 80 | extern struct s3c64xx_spi_info s3c64xx_spi0_pdata; |
80 | extern struct s3c64xx_spi_info s3c64xx_spi1_pdata; | 81 | extern struct s3c64xx_spi_info s3c64xx_spi1_pdata; |
82 | extern struct s3c64xx_spi_info s3c64xx_spi2_pdata; | ||
81 | #endif /* __S3C64XX_PLAT_SPI_H */ | 83 | #endif /* __S3C64XX_PLAT_SPI_H */ |