rk3168_86v: deconfig add SDCARD_DET_FROM_GPIO and watchdog

This commit is contained in:
hjc
2013-02-21 17:00:55 +08:00
parent bb7e7b9fe4
commit 9e59fa4f79

View File

@@ -1616,7 +1616,25 @@ CONFIG_BATTERY_RK30_VOL3V8=y
# CONFIG_TWL60xx_VBAT_LOW_DETECTION is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
#
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
CONFIG_RK29_WATCHDOG=y
CONFIG_RK29_FEED_DOG_BY_INTE=y
CONFIG_RK29_WATCHDOG_ATBOOT=y
CONFIG_RK29_WATCHDOG_DEFAULT_TIME=5
# CONFIG_RK29_WATCHDOG_DEBUG is not set
# CONFIG_MPCORE_WATCHDOG is not set
# CONFIG_MAX63XX_WATCHDOG is not set
#
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
#
@@ -2084,9 +2102,9 @@ CONFIG_LCD_RK3168_86V=y
# CONFIG_LCD_DS1006H is not set
# CONFIG_NO_TRSM is not set
CONFIG_RK610_LVDS=y
# CONFIG_TC358768_RGB2MIPI is not set
# CONFIG_DP_ANX6345 is not set
# CONFIG_DP501 is not set
# CONFIG_MIPI_DSI is not set
CONFIG_RK610_TVOUT=y
# CONFIG_RK610_TVOUT_YPbPr is not set
# CONFIG_RK610_TVOUT_CVBS is not set
@@ -2106,6 +2124,7 @@ CONFIG_THREE_FB_BUFFER=y
CONFIG_LCDC_RK3066B=y
# CONFIG_LCDC0_RK3066B is not set
CONFIG_LCDC1_RK3066B=y
# CONFIG_RK3066B_LCDC1_IO_18V is not set
# CONFIG_RK_HDMI is not set
#
@@ -2262,7 +2281,7 @@ CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -2284,6 +2303,7 @@ CONFIG_USB_DEVICE_CLASS=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_EHCI_HCD is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
@@ -2494,7 +2514,7 @@ CONFIG_SDMMC_RK29=y
# CONFIG_SDMMC_RK29_OLD is not set
CONFIG_SDMMC0_RK29=y
# CONFIG_SDMMC0_RK29_WRITE_PROTECT is not set
# CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO is not set
CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
CONFIG_SDMMC1_RK29=y
# CONFIG_SDMMC1_RK29_WRITE_PROTECT is not set
# CONFIG_RK29_SDIO_IRQ_FROM_GPIO is not set