diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-06-08 14:49:29 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-06-08 14:49:29 +0100 |
| commit | 2e3ed492cffca645fddaf1ffc98337b0be08aea6 (patch) | |
| tree | ca375c65b4c1e7312e82e541e76170307a340cde | |
| parent | 3d3e17409cacdbadf082f7a6959642291737b268 (diff) | |
| download | kernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.tar.gz kernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.tar.xz kernel-2e3ed492cffca645fddaf1ffc98337b0be08aea6.zip | |
Minor ARM/aarch64 config updates
| -rw-r--r-- | config-arm-generic | 5 | ||||
| -rw-r--r-- | config-arm64 | 4 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/config-arm-generic b/config-arm-generic index 6995e1e70..eae9b5087 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -57,7 +57,6 @@ CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y -# CONFIG_HISILICON_IRQ_MBIGEN is not set CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y @@ -70,6 +69,8 @@ CONFIG_PL330_DMA=m CONFIG_GPIO_PL061=y CONFIG_USB_ISP1760=m CONFIG_ARM_PL172_MPMC=m +CONFIG_DRM_HDLCD=m +# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set # HW crypto and rng CONFIG_ARM_CRYPTO=y @@ -588,7 +589,6 @@ 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 @@ -607,6 +607,7 @@ CONFIG_CHECKPOINT_RESTORE=y # CONFIG_PINCTRL_SUNRISEPOINT is not set # CONFIG_HW_RANDOM_HISI is not set +# CONFIG_HISILICON_IRQ_MBIGEN is not set # CONFIG_QRTR is not set # This Xilinx option is now built for arm64 as well as ARM diff --git a/config-arm64 b/config-arm64 index de487b2e8..0d33b00ce 100644 --- a/config-arm64 +++ b/config-arm64 @@ -154,7 +154,8 @@ CONFIG_REGULATOR_HI655X=m CONFIG_PHY_HI6220_USB=m CONFIG_COMMON_RESET_HI6220=m CONFIG_HI6220_MBOX=m -# CONFIG_RESET_HISI is not set +CONFIG_RESET_HISI=y +CONFIG_MFD_HI655X_PMIC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_HISI_KIRIN_DW_DSI=m @@ -175,7 +176,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y # CONFIG_SERIO_SUN4I_PS2 is not set CONFIG_SUNXI_WATCHDOG=m CONFIG_MFD_SUN6I_PRCM=y -# CONFIG_MFD_HI655X_PMIC is not set CONFIG_IR_SUNXI=m CONFIG_MMC_SUNXI=m CONFIG_RTC_DRV_SUN6I=m diff --git a/config-armv7 b/config-armv7 index 7a8e0538b..5a749ac0a 100644 --- a/config-armv7 +++ b/config-armv7 @@ -363,6 +363,7 @@ CONFIG_SOC_IMX7D=y CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_POWER_RESET_IMX=y CONFIG_PCI_IMX6=y +CONFIG_IMX_GPCV2=y CONFIG_IMX_THERMAL=m CONFIG_IMX_SDMA=m CONFIG_IMX_DMA=m diff --git a/config-generic b/config-generic index 6911aed7a..5b6bb8d45 100644 --- a/config-generic +++ b/config-generic @@ -3317,7 +3317,6 @@ CONFIG_RTC_DRV_PCF85063=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_MOXART is not set # CONFIG_RTC_DRV_ISL12057 is not set -# CONFIG_RTC_DRV_XGENE is not set # CONFIG_RTC_DRV_ABB5ZES3 is not set # CONFIG_RTC_DRV_ZYNQMP is not set # CONFIG_RTC_DRV_RV8803 is not set diff --git a/kernel.spec b/kernel.spec index 8498c6011..4cf655f52 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2136,6 +2136,9 @@ fi # # %changelog +* Wed Jun 8 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM/aarch64 config updates + * Tue Jun 07 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc2.git1.1 - Linux v4.7-rc2-4-g3613a62 |