diff --git a/arch/arm/configs/odroidx2_defconfig b/arch/arm/configs/odroidx2_defconfig index ab290f7d933b46..b2f8a68c2b2e4b 100644 --- a/arch/arm/configs/odroidx2_defconfig +++ b/arch/arm/configs/odroidx2_defconfig @@ -342,6 +342,7 @@ CONFIG_S5P_DEV_MFC=y CONFIG_S5P_DEV_TV=y CONFIG_S5P_DEV_USB_EHCI=y CONFIG_S3C24XX_PWM=y +CONFIG_S5P_SETUP_MIPIPHY=y CONFIG_SAMSUNG_DMADEV=y # @@ -1089,7 +1090,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin" +CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin s5k4ecgx.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set @@ -1754,13 +1755,13 @@ CONFIG_HW_RANDOM_EXYNOS=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y # # Multiplexer I2C Chip support # -# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_GPIO=y # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_PCA954x is not set CONFIG_I2C_HELPER_AUTO=y @@ -2050,7 +2051,7 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=y -CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_GEN=y CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEOBUF2_CORE=y @@ -2229,10 +2230,13 @@ CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=m CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_TIMBERDALE is not set -# CONFIG_SOC_CAMERA is not set +CONFIG_SOC_CAMERA=y +CONFIG_SOC_CAMERA_PLATFORM=y +# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set +# CONFIG_VIDEO_SH_MOBILE_CEU is not set CONFIG_VIDEO_SAMSUNG_S5P_FIMC=y CONFIG_VIDEO_S5P_FIMC=y -# CONFIG_VIDEO_S5P_MIPI_CSIS is not set +CONFIG_VIDEO_S5P_MIPI_CSIS=y CONFIG_VIDEO_EXYNOS_FIMC_LITE=y # CONFIG_VIDEO_SAMSUNG_S5P_TV is not set CONFIG_V4L_MEM2MEM_DRIVERS=y @@ -2361,7 +2365,7 @@ CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_NOON010PC30 is not set # CONFIG_VIDEO_M5MOLS is not set # CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_S5K4ECGX is not set +CONFIG_VIDEO_S5K4ECGX=y # CONFIG_VIDEO_SMIAPP is not set # @@ -2385,6 +2389,24 @@ CONFIG_VIDEO_CX2341X=m # # Sensors used on soc_camera driver # + +# +# soc_camera sensor drivers +# +# CONFIG_SOC_CAMERA_IMX074 is not set +# CONFIG_SOC_CAMERA_MT9M001 is not set +# CONFIG_SOC_CAMERA_MT9M111 is not set +# CONFIG_SOC_CAMERA_MT9T031 is not set +# CONFIG_SOC_CAMERA_MT9T112 is not set +# CONFIG_SOC_CAMERA_MT9V022 is not set +# CONFIG_SOC_CAMERA_OV2640 is not set +# CONFIG_SOC_CAMERA_OV5642 is not set +# CONFIG_SOC_CAMERA_OV6650 is not set +# CONFIG_SOC_CAMERA_OV772X is not set +# CONFIG_SOC_CAMERA_OV9640 is not set +# CONFIG_SOC_CAMERA_OV9740 is not set +# CONFIG_SOC_CAMERA_RJ54N1 is not set +# CONFIG_SOC_CAMERA_TW9910 is not set # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_TUNER=y diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 286bc9d2885c51..748f3f78bd6f34 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -428,14 +428,14 @@ config MACH_HKDK4412 select SOC_EXYNOS4412 select MACH_SMDK4212 select EXYNOS4_SETUP_FIMC - select S5P_DEV_FIMC0 - select S5P_DEV_FIMC1 - select S5P_DEV_FIMC2 - select S5P_DEV_FIMC3 - select S5P_DEV_MFC - select EXYNOS_DEV_DMA - select EXYNOS_DEV_DRM - select EXYNOS_DEV_SYSMMU + select S5P_DEV_FIMC0 + select S5P_DEV_FIMC1 + select S5P_DEV_FIMC2 + select S5P_DEV_FIMC3 + select S5P_DEV_MFC + select EXYNOS_DEV_DMA + select EXYNOS_DEV_DRM + select EXYNOS_DEV_SYSMMU select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_USB_HSOTG @@ -444,6 +444,7 @@ config MACH_HKDK4412 select S5P_DEV_JPEG select S5P_DEV_USB_EHCI select S5P_DEV_I2C_HDMIPHY + select S5P_SETUP_MIPIPHY select S5P_DEV_TV select S5P_GPIO_INT select EXYNOS4_DEV_USB_OHCI @@ -451,6 +452,8 @@ config MACH_HKDK4412 select EXYNOS4_SETUP_DWMCI select SAMSUNG_DEV_ADC select EXYNOS_SETUP_SPI + select EXYNOS4_SETUP_I2C5 + select S3C_DEV_I2C5 help Machine support for ODROIDs based on Samsung EXYNOS4412 (X/X2/U2) diff --git a/arch/arm/mach-exynos/mach-hkdk4412.c b/arch/arm/mach-exynos/mach-hkdk4412.c index 4cf5f2484abc9b..9d98863b7ee073 100644 --- a/arch/arm/mach-exynos/mach-hkdk4412.c +++ b/arch/arm/mach-exynos/mach-hkdk4412.c @@ -54,6 +54,7 @@ #include