Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Sylwester Nawrocki and committed by
Mauro Carvalho Chehab
4073f942 404a90ab

-51
-51
arch/arm/mach-s5pv210/mach-goni.c
··· 49 49 #include <plat/clock.h> 50 50 #include <plat/samsung-time.h> 51 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 53 #include "common.h" 59 54 ··· 279 284 280 285 /* USB OTG */ 281 286 static struct s3c_hsotg_plat goni_hsotg_pdata; 282 - 283 - static void goni_camera_init(void) 284 - { 285 - s5pv210_fimc_setup_gpio(S5P_CAMPORT_A); 286 - 287 - /* Set max driver strength on CAM_A_CLKOUT pin. */ 288 - s5p_gpio_set_drvstr(S5PV210_GPE1(3), S5P_GPIO_DRVSTR_LV4); 289 - } 290 287 291 288 /* MAX8998 regulators */ 292 289 #if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE) ··· 812 825 s3c_sdhci2_set_platdata(&goni_hsmmc2_data); 813 826 }; 814 827 815 - static struct noon010pc30_platform_data noon010pc30_pldata = { 816 - .clk_rate = 16000000UL, 817 - .gpio_nreset = S5PV210_GPB(2), /* CAM_CIF_NRST */ 818 - .gpio_nstby = S5PV210_GPB(0), /* CAM_CIF_NSTBY */ 819 - }; 820 - 821 - static struct i2c_board_info noon010pc30_board_info = { 822 - I2C_BOARD_INFO("NOON010PC30", 0x60 >> 1), 823 - .platform_data = &noon010pc30_pldata, 824 - }; 825 - 826 - static struct fimc_source_info goni_camera_sensors[] = { 827 - { 828 - .mux_id = 0, 829 - .flags = V4L2_MBUS_PCLK_SAMPLE_FALLING | 830 - V4L2_MBUS_VSYNC_ACTIVE_LOW, 831 - .fimc_bus_type = FIMC_BUS_TYPE_ITU_601, 832 - .board_info = &noon010pc30_board_info, 833 - .i2c_bus_num = 0, 834 - .clk_frequency = 16000000UL, 835 - }, 836 - }; 837 - 838 - static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { 839 - .source_info = goni_camera_sensors, 840 - .num_clients = ARRAY_SIZE(goni_camera_sensors), 841 - }; 842 - 843 828 /* Audio device */ 844 829 static struct platform_device goni_device_audio = { 845 830 .name = "smdk-audio", ··· 833 874 &s5p_device_mixer, 834 875 &s5p_device_sdo, 835 876 &s3c_device_i2c0, 836 - &s5p_device_fimc0, 837 - &s5p_device_fimc1, 838 - &s5p_device_fimc2, 839 - &s5p_device_fimc_md, 840 877 &s3c_device_hsmmc0, 841 878 &s3c_device_hsmmc1, 842 879 &s3c_device_hsmmc2, ··· 901 946 /* FB */ 902 947 s3c_fb_set_platdata(&goni_lcd_pdata); 903 948 904 - /* FIMC */ 905 - s3c_set_platdata(&goni_fimc_md_platdata, sizeof(goni_fimc_md_platdata), 906 - &s5p_device_fimc_md); 907 - 908 949 s3c_hsotg_set_platdata(&goni_hsotg_pdata); 909 - 910 - goni_camera_init(); 911 950 912 951 /* SPI */ 913 952 spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));