diff options
| -rw-r--r-- | config-arm-generic | 43 | ||||
| -rw-r--r-- | config-arm64 | 3 | ||||
| -rw-r--r-- | config-armv7-generic | 34 | ||||
| -rw-r--r-- | kernel.spec | 1 |
4 files changed, 44 insertions, 37 deletions
diff --git a/config-arm-generic b/config-arm-generic index 77e1ffe12..399bfaf23 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -94,6 +94,35 @@ CONFIG_CLKSRC_VERSATILE=y CONFIG_POWER_RESET_VERSATILE=y # CONFIG_ARM_CHARLCD is not set +# Rockchips +CONFIG_ARCH_ROCKCHIP=y +CONFIG_I2C_RK3X=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_PWM_ROCKCHIP=m +CONFIG_ROCKCHIP_SARADC=m +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_EMAC_ROCKCHIP=m +CONFIG_MFD_RK808=m +CONFIG_COMMON_CLK_RK808=m +CONFIG_REGULATOR_RK808=m +CONFIG_RTC_DRV_RK808=m +CONFIG_RTC_DRV_HYM8563=m +CONFIG_ROCKCHIP_SARADC=m +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_DW_HDMI=m +CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_DWMAC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP_I2S=m +CONFIG_SND_SOC_ROCKCHIP_MAX98090=m +CONFIG_SND_SOC_ROCKCHIP_RT5645=m +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_ROCKCHIP_PM_DOMAINS=y + # Tegra # CONFIG_TEGRA_AHB is not set @@ -215,6 +244,13 @@ CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_RESTART=y # CONFIG_GPIO_74XX_MMIO is not set +# Pin stuff +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_PINCTRL=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_SINGLE=m + #i2c CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BOARDINFO=y @@ -362,7 +398,12 @@ CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_BMP085_SPI is not set # CONFIG_TI_DAC7512 is not set -# CONFIG_SPI_ROCKCHIP is not set # https://fedoraproject.org/wiki/Features/Checkpoint_Restore CONFIG_CHECKPOINT_RESTORE=y + +# Bad Intel shit we don't care about +# CONFIG_PINCTRL_BAYTRAIL is not set +# CONFIG_PINCTRL_CHERRYVIEW is not set +# CONFIG_PINCTRL_BROXTON is not set +# CONFIG_PINCTRL_SUNRISEPOINT is not set diff --git a/config-arm64 b/config-arm64 index e2b9aad11..d2a723230 100644 --- a/config-arm64 +++ b/config-arm64 @@ -17,7 +17,6 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_STRATIX10 is not set # CONFIG_ARCH_TEGRA is not set @@ -71,7 +70,6 @@ CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_THERMAL is not set CONFIG_EFI=y CONFIG_EFI_VARS=y @@ -149,6 +147,7 @@ CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_PHY=m # CONFIG_AMD_XGBE_DCB is not set # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set +CONFIG_PINCTRL_AMD=y # HiSilicon CONFIG_POWER_RESET_HISI=y diff --git a/config-armv7-generic b/config-armv7-generic index 8c35e4896..285b4dca0 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -50,7 +50,6 @@ CONFIG_CPU_SW_DOMAIN_PAN=y # Platforms enabled/disabled globally on ARMv7 CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_HIGHBANK=y -CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y @@ -335,36 +334,8 @@ CONFIG_LEDS_MAX8997=m CONFIG_RTC_DRV_MAX8997=m CONFIG_RTC_DRV_MAX77686=m CONFIG_RTC_DRV_MAX77802=m -CONFIG_RTC_DRV_RK808=m CONFIG_EXTCON_MAX8997=m -# Rockchips -CONFIG_I2C_RK3X=m -CONFIG_SPI_ROCKCHIP=m -CONFIG_PWM_ROCKCHIP=m -CONFIG_ROCKCHIP_SARADC=m -CONFIG_ROCKCHIP_IODOMAIN=m -CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_EMAC_ROCKCHIP=m -CONFIG_MFD_RK808=m -CONFIG_COMMON_CLK_RK808=m -CONFIG_REGULATOR_RK808=m -CONFIG_RTC_DRV_HYM8563=m -CONFIG_ROCKCHIP_SARADC=m -CONFIG_ROCKCHIP_IOMMU=y -CONFIG_ROCKCHIP_THERMAL=m -CONFIG_DRM_ROCKCHIP=m -CONFIG_ROCKCHIP_DW_HDMI=m -CONFIG_PHY_ROCKCHIP_USB=m -CONFIG_DWMAC_ROCKCHIP=m -CONFIG_SND_SOC_ROCKCHIP=m -CONFIG_SND_SOC_ROCKCHIP_I2S=m -CONFIG_SND_SOC_ROCKCHIP_MAX98090=m -CONFIG_SND_SOC_ROCKCHIP_RT5645=m -CONFIG_SND_SOC_ROCKCHIP_SPDIF=m -CONFIG_REGULATOR_ACT8865=m -CONFIG_ROCKCHIP_PM_DOMAINS=y - # Tegra CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y @@ -571,11 +542,6 @@ CONFIG_MFD_TPS65912_SPI=y # # Pin stuff -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_SINGLE=y -CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_AMD is not set # CONFIG_PINCTRL_SAMSUNG is not set # CONFIG_PINCTRL_MSM8X74 is not set diff --git a/kernel.spec b/kernel.spec index f2ce43e55..e0af03394 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2064,6 +2064,7 @@ fi %changelog * Sun Dec 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> - Minor ARMv7/aarch64/ppc/s390 config cleanups +- Enable rk3368 aarch64 platforms * Wed Dec 23 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc6.git1.1 - Linux v4.4-rc6-23-g24bc3ea |