aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2014-04-15 06:31:21 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-23 17:50:42 -0400
commit4073f942698785397d8e51d3cefeebdc31a26b26 (patch)
treea81c8a7264d9ad6208fafdb8b8b092e97aaea62b /arch/arm/mach-s5pv210
parent404a90abc60f60df2757cb272660e003d326881f (diff)
[media] ARM: S5PV210: Remove camera support from mach-goni.c
S5PV210 is going to get DT support, so we can remove the camera bits from the only board using camera on S5PV210. This allows to clean the exynos4-is driver by dropping code for non-dt platforms. This patch can be dropped if a patch removing the whole board file is applied first. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c51
1 files changed, 0 insertions, 51 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index b41a38a75844..6c719eccb94e 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -49,11 +49,6 @@
49#include <plat/clock.h> 49#include <plat/clock.h>
50#include <plat/samsung-time.h> 50#include <plat/samsung-time.h>
51#include <plat/mfc.h> 51#include <plat/mfc.h>
52#include <plat/camport.h>
53
54#include <media/v4l2-mediabus.h>
55#include <media/s5p_fimc.h>
56#include <media/noon010pc30.h>
57 52
58#include "common.h" 53#include "common.h"
59 54
@@ -285,14 +280,6 @@ static void __init goni_tsp_init(void)
285/* USB OTG */ 280/* USB OTG */
286static struct s3c_hsotg_plat goni_hsotg_pdata; 281static struct s3c_hsotg_plat goni_hsotg_pdata;
287 282
288static void goni_camera_init(void)
289{
290 s5pv210_fimc_setup_gpio(S5P_CAMPORT_A);
291
292 /* Set max driver strength on CAM_A_CLKOUT pin. */
293 s5p_gpio_set_drvstr(S5PV210_GPE1(3), S5P_GPIO_DRVSTR_LV4);
294}
295
296/* MAX8998 regulators */ 283/* MAX8998 regulators */
297#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE) 284#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
298 285
@@ -825,34 +812,6 @@ static void goni_setup_sdhci(void)
825 s3c_sdhci2_set_platdata(&goni_hsmmc2_data); 812 s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
826}; 813};
827 814
828static struct noon010pc30_platform_data noon010pc30_pldata = {
829 .clk_rate = 16000000UL,
830 .gpio_nreset = S5PV210_GPB(2), /* CAM_CIF_NRST */
831 .gpio_nstby = S5PV210_GPB(0), /* CAM_CIF_NSTBY */
832};
833
834static struct i2c_board_info noon010pc30_board_info = {
835 I2C_BOARD_INFO("NOON010PC30", 0x60 >> 1),
836 .platform_data = &noon010pc30_pldata,
837};
838
839static struct fimc_source_info goni_camera_sensors[] = {
840 {
841 .mux_id = 0,
842 .flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |
843 V4L2_MBUS_VSYNC_ACTIVE_LOW,
844 .fimc_bus_type = FIMC_BUS_TYPE_ITU_601,
845 .board_info = &noon010pc30_board_info,
846 .i2c_bus_num = 0,
847 .clk_frequency = 16000000UL,
848 },
849};
850
851static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = {
852 .source_info = goni_camera_sensors,
853 .num_clients = ARRAY_SIZE(goni_camera_sensors),
854};
855
856/* Audio device */ 815/* Audio device */
857static struct platform_device goni_device_audio = { 816static struct platform_device goni_device_audio = {
858 .name = "smdk-audio", 817 .name = "smdk-audio",
@@ -874,10 +833,6 @@ static struct platform_device *goni_devices[] __initdata = {
874 &s5p_device_mixer, 833 &s5p_device_mixer,
875 &s5p_device_sdo, 834 &s5p_device_sdo,
876 &s3c_device_i2c0, 835 &s3c_device_i2c0,
877 &s5p_device_fimc0,
878 &s5p_device_fimc1,
879 &s5p_device_fimc2,
880 &s5p_device_fimc_md,
881 &s3c_device_hsmmc0, 836 &s3c_device_hsmmc0,
882 &s3c_device_hsmmc1, 837 &s3c_device_hsmmc1,
883 &s3c_device_hsmmc2, 838 &s3c_device_hsmmc2,
@@ -946,14 +901,8 @@ static void __init goni_machine_init(void)
946 /* FB */ 901 /* FB */
947 s3c_fb_set_platdata(&goni_lcd_pdata); 902 s3c_fb_set_platdata(&goni_lcd_pdata);
948 903
949 /* FIMC */
950 s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata),
951 &s5p_device_fimc_md);
952
953 s3c_hsotg_set_platdata(&goni_hsotg_pdata); 904 s3c_hsotg_set_platdata(&goni_hsotg_pdata);
954 905
955 goni_camera_init();
956
957 /* SPI */ 906 /* SPI */
958 spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); 907 spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
959 908