Commit 3af37f02 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-defconfig' of...

Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig

Samsung defconfig udpates for v4.4

- exynos_defconfig
  : enable USB Video Class for Peach boards.
  : enable DWC2 USB and USB ethernet gadget
  : enable LEDs (LEGS_GPIO and LEDS_PWM)for Odroid-XU3/XU4
  : enable RTL8152 for Odroid-XU4
  : enable WiFi-Ex as a module instead of build-in
  : disable temporal simplefb support (FB_SIMPLE) because
    exynos DRM driver can support it now

- multi_v7_defconfig
  : enable DWC2 USB and USB ethernet gadget
  : enable RTL8152 for Odroid-XU4

* tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
  ARM: exynos_defconfig: Disable simplefb support
  ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
  ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable USB Video Class support
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a83e682e f0864f84
...@@ -61,11 +61,12 @@ CONFIG_BLK_DEV_DM=y ...@@ -61,11 +61,12 @@ CONFIG_BLK_DEV_DM=y
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_SMSC911X=y CONFIG_SMSC911X=y
CONFIG_USB_RTL8152=y
CONFIG_USB_USBNET=y CONFIG_USB_USBNET=y
CONFIG_USB_NET_SMSC75XX=y CONFIG_USB_NET_SMSC75XX=y
CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_NET_SMSC95XX=y
CONFIG_MWIFIEX=y CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=y CONFIG_MWIFIEX_SDIO=m
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_CROS_EC=y CONFIG_KEYBOARD_CROS_EC=y
...@@ -126,6 +127,10 @@ CONFIG_REGULATOR_S2MPA01=y ...@@ -126,6 +127,10 @@ CONFIG_REGULATOR_S2MPA01=y
CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS65090=y CONFIG_REGULATOR_TPS65090=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_NXP_PTN3460=y CONFIG_DRM_NXP_PTN3460=y
CONFIG_DRM_PARADE_PS8622=y CONFIG_DRM_PARADE_PS8622=y
...@@ -135,7 +140,6 @@ CONFIG_DRM_EXYNOS_DSI=y ...@@ -135,7 +140,6 @@ CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_HDMI=y CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
CONFIG_FB_SIMPLE=y
CONFIG_EXYNOS_VIDEO=y CONFIG_EXYNOS_VIDEO=y
CONFIG_EXYNOS_MIPI_DSI=y CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y
...@@ -158,8 +162,10 @@ CONFIG_USB_OHCI_HCD=y ...@@ -158,8 +162,10 @@ CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_EXYNOS=y CONFIG_USB_OHCI_EXYNOS=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_DWC3=y CONFIG_USB_DWC3=y
CONFIG_USB_DWC2=y
CONFIG_USB_HSIC_USB3503=y CONFIG_USB_HSIC_USB3503=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ETH=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_BLOCK_MINORS=16
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
...@@ -168,6 +174,12 @@ CONFIG_MMC_SDHCI_S3C_DMA=y ...@@ -168,6 +174,12 @@ CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_IDMAC=y CONFIG_MMC_DW_IDMAC=y
CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_EXYNOS=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_PWM=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_MAX77686=y
CONFIG_RTC_DRV_MAX77802=y CONFIG_RTC_DRV_MAX77802=y
......
...@@ -225,6 +225,7 @@ CONFIG_ICPLUS_PHY=y ...@@ -225,6 +225,7 @@ CONFIG_ICPLUS_PHY=y
CONFIG_MICREL_PHY=y CONFIG_MICREL_PHY=y
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_USB_PEGASUS=y CONFIG_USB_PEGASUS=y
CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=y CONFIG_USB_USBNET=y
CONFIG_USB_NET_SMSC75XX=y CONFIG_USB_NET_SMSC75XX=y
CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_NET_SMSC95XX=y
...@@ -532,6 +533,7 @@ CONFIG_USB_R8A66597_HCD=m ...@@ -532,6 +533,7 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS=m CONFIG_USB_RENESAS_USBHS=m
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_DWC3=y CONFIG_USB_DWC3=y
CONFIG_USB_DWC2=m
CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_AB8500_USB=y CONFIG_AB8500_USB=y
...@@ -544,6 +546,7 @@ CONFIG_USB_MXS_PHY=y ...@@ -544,6 +546,7 @@ CONFIG_USB_MXS_PHY=y
CONFIG_USB_RCAR_PHY=m CONFIG_USB_RCAR_PHY=m
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_ETH=m
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_BLOCK_MINORS=16
CONFIG_MMC_ARMMMCI=y CONFIG_MMC_ARMMMCI=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment