Guest User

Untitled

a guest
Dec 16th, 2015
104
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.62 KB | None | 0 0
  1. diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
  2. index d230adbe150a..55e46e50bd7b 100644
  3. --- a/arch/arm/configs/multi_v7_defconfig
  4. +++ b/arch/arm/configs/multi_v7_defconfig
  5. @@ -128,6 +128,7 @@ CONFIG_KEXEC=y
  6.  CONFIG_CPU_FREQ=y
  7.  CONFIG_CPU_FREQ_STAT_DETAILS=y
  8.  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  9. +CONFIG_QORIQ_CPUFREQ=y
  10.  CONFIG_CPU_IDLE=y
  11.  CONFIG_ARM_CPUIDLE=y
  12.  CONFIG_NEON=y
  13. @@ -172,6 +173,7 @@ CONFIG_DMA_CMA=y
  14.  CONFIG_CMA_SIZE_MBYTES=64
  15.  CONFIG_OMAP_OCP2SCP=y
  16.  CONFIG_SIMPLE_PM_BUS=y
  17. +CONFIG_SUNXI_RSB=m
  18.  CONFIG_MTD=y
  19.  CONFIG_MTD_CMDLINE_PARTS=y
  20.  CONFIG_MTD_BLOCK=y
  21. @@ -181,8 +183,11 @@ CONFIG_MTD_NAND_ATMEL=y
  22.  CONFIG_MTD_NAND_BRCMNAND=y
  23.  CONFIG_MTD_NAND_DAVINCI=y
  24.  CONFIG_MTD_SPI_NOR=y
  25. +CONFIG_SPI_FSL_QUADSPI=m
  26.  CONFIG_MTD_UBI=y
  27.  CONFIG_BLK_DEV_LOOP=y
  28. +CONFIG_BLK_DEV_RAM=y
  29. +CONFIG_BLK_DEV_RAM_SIZE=65536
  30.  CONFIG_AD525X_DPOT=y
  31.  CONFIG_AD525X_DPOT_I2C=y
  32.  CONFIG_ATMEL_TCLIB=y
  33. @@ -192,7 +197,6 @@ CONFIG_QCOM_COINCELL=m
  34.  CONFIG_APDS9802ALS=y
  35.  CONFIG_ISL29003=y
  36.  CONFIG_EEPROM_AT24=y
  37. -CONFIG_EEPROM_SUNXI_SID=y
  38.  CONFIG_BLK_DEV_SD=y
  39.  CONFIG_BLK_DEV_SR=y
  40.  CONFIG_SCSI_MULTI_LUN=y
  41. @@ -210,6 +214,7 @@ CONFIG_HIX5HD2_GMAC=y
  42.  CONFIG_SUN4I_EMAC=y
  43.  CONFIG_MACB=y
  44.  CONFIG_NET_CALXEDA_XGMAC=y
  45. +CONFIG_GIANFAR=y
  46.  CONFIG_IGB=y
  47.  CONFIG_MV643XX_ETH=y
  48.  CONFIG_MVNETA=y
  49. @@ -226,6 +231,7 @@ CONFIG_MARVELL_PHY=y
  50.  CONFIG_SMSC_PHY=y
  51.  CONFIG_BROADCOM_PHY=y
  52.  CONFIG_ICPLUS_PHY=y
  53. +CONFIG_REALTEK_PHY=y
  54.  CONFIG_MICREL_PHY=y
  55.  CONFIG_FIXED_PHY=y
  56.  CONFIG_USB_PEGASUS=y
  57. @@ -257,7 +263,7 @@ CONFIG_TOUCHSCREEN_SUN4I=y
  58.  CONFIG_TOUCHSCREEN_WM97XX=m
  59.  CONFIG_INPUT_MISC=y
  60.  CONFIG_INPUT_MPU3050=y
  61. -CONFIG_INPUT_AXP20X_PEK=y
  62. +CONFIG_INPUT_AXP20X_PEK=m
  63.  CONFIG_INPUT_ADXL34X=m
  64.  CONFIG_SERIO_AMBAKMI=y
  65.  CONFIG_SERIAL_8250=y
  66. @@ -310,6 +316,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
  67.  CONFIG_I2C_DIGICOLOR=m
  68.  CONFIG_I2C_GPIO=m
  69.  CONFIG_I2C_EXYNOS5=y
  70. +CONFIG_I2C_IMX=m
  71.  CONFIG_I2C_MV64XXX=y
  72.  CONFIG_I2C_RIIC=y
  73.  CONFIG_I2C_RK3X=y
  74. @@ -328,6 +335,7 @@ CONFIG_SPI=y
  75.  CONFIG_SPI_ATMEL=m
  76.  CONFIG_SPI_CADENCE=y
  77.  CONFIG_SPI_DAVINCI=y
  78. +CONFIG_SPI_FSL_DSPI=m
  79.  CONFIG_SPI_OMAP24XX=y
  80.  CONFIG_SPI_ORION=y
  81.  CONFIG_SPI_PL022=y
  82. @@ -378,6 +386,7 @@ CONFIG_BATTERY_MAX17042=m
  83.  CONFIG_CHARGER_MAX14577=m
  84.  CONFIG_CHARGER_MAX77693=m
  85.  CONFIG_CHARGER_TPS65090=y
  86. +CONFIG_AXP20X_POWER=m
  87.  CONFIG_POWER_RESET_AS3722=y
  88.  CONFIG_POWER_RESET_GPIO=y
  89.  CONFIG_POWER_RESET_GPIO_RESTART=y
  90. @@ -401,6 +410,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
  91.  CONFIG_ORION_WATCHDOG=y
  92.  CONFIG_ST_LPC_WATCHDOG=y
  93.  CONFIG_SUNXI_WATCHDOG=y
  94. +CONFIG_IMX2_WDT=y
  95.  CONFIG_TEGRA_WATCHDOG=m
  96.  CONFIG_MESON_WATCHDOG=y
  97.  CONFIG_DIGICOLOR_WATCHDOG=y
  98. @@ -409,6 +419,8 @@ CONFIG_MFD_AS3722=y
  99.  CONFIG_MFD_ATMEL_FLEXCOM=y
  100.  CONFIG_MFD_BCM590XX=y
  101.  CONFIG_MFD_AXP20X=y
  102. +CONFIG_MFD_AXP20X_I2C=m
  103. +CONFIG_MFD_AXP20X_RSB=m
  104.  CONFIG_MFD_CROS_EC=y
  105.  CONFIG_MFD_CROS_EC_I2C=m
  106.  CONFIG_MFD_CROS_EC_SPI=y
  107. @@ -430,7 +442,7 @@ CONFIG_REGULATOR_AB8500=y
  108.  CONFIG_REGULATOR_ACT8865=y
  109.  CONFIG_REGULATOR_AS3711=y
  110.  CONFIG_REGULATOR_AS3722=y
  111. -CONFIG_REGULATOR_AXP20X=y
  112. +CONFIG_REGULATOR_AXP20X=m
  113.  CONFIG_REGULATOR_BCM590XX=y
  114.  CONFIG_REGULATOR_DA9210=y
  115.  CONFIG_REGULATOR_FAN53555=y
  116. @@ -517,6 +529,7 @@ CONFIG_SND_USB_AUDIO=y
  117.  CONFIG_SND_SOC=m
  118.  CONFIG_SND_ATMEL_SOC=m
  119.  CONFIG_SND_ATMEL_SOC_WM8904=m
  120. +CONFIG_SND_SOC_FSL_SAI=m
  121.  CONFIG_SND_SOC_SH4_FSI=m
  122.  CONFIG_SND_SOC_RCAR=m
  123.  CONFIG_SND_SOC_RSRC_CARD=m
  124. @@ -529,6 +542,7 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
  125.  CONFIG_SND_SOC_TEGRA_ALC5632=m
  126.  CONFIG_SND_SOC_TEGRA_MAX98090=m
  127.  CONFIG_SND_SOC_AK4642=m
  128. +CONFIG_SND_SOC_SGTL5000=m
  129.  CONFIG_SND_SOC_WM8978=m
  130.  CONFIG_USB=y
  131.  CONFIG_USB_XHCI_HCD=y
  132. @@ -569,6 +583,7 @@ CONFIG_MMC_SDHCI=y
  133.  CONFIG_MMC_SDHCI_PLTFM=y
  134.  CONFIG_MMC_SDHCI_OF_ARASAN=y
  135.  CONFIG_MMC_SDHCI_OF_AT91=y
  136. +CONFIG_MMC_SDHCI_OF_ESDHC=m
  137.  CONFIG_MMC_SDHCI_ESDHC_IMX=y
  138.  CONFIG_MMC_SDHCI_DOVE=y
  139.  CONFIG_MMC_SDHCI_TEGRA=y
  140. @@ -641,6 +656,7 @@ CONFIG_DMADEVICES=y
  141.  CONFIG_DW_DMAC=y
  142.  CONFIG_AT_HDMAC=y
  143.  CONFIG_AT_XDMAC=y
  144. +CONFIG_FSL_EDMA=m
  145.  CONFIG_MV_XOR=y
  146.  CONFIG_TEGRA20_APB_DMA=y
  147.  CONFIG_SH_DMAE=y
  148. @@ -672,6 +688,7 @@ CONFIG_QCOM_SMD_RPM=y
  149.  CONFIG_QCOM_SMP2P=y
  150.  CONFIG_QCOM_SMSM=y
  151.  CONFIG_QCOM_WCNSS_CTRL=m
  152. +CONFIG_ROCKCHIP_PM_DOMAINS=y
  153.  CONFIG_COMMON_CLK_QCOM=y
  154.  CONFIG_CHROME_PLATFORMS=y
  155.  CONFIG_CROS_EC_CHARDEV=m
  156. @@ -700,6 +717,7 @@ CONFIG_AK8975=y
  157.  CONFIG_PWM=y
  158.  CONFIG_PWM_ATMEL=m
  159.  CONFIG_PWM_ATMEL_TCB=m
  160. +CONFIG_PWM_FSL_FTM=m
  161.  CONFIG_PWM_RENESAS_TPU=y
  162.  CONFIG_PWM_ROCKCHIP=m
  163.  CONFIG_PWM_SAMSUNG=m
  164. @@ -722,6 +740,8 @@ CONFIG_PHY_STIH407_USB=y
  165.  CONFIG_PHY_SUN4I_USB=y
  166.  CONFIG_PHY_SUN9I_USB=y
  167.  CONFIG_PHY_SAMSUNG_USB2=m
  168. +CONFIG_NVMEM=y
  169. +CONFIG_NVMEM_SUNXI_SID=y
  170.  CONFIG_EXT4_FS=y
  171.  CONFIG_AUTOFS4_FS=y
  172.  CONFIG_MSDOS_FS=y
Add Comment
Please, Sign In to add comment