Linux v4.6.3

1 files changed, 10 insertions, 15 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 9cebbb0f6..9ea02cf1d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -41,13 +41,15 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 
 CONFIG_ARM_PMU=y
 
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI500_PMU=y
+CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
@@ -75,7 +77,6 @@ CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
-CONFIG_CRYPTO_SHA512_ARM_NEON=y
 CONFIG_CRYPTO_SHA512_ARM=y
 
 # EDAC
@@ -128,6 +129,7 @@ CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP=m
@@ -139,9 +141,11 @@ CONFIG_REGULATOR_ACT8865=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_ROCKCHIP_MBOX=y
 
 # Tegra
-CONFIG_ARM_TEGRA_CPUFREQ=y
 CONFIG_TEGRA_MC=y
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA_IOMMU_SMMU=y
@@ -166,7 +170,6 @@ CONFIG_TEGRA_SOCTHERM=m
 CONFIG_TEGRA_HOST1X=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_DRM_TEGRA=m
-CONFIG_DRM_TEGRA_FBDEV=y
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
@@ -178,7 +181,7 @@ CONFIG_SND_HDA_TEGRA=m
 # Qualcomm - Don't currently support IPQ router devices
 # CONFIG_IPQ_GCC_806X is not set
 # CONFIG_IPQ_LCC_806X is not set
-# CONFIG_IPQ_GCC_4019 is not st
+# CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 # CONFIG_DWMAC_IPQ806X is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -203,6 +206,7 @@ CONFIG_ARM_PSCI=y
 CONFIG_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
 CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_ARM_CPUIDLE is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
@@ -335,10 +339,8 @@ CONFIG_MMC_SDHCI_OF_ARASAN=m
 # LCD Panels
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_LD9040=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-CONFIG_DRM_PANEL_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
@@ -347,17 +349,14 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 # Designware (used by numerous devices)
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
-CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 # CONFIG_SPI_DW_MID_DMA is not set
-# CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_QCOM_DML is not set
 CONFIG_USB_DWC2=m
 CONFIG_USB_DWC2_DUAL_ROLE=y
-CONFIG_USB_DWC2_PLATFORM=m
 CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
@@ -365,7 +364,6 @@ CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
-# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_USB_DWC3_ULPI=y
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
@@ -483,7 +481,6 @@ CONFIG_VFIO_AMBA=m
 # CONFIG_CADENCE_WATCHDOG is not set
 
 # CONFIG_DRM_ARMADA is not set
-# CONFIG_SHMOBILE_IOMMU is not set
 
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_QCOM is not set
@@ -501,7 +498,6 @@ CONFIG_COMMON_CLK_SCPI=m
 
 # core
 
-# CONFIG_INFINIBAND is not set
 # CONFIG_ISDN is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_PARPORT is not set
@@ -536,8 +532,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_SCSI_3W_SAS is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
 # CONFIG_SCSI_BFA_FC is not set
 # CONFIG_FUSION is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -584,6 +578,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 
 # drm
 # CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_HDLCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 
 # CONFIG_DEBUG_SET_MODULE_RONX is not set