diff options
| -rw-r--r-- | config-arm-generic | 3 | ||||
| -rw-r--r-- | config-arm-highbank | 13 | ||||
| -rw-r--r-- | config-arm-imx | 14 | ||||
| -rw-r--r-- | config-arm-kirkwood | 1 | ||||
| -rw-r--r-- | config-arm-omap-generic | 17 | ||||
| -rw-r--r-- | config-arm-tegra | 44 | ||||
| -rw-r--r-- | kernel.spec | 6 |
7 files changed, 36 insertions, 62 deletions
diff --git a/config-arm-generic b/config-arm-generic index fb2a7355d..e87365e22 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -189,6 +189,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768 # drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # # FIXME: Guesses, need checking # CONFIG_MACH_EUKREA_CPUIMX35SD is not set @@ -209,3 +210,5 @@ CONFIG_ARM_ERRATA_751472=y # CONFIG_MACH_MX53_LOCO is not set # CONFIG_MACH_MX53_ARD is not set # CONFIG_ARM_EXYNOS4210_CPUFREQ is not set + +CONFIG_OF_GPIO=y diff --git a/config-arm-highbank b/config-arm-highbank index d4aca8222..18fc0c4cc 100644 --- a/config-arm-highbank +++ b/config-arm-highbank @@ -1,16 +1,3 @@ ONFIG_ARCH_HIGHBANK=y CONFIG_VFP=y CONFIG_NEON=y - -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y diff --git a/config-arm-imx b/config-arm-imx index e28c2cb55..d1ce04e39 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -81,24 +81,10 @@ CONFIG_IMX2_WDT=m CONFIG_SND_SOC_PHYCORE_AC97=m CONFIG_SND_SOC_EUKREA_TLV320=m -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y - CONFIG_PL310_ERRATA_769419=y CONFIG_LEDS_RENESAS_TPU=y # CONFIG_ARM_LPAE is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set diff --git a/config-arm-kirkwood b/config-arm-kirkwood index a81438364..592b5aa1b 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -40,7 +40,6 @@ CONFIG_RTC_DRV_MV=m CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set diff --git a/config-arm-omap-generic b/config-arm-omap-generic index 9e15f6379..21063a2c7 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -153,22 +153,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_AUTO_ZRELADDR is not set -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VFPv3=y CONFIG_NEON=y @@ -1084,7 +1070,6 @@ CONFIG_LEDS_RENESAS_TPU=y CONFIG_USB_RENESAS_USBHS_HCD=m # CONFIG_ARM_LPAE is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_SOC_OMAPTI81XX is not set diff --git a/config-arm-tegra b/config-arm-tegra index 4c537ef5e..f07164376 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -1,15 +1,29 @@ CONFIG_ARCH_TEGRA=y + +CONFIG_ARCH_TEGRA_2x_SOC=y +CONFIG_ARCH_TEGRA_3x_SOC=y +# CONFIG_ARM_LPAE is not set +CONFIG_TEGRA_PCI=y + +CONFIG_VFP=y +CONFIG_VFPv3=y + CONFIG_MACH_HARMONY=y CONFIG_MACH_KAEN=y CONFIG_MACH_PAZ00=y +CONFIG_MACH_SEABOARD=y +CONFIG_MACH_TEGRA_DT=y CONFIG_MACH_TRIMSLICE=y CONFIG_MACH_WARIO=y CONFIG_MACH_TEGRA_DT=y +CONFIG_MACH_VENTANA=y + CONFIG_TEGRA_DEBUG_UARTD=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y -CONFIG_NR_CPUS=2 +CONFIG_NR_CPUS=4 +CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -51,7 +65,7 @@ CONFIG_HW_PERF_EVENTS=y # CONFIG_RFKILL_GPIO is not set CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_MCP23S08 is not set -CONFIG_KEYBOARD_TEGRA=y +# CONFIG_KEYBOARD_TEGRA is not set # CONFIG_MPCORE_WATCHDOG is not set CONFIG_USB_EHCI_TEGRA=y CONFIG_RTC_DRV_TEGRA=m @@ -68,31 +82,19 @@ CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_POWER_SUPPLY=y +CONFIG_NVEC_LEDS=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_PM=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y CONFIG_CRYSTALHD=m -CONFIG_MACH_VENTANA=y CONFIG_PL310_ERRATA_753970=y -CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_LEDS_RENESAS_TPU=y -# CONFIG_ARCH_TEGRA_2x_SOC is not set -# CONFIG_ARCH_TEGRA_3x_SOC is not set # CONFIG_ARM_EXYNOS4210_CPUFREQ is not set # CONFIG_ETHERNET is not set # CONFIG_NET_VENDOR_BROADCOM is not set @@ -102,3 +104,9 @@ CONFIG_LEDS_RENESAS_TPU=y # CONFIG_DVB_PLL is not set # CONFIG_SND_SOC_TEGRA_ALC5632 is not set +CONFIG_PCI=y +CONFIG_PCI_SYSCALL=y +CONFIG_OF_GPIO=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y + diff --git a/kernel.spec b/kernel.spec index 9e16885a4..0dc18825c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -735,6 +735,7 @@ Patch20000: utrace.patch # Flattened devicetree support Patch21000: arm-omap-dt-compat.patch Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch +Patch21004: arm-tegra-nvec-kconfig.patch Patch21070: ext4-Support-check-none-nocheck-mount-options.patch @@ -1330,6 +1331,7 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch # #pplyPatch arm-omap-dt-compat.patch ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch +ApplyPatch arm-tegra-nvec-kconfig.patch # # bugfixes to drivers and filesystems @@ -2349,6 +2351,10 @@ fi # ||----w | # || || %changelog +* Wed Feb 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- Update ARM configs to 3.3 kernel +- use mainline cpu freq options + * Wed Feb 15 2012 Josh Boyer <jwboyer@redhat.com - 3.3.0-0.rc3.git6.2 - Linux 3.3-rc3-git6 (upstream c38e23456278e967f094b08247ffc3711b1029b2) - Require newer linux-firmware package for updated bnx2/bnx2x drivers |