diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-07-12 18:15:14 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-13 02:23:46 -0400 |
commit | a5238e360b715e9a1bb39d7d3537f78cc9e9e286 (patch) | |
tree | b6503a7429b93b7c15f90d5e3b0124a191215423 /arch/arm/mach-exynos/clock-exynos4.c | |
parent | 2b54be661191532ddf1628c3b151b81ae8743caa (diff) |
spi: s3c64xx: move controller information into driver data
Platform data is used to specify controller hardware specific information
such as the tx/rx fifo level mask and bit offset of rx fifo level. Such
information is not suitable to be supplied from device tree. Instead,
it can be moved into the driver data and removed from platform data.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Jaswinder Singh <jaswinder.singh@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4.c')
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos4.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index bcb7db453145..10a46a9f0ea7 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c | |||
@@ -586,17 +586,17 @@ static struct clk exynos4_init_clocks_off[] = { | |||
586 | .ctrlbit = (1 << 13), | 586 | .ctrlbit = (1 << 13), |
587 | }, { | 587 | }, { |
588 | .name = "spi", | 588 | .name = "spi", |
589 | .devname = "s3c64xx-spi.0", | 589 | .devname = "exynos4210-spi.0", |
590 | .enable = exynos4_clk_ip_peril_ctrl, | 590 | .enable = exynos4_clk_ip_peril_ctrl, |
591 | .ctrlbit = (1 << 16), | 591 | .ctrlbit = (1 << 16), |
592 | }, { | 592 | }, { |
593 | .name = "spi", | 593 | .name = "spi", |
594 | .devname = "s3c64xx-spi.1", | 594 | .devname = "exynos4210-spi.1", |
595 | .enable = exynos4_clk_ip_peril_ctrl, | 595 | .enable = exynos4_clk_ip_peril_ctrl, |
596 | .ctrlbit = (1 << 17), | 596 | .ctrlbit = (1 << 17), |
597 | }, { | 597 | }, { |
598 | .name = "spi", | 598 | .name = "spi", |
599 | .devname = "s3c64xx-spi.2", | 599 | .devname = "exynos4210-spi.2", |
600 | .enable = exynos4_clk_ip_peril_ctrl, | 600 | .enable = exynos4_clk_ip_peril_ctrl, |
601 | .ctrlbit = (1 << 18), | 601 | .ctrlbit = (1 << 18), |
602 | }, { | 602 | }, { |
@@ -1245,7 +1245,7 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = { | |||
1245 | static struct clksrc_clk exynos4_clk_sclk_spi0 = { | 1245 | static struct clksrc_clk exynos4_clk_sclk_spi0 = { |
1246 | .clk = { | 1246 | .clk = { |
1247 | .name = "sclk_spi", | 1247 | .name = "sclk_spi", |
1248 | .devname = "s3c64xx-spi.0", | 1248 | .devname = "exynos4210-spi.0", |
1249 | .enable = exynos4_clksrc_mask_peril1_ctrl, | 1249 | .enable = exynos4_clksrc_mask_peril1_ctrl, |
1250 | .ctrlbit = (1 << 16), | 1250 | .ctrlbit = (1 << 16), |
1251 | }, | 1251 | }, |
@@ -1257,7 +1257,7 @@ static struct clksrc_clk exynos4_clk_sclk_spi0 = { | |||
1257 | static struct clksrc_clk exynos4_clk_sclk_spi1 = { | 1257 | static struct clksrc_clk exynos4_clk_sclk_spi1 = { |
1258 | .clk = { | 1258 | .clk = { |
1259 | .name = "sclk_spi", | 1259 | .name = "sclk_spi", |
1260 | .devname = "s3c64xx-spi.1", | 1260 | .devname = "exynos4210-spi.1", |
1261 | .enable = exynos4_clksrc_mask_peril1_ctrl, | 1261 | .enable = exynos4_clksrc_mask_peril1_ctrl, |
1262 | .ctrlbit = (1 << 20), | 1262 | .ctrlbit = (1 << 20), |
1263 | }, | 1263 | }, |
@@ -1269,7 +1269,7 @@ static struct clksrc_clk exynos4_clk_sclk_spi1 = { | |||
1269 | static struct clksrc_clk exynos4_clk_sclk_spi2 = { | 1269 | static struct clksrc_clk exynos4_clk_sclk_spi2 = { |
1270 | .clk = { | 1270 | .clk = { |
1271 | .name = "sclk_spi", | 1271 | .name = "sclk_spi", |
1272 | .devname = "s3c64xx-spi.2", | 1272 | .devname = "exynos4210-spi.2", |
1273 | .enable = exynos4_clksrc_mask_peril1_ctrl, | 1273 | .enable = exynos4_clksrc_mask_peril1_ctrl, |
1274 | .ctrlbit = (1 << 24), | 1274 | .ctrlbit = (1 << 24), |
1275 | }, | 1275 | }, |
@@ -1347,9 +1347,9 @@ static struct clk_lookup exynos4_clk_lookup[] = { | |||
1347 | CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos4_clk_pdma0), | 1347 | CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos4_clk_pdma0), |
1348 | CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos4_clk_pdma1), | 1348 | CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos4_clk_pdma1), |
1349 | CLKDEV_INIT("dma-pl330.2", "apb_pclk", &exynos4_clk_mdma1), | 1349 | CLKDEV_INIT("dma-pl330.2", "apb_pclk", &exynos4_clk_mdma1), |
1350 | CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk0", &exynos4_clk_sclk_spi0.clk), | 1350 | CLKDEV_INIT("exynos4210-spi.0", "spi_busclk0", &exynos4_clk_sclk_spi0.clk), |
1351 | CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk0", &exynos4_clk_sclk_spi1.clk), | 1351 | CLKDEV_INIT("exynos4210-spi.1", "spi_busclk0", &exynos4_clk_sclk_spi1.clk), |
1352 | CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk0", &exynos4_clk_sclk_spi2.clk), | 1352 | CLKDEV_INIT("exynos4210-spi.2", "spi_busclk0", &exynos4_clk_sclk_spi2.clk), |
1353 | }; | 1353 | }; |
1354 | 1354 | ||
1355 | static int xtal_rate; | 1355 | static int xtal_rate; |