imx6: add i2c retry on NAK

[openwrt.git] / target / linux / imx6 / config-3.10

diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index 7b07d62c0f6a650f714a75400d1c7f2fb7187f73..77a570ef52aff0df43e57d4582d106563492abb0 100644 (file)
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -28,10 +28,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
 # CONFIG_ARM_APPENDED_DTB is not set
 # CONFIG_ARM_CPU_SUSPEND is not set
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_720789 is not set
 CONFIG_ARM_ERRATA_754322=y
-# CONFIG_ARM_ERRATA_754327 is not set
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_GIC=y
@@ -87,6 +84,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
 CONFIG_DTC=y
+# CONFIG_EP_OF_EP_RC_SYS is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
@@ -98,8 +96,6 @@ CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q-to1.bin"
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FEC=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_MBCACHE=y
@@ -121,13 +117,13 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MXC=y
+CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
@@ -176,7 +172,7 @@ CONFIG_I2C_IMX=y
 # CONFIG_IMX2_WDT is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_PCIE=y
-CONFIG_IMX_SDMA=y
+# CONFIG_IMX_SDMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
@@ -218,8 +214,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
+# CONFIG_MX3_IPU is not set
 # CONFIG_MXC_DEBUG_BOARD is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
 CONFIG_MXS_DMA=y
@@ -274,6 +269,9 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_SAMSUNG_USBPHY is not set
 CONFIG_SCHED_HRTICK=y
 # CONFIG_SCSI_DMA is not set
 CONFIG_SERIAL_IMX=y
@@ -304,6 +302,9 @@ CONFIG_UID16=y
 CONFIG_UIDGID_CONVERTED=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_USB_ARCH_HAS_XHCI=y
+# CONFIG_USB_MXS_PHY is not set
+CONFIG_USB_PHY=y
+CONFIG_USB_SUPPORT=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000