On Mon, Feb 16, 2015 at 5:09 PM, Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> wrote: > Is this rawhide only? If not please do a 'git merge master' in your f22 > branch and push there as well. Should be a simple fast forward. No, it's not, I'd just got sidetracked before I got to IRC and ask about this :) Should be done now. Thx, Peter > josh > > On Feb 16, 2015 12:01 PM, "Peter Robinson" <pbrobinson@xxxxxxxxxxxxxxxxx> > wrote: >> >> commit 7e89ce359ca7a68b16aa3efd003f2e66e3d43938 >> Author: Peter Robinson <pbrobinson@xxxxxxxxx> >> Date: Mon Feb 16 17:00:49 2015 +0000 >> >> Minor updates for ARMv7/ARM64 >> >> config-arm-generic | 27 +++++++++++++++++++++++++++ >> config-arm64 | 1 - >> config-armv7 | 2 +- >> config-armv7-generic | 34 +++++++--------------------------- >> config-generic | 2 -- >> kernel.spec | 3 +++ >> 6 files changed, 38 insertions(+), 31 deletions(-) >> --- >> diff --git a/config-arm-generic b/config-arm-generic >> index c47b3e9..47d524f 100644 >> --- a/config-arm-generic >> +++ b/config-arm-generic >> @@ -114,6 +114,33 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m >> CONFIG_USB_EHCI_HCD_PLATFORM=m >> CONFIG_USB_XHCI_PLATFORM=m >> >> +# MMC/SD >> +CONFIG_MMC_SPI=m >> + >> +# Designware (used by numerous devices) >> +CONFIG_MMC_DW=m >> +CONFIG_MMC_DW_PLTFM=m >> +CONFIG_MMC_DW_PCI=m >> +CONFIG_SPI_DW_MMIO=m >> +CONFIG_SPI_DW_PCI=m >> +# CONFIG_MMC_DW_IDMAC is not set >> +# CONFIG_MMC_DW_K3 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 >> +CONFIG_USB_DWC3=m >> +CONFIG_USB_DWC3_DUAL_ROLE=y >> +CONFIG_USB_DWC3_PCI=m >> +# CONFIG_USB_DWC3_DEBUG is not set >> +# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set >> +CONFIG_DW_WATCHDOG=m >> +CONFIG_PCIE_DW=y >> +# CONFIG_MMC_DW_EXYNOS is not set >> + >> # External Connectors >> CONFIG_EXTCON=m >> CONFIG_EXTCON_GPIO=m >> diff --git a/config-arm64 b/config-arm64 >> index 45e9665..47f5419 100644 >> --- a/config-arm64 >> +++ b/config-arm64 >> @@ -143,7 +143,6 @@ CONFIG_AMD_XGBE_PHY=m >> # CONFIG_AMD_XGBE_DCB is not set >> >> # CONFIG_IMX_THERMAL is not set >> -# CONFIG_MMC_DW is not set >> >> CONFIG_DMI=y >> CONFIG_DMIID=y >> diff --git a/config-armv7 b/config-armv7 >> index 3792e70..81175c2 100644 >> --- a/config-armv7 >> +++ b/config-armv7 >> @@ -41,6 +41,7 @@ CONFIG_RTC_DRV_S35390A=m >> CONFIG_RTC_DRV_88PM80X=m >> CONFIG_RTC_DRV_ISL12057=m >> CONFIG_RTC_DRV_MV=m >> +CONFIG_RTC_DRV_ARMADA38X=m >> CONFIG_MVNETA=m >> CONFIG_GPIO_MVEBU=y >> CONFIG_MVEBU_CLK_CORE=y >> @@ -586,7 +587,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m >> CONFIG_SND_SOC_TEGRA20_AC97=m >> CONFIG_SND_SOC_TEGRA20_DAS=m >> CONFIG_SND_SOC_TEGRA20_SPDIF=m >> -CONFIG_SND_SOC_TEGRA_RT5677=m >> >> # AC100 (PAZ00) >> CONFIG_MFD_NVEC=y >> diff --git a/config-armv7-generic b/config-armv7-generic >> index 3b62d1e..bce46b2 100644 >> --- a/config-armv7-generic >> +++ b/config-armv7-generic >> @@ -34,6 +34,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 >> CONFIG_XZ_DEC_ARMTHUMB=y >> CONFIG_ARCH_HAS_TICK_BROADCAST=y >> CONFIG_IRQ_CROSSBAR=y >> +CONFIG_IOMMU_IO_PGTABLE_LPAE=y >> >> # CONFIG_MCPM is not set >> # CONFIG_OABI_COMPAT is not set >> @@ -127,6 +128,11 @@ CONFIG_THERMAL=y >> CONFIG_CLOCK_THERMAL=y >> CONFIG_CPUFREQ_DT=y >> # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set >> +CONFIG_PM_DEVFREQ=y >> +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y >> +CONFIG_DEVFREQ_GOV_PERFORMANCE=y >> +CONFIG_DEVFREQ_GOV_POWERSAVE=y >> +CONFIG_DEVFREQ_GOV_USERSPACE=y >> >> CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 >> CONFIG_LSM_MMAP_MIN_ADDR=32768 >> @@ -222,6 +228,7 @@ CONFIG_ARM_EXYNOS5250_CPUFREQ=y >> CONFIG_ARM_EXYNOS5440_CPUFREQ=y >> CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y >> CONFIG_ARM_EXYNOS_CPUIDLE=y >> +CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m >> # CONFIG_EXYNOS5420_MCPM not set >> >> CONFIG_I2C_EXYNOS5=m >> @@ -296,7 +303,6 @@ CONFIG_SND_SOC_ODROIDX2=m >> # CONFIG_EXYNOS_IOMMU_DEBUG is not set >> # CONFIG_SAMSUNG_PM_DEBUG is not set >> # CONFIG_SAMSUNG_PM_CHECK is not set >> -# CONFIG_ARM_EXYNOS5_BUS_DEVFREQ is not set >> >> # Arndale/Origen >> CONFIG_MFD_MAX8997=y >> @@ -593,32 +599,6 @@ CONFIG_MTD_ST_SPI_FSM=m >> CONFIG_EEPROM_AT25=m >> CONFIG_EEPROM_93XX46=m >> >> -# MMC/SD >> -CONFIG_MMC_SPI=m >> - >> -# Designware (used by numerous devices) >> -CONFIG_MMC_DW=m >> -CONFIG_MMC_DW_PLTFM=m >> -CONFIG_MMC_DW_PCI=m >> -CONFIG_SPI_DW_MMIO=m >> -CONFIG_SPI_DW_PCI=m >> -# CONFIG_MMC_DW_IDMAC is not set >> -# CONFIG_MMC_DW_K3 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 >> -CONFIG_USB_DWC3=m >> -CONFIG_USB_DWC3_DUAL_ROLE=y >> -CONFIG_USB_DWC3_PCI=m >> -# CONFIG_USB_DWC3_DEBUG is not set >> -# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set >> -CONFIG_DW_WATCHDOG=m >> -CONFIG_PCIE_DW=y >> - >> # Sound >> CONFIG_SND_ARM=y >> CONFIG_SND_SOC_AC97_BUS=y >> diff --git a/config-generic b/config-generic >> index f368aeb..c2ed9b8 100644 >> --- a/config-generic >> +++ b/config-generic >> @@ -148,8 +148,6 @@ CONFIG_MMC_REALTEK_USB=m >> CONFIG_MMC_VUB300=m >> CONFIG_MMC_TOSHIBA_PCI=m >> # CONFIG_MMC_SPI is not set >> -# CONFIG_MMC_SDHCI_PXAV2 is not set >> -# CONFIG_MMC_SDHCI_PXAV3 is not set >> # CONFIG_MMC_SDHCI_OF_ARASAN is not set >> # CONFIG_MMC_SDHCI_F_SDH30 is not set >> # CONFIG_MMC_USDHI6ROL0 is not set >> diff --git a/kernel.spec b/kernel.spec >> index 5917403..b36b1e1 100644 >> --- a/kernel.spec >> +++ b/kernel.spec >> @@ -2209,6 +2209,9 @@ fi >> # ||----w | >> # || || >> %changelog >> +* Mon Feb 16 2015 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> >> +- Minor updates for ARMv7/ARM64 >> + >> * Mon Feb 16 2015 Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> - >> 3.20.0-0.rc0.git6.1 >> - Linux v3.19-6676-g1fa185ebcbce >> > _______________________________________________ kernel mailing list kernel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/kernel
