From 20d49fec63a914e8b94bb9efd22edd5973916888 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 25 Aug 2016 10:53:58 +0100 Subject: [PATCH] Config updates and fixes for ARMv7 platforms --- config-arm-generic | 4 +++- config-armv7 | 47 ++++++++++++++------------------------------ config-armv7-generic | 29 ++++++++++++--------------- config-armv7-lpae | 4 ---- kernel.spec | 3 +++ 5 files changed, 34 insertions(+), 53 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index 299dcf58a..200d93ab7 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -69,6 +69,7 @@ CONFIG_GPIO_PL061=y CONFIG_USB_ISP1760=m CONFIG_ARM_PL172_MPMC=m CONFIG_DRM_HDLCD=m +CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set # HW crypto and rng @@ -296,7 +297,7 @@ CONFIG_MAILBOX=y CONFIG_ARM_MHU=m # CONFIG_PL320_MBOX is not set CONFIG_ARM_SCPI_PROTOCOL=m -# CONFIG_ARM_SCPI_POWER_DOMAIN is not set +CONFIG_ARM_SCPI_POWER_DOMAIN=m # NVMem CONFIG_NVMEM=m @@ -631,6 +632,7 @@ CONFIG_NET_VENDOR_MELLANOX=y # drm # CONFIG_DRM_VMWGFX is not set # CONFIG_IMX_IPUV3_CORE is not set +# CONFIG_FB_DA8XX is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_CORESIGHT is not set diff --git a/config-armv7 b/config-armv7 index 47ea0247a..700940074 100644 --- a/config-armv7 +++ b/config-armv7 @@ -154,23 +154,20 @@ CONFIG_HW_RANDOM_OMAP3_ROM=m CONFIG_DRM_OMAP=m CONFIG_DRM_OMAP_NUM_CRTCS=2 CONFIG_OMAP2_VRFB=y -# CONFIG_FB_OMAP2 is not set -# CONFIG_FB_DA8XX is not set -# CONFIG_DRM_OMAP_ENCODER_OPA362 is not set -# CONFIG_DRM_OMAP_ENCODER_TFP410 is not set -# CONFIG_DRM_OMAP_ENCODER_TPD12S015 is not set -# CONFIG_DRM_OMAP_CONNECTOR_DVI is not set -# CONFIG_DRM_OMAP_CONNECTOR_HDMI is not set -# CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV is not set -# CONFIG_DRM_OMAP_PANEL_DPI is not set -# CONFIG_DRM_OMAP_PANEL_DSI_CM is not set -# CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM is not set -# CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set -# CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set -# CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1 is not set -# CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1 is not set -# CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set - +CONFIG_DRM_OMAP_ENCODER_OPA362=m +CONFIG_DRM_OMAP_ENCODER_TFP410=m +CONFIG_DRM_OMAP_ENCODER_TPD12S015=m +CONFIG_DRM_OMAP_CONNECTOR_DVI=m +CONFIG_DRM_OMAP_CONNECTOR_HDMI=m +CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m +CONFIG_DRM_OMAP_PANEL_DPI=m +CONFIG_DRM_OMAP_PANEL_DSI_CM=m +CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m +CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m +CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m +CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m +CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m +CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m CONFIG_OMAP2_DSS=m # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set @@ -183,21 +180,6 @@ CONFIG_OMAP2_DSS_DSI=y CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y -CONFIG_DISPLAY_ENCODER_OPA362=m -CONFIG_DISPLAY_ENCODER_TFP410=m -CONFIG_DISPLAY_ENCODER_TPD12S015=m -CONFIG_DISPLAY_CONNECTOR_DVI=m -CONFIG_DISPLAY_CONNECTOR_HDMI=m -CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m -CONFIG_DISPLAY_PANEL_DPI=m -CONFIG_DISPLAY_PANEL_DSI_CM=m -CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m -CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m -CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m -CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m -CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m -CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m - # Enable V4L2 drivers for OMAP2+ CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_OMAP2_VOUT is not set @@ -230,6 +212,7 @@ CONFIG_SND_SOC_TWL6040=m CONFIG_RADIO_WL128X=m CONFIG_OMAP_REMOTEPROC=m +CONFIG_TI_SYSCON_RESET=m # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP_IOMMU_DEBUG is not set diff --git a/config-armv7-generic b/config-armv7-generic index 7c9c1d605..770e94ae7 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -130,15 +130,14 @@ CONFIG_ARM_ERRATA_775420=y CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y CONFIG_PJ4B_ERRATA_4742=y -# Cortex-A15 -# CONFIG_ARM_ERRATA_798181 is not set -# CONFIG_ARM_ERRATA_773022 is not set -# CONFIG_ARM_ERRATA_818325_852422 is not set -# CONFIG_ARM_ERRATA_821420 is not set -# CONFIG_ARM_ERRATA_825619 is not set -# CONFIG_ARM_ERRATA_852421 is not set -# CONFIG_ARM_ERRATA_852423 is not set - +# Cortex-A12/15/17 +CONFIG_ARM_ERRATA_798181=y +CONFIG_ARM_ERRATA_773022=y +CONFIG_ARM_ERRATA_818325_852422=y +CONFIG_ARM_ERRATA_821420=y +CONFIG_ARM_ERRATA_825619=y +CONFIG_ARM_ERRATA_852421=y +CONFIG_ARM_ERRATA_852423=y # generic that deviates from or should be merged into config-generic CONFIG_SMP_ON_UP=y @@ -198,8 +197,9 @@ CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m CONFIG_MACH_SUN6I=y CONFIG_MACH_SUN7I=y CONFIG_MACH_SUN8I=y -# CONFIG_MACH_SUN9I is not set -# CONFIG_MACH_SUN50I is not set +CONFIG_MACH_SUN9I=y +CONFIG_SUNXI_CCU=y +CONFIG_SUN8I_H3_CCU=y CONFIG_SUNXI_SRAM=y CONFIG_DMA_SUN4I=m CONFIG_DMA_SUN6I=m @@ -208,7 +208,7 @@ CONFIG_SUNXI_WATCHDOG=m CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_RTC_DRV_SUNXI=m CONFIG_PHY_SUN4I_USB=m -# CONFIG_PHY_SUN9I_USB is not set +CONFIG_PHY_SUN9I_USB=m CONFIG_AHCI_SUNXI=m CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m @@ -244,15 +244,12 @@ CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN4I_I2S=m CONFIG_SUNXI_RSB=m CONFIG_NVMEM_SUNXI_SID=m -# CONFIG_SUNXI_CCU is not set -# CONFIG_SUN8I_H3_CCU is not set # BCM 283x CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_DMA_BCM2835=m -# CONFIG_MMC_SDHCI_BCM2835 is not set CONFIG_MMC_SDHCI_IPROC=m CONFIG_BCM2835_MBOX=m CONFIG_PWM_BCM2835=m @@ -358,10 +355,10 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_ODROIDX2=m +CONFIG_EXYNOS_AUDSS_CLK_CON=m # CONFIG_EXYNOS_IOMMU_DEBUG is not set # CONFIG_SAMSUNG_PM_DEBUG is not set # CONFIG_SAMSUNG_PM_CHECK is not set -# CONFIG_EXYNOS_AUDSS_CLK_CON is not set # Arndale/Origen CONFIG_MFD_MAX8997=y diff --git a/config-armv7-lpae b/config-armv7-lpae index 178d36e8f..daece122a 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -21,10 +21,6 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_CMA_SIZE_SEL_MBYTES=y CONFIG_CMA_SIZE_MBYTES=64 -# Cortex-A15 -CONFIG_ARM_ERRATA_798181=y -CONFIG_ARM_ERRATA_773022=y - # Little.BIG CONFIG_BIG_LITTLE=y CONFIG_BL_SWITCHER=y diff --git a/kernel.spec b/kernel.spec index 0fce1ea2a..e5cf55a57 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2155,6 +2155,9 @@ fi # # %changelog +* Wed Aug 24 2016 Peter Robinson +- Config updates and fixes for ARMv7 platforms + * Wed Aug 24 2016 Justin M. Forbes - 4.8.0-0.rc3.git1.1 - Linux v4.8-rc3-26-gcad9d20 - Reenable debugging options.