ARM: SAMSUNG: Remove remaining legacy code
After refactoring suspend/resume, which was last part with dependencies on legacy code, all Kconfig symbols related to Samsung ATAGS support can be deselected and more unused code removed. This includes most of s5p-* code as well, as s5pv210 was their last user. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Цей коміт міститься в:
Tomasz Figa
@@ -53,7 +53,6 @@
|
||||
#include <linux/platform_data/ata-samsung_cf.h>
|
||||
#include <plat/fb.h>
|
||||
#include <plat/fb-s3c2410.h>
|
||||
#include <plat/hdmi.h>
|
||||
#include <linux/platform_data/hwmon-s3c.h>
|
||||
#include <linux/platform_data/i2c-s3c2410.h>
|
||||
#include <plat/keypad.h>
|
||||
@@ -145,23 +144,6 @@ struct platform_device s3c_device_camif = {
|
||||
};
|
||||
#endif /* CONFIG_CPU_S3C2440 */
|
||||
|
||||
/* ASOC DMA */
|
||||
|
||||
#ifdef CONFIG_PLAT_S5P
|
||||
static struct resource samsung_asoc_idma_resource = DEFINE_RES_IRQ(IRQ_I2S0);
|
||||
|
||||
struct platform_device samsung_asoc_idma = {
|
||||
.name = "samsung-idma",
|
||||
.id = -1,
|
||||
.num_resources = 1,
|
||||
.resource = &samsung_asoc_idma_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
||||
/* FB */
|
||||
|
||||
#ifdef CONFIG_S3C_DEV_FB
|
||||
@@ -190,151 +172,6 @@ void __init s3c_fb_set_platdata(struct s3c_fb_platdata *pd)
|
||||
}
|
||||
#endif /* CONFIG_S3C_DEV_FB */
|
||||
|
||||
/* FIMC */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_FIMC0
|
||||
static struct resource s5p_fimc0_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_FIMC0, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_FIMC0),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimc0 = {
|
||||
.name = "s5p-fimc",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(s5p_fimc0_resource),
|
||||
.resource = s5p_fimc0_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimc_md = {
|
||||
.name = "s5p-fimc-md",
|
||||
.id = -1,
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_FIMC0 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_FIMC1
|
||||
static struct resource s5p_fimc1_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_FIMC1, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_FIMC1),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimc1 = {
|
||||
.name = "s5p-fimc",
|
||||
.id = 1,
|
||||
.num_resources = ARRAY_SIZE(s5p_fimc1_resource),
|
||||
.resource = s5p_fimc1_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_FIMC1 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_FIMC2
|
||||
static struct resource s5p_fimc2_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_FIMC2, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_FIMC2),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimc2 = {
|
||||
.name = "s5p-fimc",
|
||||
.id = 2,
|
||||
.num_resources = ARRAY_SIZE(s5p_fimc2_resource),
|
||||
.resource = s5p_fimc2_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_FIMC2 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_FIMC3
|
||||
static struct resource s5p_fimc3_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_FIMC3, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_FIMC3),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimc3 = {
|
||||
.name = "s5p-fimc",
|
||||
.id = 3,
|
||||
.num_resources = ARRAY_SIZE(s5p_fimc3_resource),
|
||||
.resource = s5p_fimc3_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_FIMC3 */
|
||||
|
||||
/* G2D */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_G2D
|
||||
static struct resource s5p_g2d_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_G2D, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_2D),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_g2d = {
|
||||
.name = "s5p-g2d",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(s5p_g2d_resource),
|
||||
.resource = s5p_g2d_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_G2D */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_JPEG
|
||||
static struct resource s5p_jpeg_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_JPEG, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_JPEG),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_jpeg = {
|
||||
.name = "s5p-jpeg",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(s5p_jpeg_resource),
|
||||
.resource = s5p_jpeg_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_JPEG */
|
||||
|
||||
/* FIMD0 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_FIMD0
|
||||
static struct resource s5p_fimd0_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
|
||||
[1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
|
||||
[2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
|
||||
[3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_fimd0 = {
|
||||
.name = "s5p-fb",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(s5p_fimd0_resource),
|
||||
.resource = s5p_fimd0_resource,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
},
|
||||
};
|
||||
|
||||
void __init s5p_fimd0_set_platdata(struct s3c_fb_platdata *pd)
|
||||
{
|
||||
s3c_set_platdata(pd, sizeof(struct s3c_fb_platdata),
|
||||
&s5p_device_fimd0);
|
||||
}
|
||||
#endif /* CONFIG_S5P_DEV_FIMD0 */
|
||||
|
||||
/* HWMON */
|
||||
|
||||
#ifdef CONFIG_S3C_DEV_HWMON
|
||||
@@ -722,60 +559,6 @@ void __init s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *pd)
|
||||
}
|
||||
#endif /* CONFIG_S3C_DEV_I2C7 */
|
||||
|
||||
/* I2C HDMIPHY */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_I2C_HDMIPHY
|
||||
static struct resource s5p_i2c_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_IIC_HDMIPHY, SZ_4K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_IIC_HDMIPHY),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_i2c_hdmiphy = {
|
||||
.name = "s3c2440-hdmiphy-i2c",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_i2c_resource),
|
||||
.resource = s5p_i2c_resource,
|
||||
};
|
||||
|
||||
void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd)
|
||||
{
|
||||
struct s3c2410_platform_i2c *npd;
|
||||
|
||||
if (!pd) {
|
||||
pd = &default_i2c_data;
|
||||
|
||||
if (soc_is_s5pv210())
|
||||
pd->bus_num = 3;
|
||||
else
|
||||
pd->bus_num = 0;
|
||||
}
|
||||
|
||||
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
|
||||
&s5p_device_i2c_hdmiphy);
|
||||
}
|
||||
|
||||
static struct s5p_hdmi_platform_data s5p_hdmi_def_platdata;
|
||||
|
||||
void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
|
||||
struct i2c_board_info *mhl_info, int mhl_bus)
|
||||
{
|
||||
struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata;
|
||||
|
||||
if (soc_is_s5pv210())
|
||||
pd->hdmiphy_bus = 3;
|
||||
else
|
||||
pd->hdmiphy_bus = 0;
|
||||
|
||||
pd->hdmiphy_info = hdmiphy_info;
|
||||
pd->mhl_info = mhl_info;
|
||||
pd->mhl_bus = mhl_bus;
|
||||
|
||||
s3c_set_platdata(pd, sizeof(struct s5p_hdmi_platform_data),
|
||||
&s5p_device_hdmi);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
|
||||
|
||||
/* I2S */
|
||||
|
||||
#ifdef CONFIG_PLAT_S3C24XX
|
||||
@@ -879,36 +662,6 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
|
||||
}
|
||||
#endif /* CONFIG_PLAT_S3C24XX */
|
||||
|
||||
/* MIPI CSIS */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_CSIS0
|
||||
static struct resource s5p_mipi_csis0_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_MIPI_CSIS0, SZ_16K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_MIPI_CSIS0),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_mipi_csis0 = {
|
||||
.name = "s5p-mipi-csis",
|
||||
.id = 0,
|
||||
.num_resources = ARRAY_SIZE(s5p_mipi_csis0_resource),
|
||||
.resource = s5p_mipi_csis0_resource,
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_CSIS0 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_CSIS1
|
||||
static struct resource s5p_mipi_csis1_resource[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_MIPI_CSIS1, SZ_16K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_MIPI_CSIS1),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_mipi_csis1 = {
|
||||
.name = "s5p-mipi-csis",
|
||||
.id = 1,
|
||||
.num_resources = ARRAY_SIZE(s5p_mipi_csis1_resource),
|
||||
.resource = s5p_mipi_csis1_resource,
|
||||
};
|
||||
#endif
|
||||
|
||||
/* NAND */
|
||||
|
||||
#ifdef CONFIG_S3C_DEV_NAND
|
||||
@@ -1052,43 +805,6 @@ void __init s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)
|
||||
}
|
||||
#endif /* CONFIG_S3C64XX_DEV_ONENAND1 */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_ONENAND
|
||||
static struct resource s5p_onenand_resources[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_ONENAND, SZ_128K),
|
||||
[1] = DEFINE_RES_MEM(S5P_PA_ONENAND_DMA, SZ_8K),
|
||||
[2] = DEFINE_RES_IRQ(IRQ_ONENAND_AUDI),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_onenand = {
|
||||
.name = "s5pc110-onenand",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_onenand_resources),
|
||||
.resource = s5p_onenand_resources,
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_ONENAND */
|
||||
|
||||
/* PMU */
|
||||
|
||||
#if defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS)
|
||||
static struct resource s5p_pmu_resource[] = {
|
||||
DEFINE_RES_IRQ(IRQ_PMU)
|
||||
};
|
||||
|
||||
static struct platform_device s5p_device_pmu = {
|
||||
.name = "arm-pmu",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_pmu_resource),
|
||||
.resource = s5p_pmu_resource,
|
||||
};
|
||||
|
||||
static int __init s5p_pmu_init(void)
|
||||
{
|
||||
platform_device_register(&s5p_device_pmu);
|
||||
return 0;
|
||||
}
|
||||
arch_initcall(s5p_pmu_init);
|
||||
#endif /* CONFIG_PLAT_S5P */
|
||||
|
||||
/* PWM Timer */
|
||||
|
||||
#ifdef CONFIG_SAMSUNG_DEV_PWM
|
||||
@@ -1251,52 +967,6 @@ void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *pd)
|
||||
}
|
||||
#endif /* CONFIG_SAMSUNG_DEV_TS */
|
||||
|
||||
/* TV */
|
||||
|
||||
#ifdef CONFIG_S5P_DEV_TV
|
||||
|
||||
static struct resource s5p_hdmi_resources[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_HDMI, SZ_1M),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_HDMI),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_hdmi = {
|
||||
.name = "s5p-hdmi",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_hdmi_resources),
|
||||
.resource = s5p_hdmi_resources,
|
||||
};
|
||||
|
||||
static struct resource s5p_sdo_resources[] = {
|
||||
[0] = DEFINE_RES_MEM(S5P_PA_SDO, SZ_64K),
|
||||
[1] = DEFINE_RES_IRQ(IRQ_SDO),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_sdo = {
|
||||
.name = "s5p-sdo",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_sdo_resources),
|
||||
.resource = s5p_sdo_resources,
|
||||
};
|
||||
|
||||
static struct resource s5p_mixer_resources[] = {
|
||||
[0] = DEFINE_RES_MEM_NAMED(S5P_PA_MIXER, SZ_64K, "mxr"),
|
||||
[1] = DEFINE_RES_MEM_NAMED(S5P_PA_VP, SZ_64K, "vp"),
|
||||
[2] = DEFINE_RES_IRQ_NAMED(IRQ_MIXER, "irq"),
|
||||
};
|
||||
|
||||
struct platform_device s5p_device_mixer = {
|
||||
.name = "s5p-mixer",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s5p_mixer_resources),
|
||||
.resource = s5p_mixer_resources,
|
||||
.dev = {
|
||||
.dma_mask = &samsung_device_dma_mask,
|
||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||
}
|
||||
};
|
||||
#endif /* CONFIG_S5P_DEV_TV */
|
||||
|
||||
/* USB */
|
||||
|
||||
#ifdef CONFIG_S3C_DEV_USB_HOST
|
||||
|
||||
Посилання в новій задачі
Заблокувати користувача