Add patch to fix DRM/X on omap (panda), Enable Cortex-A8 errata on multiplatform kernels (omap3), Minor ARM config updates

5 files changed, 52 insertions, 15 deletions

diff --git a/arm-omap-load-tfp410.patch b/arm-omap-load-tfp410.patch
new file mode 100644
index 000000000..0f2ba5457
--- /dev/null
+++ b/arm-omap-load-tfp410.patch
@@ -0,0 +1,14 @@
+diff -urNp linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/core.c linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/core.c

+--- linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/core.c	2013-04-28 20:36:01.000000000 -0400

++++ linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/core.c	2013-05-31 12:24:07.711334359 -0400

+@@ -596,6 +596,9 @@ static int __init omap_dss_init(void)

+ {

+ 	int r;

+ 

++	/* hack to load panel-tfp410 driver */

++	request_module("panel-tfp410");

++

+ 	r = omap_dss_bus_register();

+ 	if (r)

+ 		return r;

+Binary files linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/.Makefile.swp and linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/.Makefile.swp differ

diff --git a/config-armv7 b/config-armv7
index 4f2c2c63d..7eed946fd 100644
--- a/config-armv7
+++ b/config-armv7
@@ -521,8 +521,6 @@ CONFIG_REGULATOR_FAN53555=m
 # CONFIG_REGULATOR_DUMMY is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_MAX1586=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 97699478a..fea4872c5 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -56,9 +56,9 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_411920 is not set
 # Cortex-A8
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_458693=y
+CONFIG_ARM_ERRATA_460075=y
 # Cortex-A9
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_742230=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 511a6adc0..85bfdd4d7 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -36,6 +36,10 @@ CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_WDT=m
 
+CONFIG_MACH_EXYNOS5_DT=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_S3C_BOOT_ERROR_RESET=y
 CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=0
@@ -46,12 +50,11 @@ CONFIG_S3C24XX_PWM=y
 # CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5440=y
-CONFIG_MACH_EXYNOS5_DT=y
 CONFIG_ARM_EXYNOS_CPUFREQ=y
 # CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 CONFIG_EXYNOS_THERMAL=m
 
-CONFIG_SERIAL_SAMSUNG=y
+CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_I2C_S3C2410=m
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
@@ -77,8 +80,11 @@ CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_GSC=y
 # CONFIG_FB_S3C is not set
 CONFIG_SND_SOC_SAMSUNG=m
-CONFIG_USB_EHCI_S5P=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_S5P=m
 CONFIG_USB_OHCI_EXYNOS=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_S3C_DEV_HSMMC=y
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
@@ -96,13 +102,23 @@ CONFIG_USB_EHCI_S5P=y
 CONFIG_SAMSUNG_USBPHY=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_PLTFM=y
-CONFIG_MMC_DW_PCI=y
-CONFIG_MMC_DW_EXYNOS=y
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_PCI=m
+CONFIG_MMC_DW_EXYNOS=m
 
 # Chromebook
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_KEYBOARD_CROS_EC=m
+
+# Arndale/Origen
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_COMMON_CLK_MAX77686=m
+
+# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
+# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
diff --git a/kernel.spec b/kernel.spec
index 5bd819078..fc2a5d0f0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -699,10 +699,13 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 Patch21000: arm-export-read_current_timer.patch
 
 # lpae
-Patch21002: arm-lpae-ax88796.patch
-Patch21003: drm-exynos-fix-multiple-definition-build-error.patch
+Patch21001: arm-lpae-ax88796.patch
+Patch21002: drm-exynos-fix-multiple-definition-build-error.patch
 
-Patch21004: v2-thermal-cpu_cooling-fix-stub-function.patch
+Patch21003: v2-thermal-cpu_cooling-fix-stub-function.patch
+
+# ARM omap
+Patch21004: arm-omap-load-tfp410.patch
 
 # ARM tegra
 Patch21005: arm-tegra-usb-no-reset-linux33.patch
@@ -1292,6 +1295,7 @@ ApplyPatch debug-bad-pte-modules.patch
 ApplyPatch arm-export-read_current_timer.patch
 ApplyPatch arm-lpae-ax88796.patch
 ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
+ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch v2-thermal-cpu_cooling-fix-stub-function.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 
@@ -2234,6 +2238,11 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sun Jun  2 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch to fix DRM/X on omap (panda)
+- Enable Cortex-A8 errata on multiplatform kernels (omap3)
+- Minor ARM config updates
+
 * Fri May 31 2013 Josh Boyer <jwboyer@redhat.com>
 - CVE-2013-2850 iscsi-target: heap buffer overflow on large key error (rhbz 968036 969272)