diff options
-rw-r--r-- | Documentation/devicetree/bindings/spi/spi-samsung.txt | 1 | ||||
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt b/Documentation/devicetree/bindings/spi/spi-samsung.txt index 86aa061f069f..fe6f9037b561 100644 --- a/Documentation/devicetree/bindings/spi/spi-samsung.txt +++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt | |||
@@ -8,7 +8,6 @@ Required SoC Specific Properties: | |||
8 | - compatible: should be one of the following. | 8 | - compatible: should be one of the following. |
9 | - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms | 9 | - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms |
10 | - samsung,s3c6410-spi: for s3c6410 platforms | 10 | - samsung,s3c6410-spi: for s3c6410 platforms |
11 | - samsung,s5p6440-spi: for s5p6440 and s5p6450 platforms | ||
12 | - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms | 11 | - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms |
13 | - samsung,exynos4210-spi: for exynos4 and exynos5 platforms | 12 | - samsung,exynos4210-spi: for exynos4 and exynos5 platforms |
14 | 13 | ||
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 75a56968b14c..4a1890a73667 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
@@ -1323,12 +1323,6 @@ static struct s3c64xx_spi_port_config s3c6410_spi_port_config = { | |||
1323 | .tx_st_done = 21, | 1323 | .tx_st_done = 21, |
1324 | }; | 1324 | }; |
1325 | 1325 | ||
1326 | static struct s3c64xx_spi_port_config s5p64x0_spi_port_config = { | ||
1327 | .fifo_lvl_mask = { 0x1ff, 0x7F }, | ||
1328 | .rx_lvl_offset = 15, | ||
1329 | .tx_st_done = 25, | ||
1330 | }; | ||
1331 | |||
1332 | static struct s3c64xx_spi_port_config s5pc100_spi_port_config = { | 1326 | static struct s3c64xx_spi_port_config s5pc100_spi_port_config = { |
1333 | .fifo_lvl_mask = { 0x7f, 0x7F }, | 1327 | .fifo_lvl_mask = { 0x7f, 0x7F }, |
1334 | .rx_lvl_offset = 13, | 1328 | .rx_lvl_offset = 13, |
@@ -1368,9 +1362,6 @@ static struct platform_device_id s3c64xx_spi_driver_ids[] = { | |||
1368 | .name = "s3c6410-spi", | 1362 | .name = "s3c6410-spi", |
1369 | .driver_data = (kernel_ulong_t)&s3c6410_spi_port_config, | 1363 | .driver_data = (kernel_ulong_t)&s3c6410_spi_port_config, |
1370 | }, { | 1364 | }, { |
1371 | .name = "s5p64x0-spi", | ||
1372 | .driver_data = (kernel_ulong_t)&s5p64x0_spi_port_config, | ||
1373 | }, { | ||
1374 | .name = "s5pc100-spi", | 1365 | .name = "s5pc100-spi", |
1375 | .driver_data = (kernel_ulong_t)&s5pc100_spi_port_config, | 1366 | .driver_data = (kernel_ulong_t)&s5pc100_spi_port_config, |
1376 | }, { | 1367 | }, { |