diff options
| -rw-r--r-- | arm-tegra-fixclk.patch | 28 | ||||
| -rw-r--r-- | config-armv7 | 6 | ||||
| -rw-r--r-- | config-armv7-generic | 15 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | config-armv7-tegra | 47 | ||||
| -rw-r--r-- | kernel.spec | 6 |
6 files changed, 64 insertions, 39 deletions
diff --git a/arm-tegra-fixclk.patch b/arm-tegra-fixclk.patch new file mode 100644 index 000000000..df0991293 --- /dev/null +++ b/arm-tegra-fixclk.patch @@ -0,0 +1,28 @@ +diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c +index 788486e..2f4d0e3 100644 +--- a/drivers/clk/tegra/clk-periph.c ++++ b/drivers/clk/tegra/clk-periph.c +@@ -18,6 +18,7 @@ + #include <linux/clk-provider.h> + #include <linux/slab.h> + #include <linux/err.h> ++#include <linux/export.h> + + #include "clk.h" + +@@ -128,6 +129,7 @@ void tegra_periph_reset_deassert(struct clk *c) + + tegra_periph_reset(gate, 0); + } ++EXPORT_SYMBOL_GPL(tegra_periph_reset_deassert); + + void tegra_periph_reset_assert(struct clk *c) + { +@@ -147,6 +149,7 @@ void tegra_periph_reset_assert(struct clk *c) + + tegra_periph_reset(gate, 1); + } ++EXPORT_SYMBOL_GPL(tegra_periph_reset_assert); + + const struct clk_ops tegra_clk_periph_ops = { + .get_parent = clk_periph_get_parent, diff --git a/config-armv7 b/config-armv7 index 507b73225..dc80b797c 100644 --- a/config-armv7 +++ b/config-armv7 @@ -163,8 +163,9 @@ CONFIG_BACKLIGHT_PANDORA=m CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_OHCI_HCD_OMAP3=y CONFIG_USB_MUSB_AM35X=m -CONFIG_USB_MUSB_OMAP2PLUS=y -CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_OMAP2PLUS=m +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_GADGET_MUSB_HDRC=m # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_MUSB_DEBUG is not set CONFIG_OMAP_CONTROL_USB=m @@ -492,5 +493,4 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_CHARGER_MANAGER is not set # CONFIG_POWER_RESET_QNAP is not set # CONFIG_POWER_RESET_RESTART is not set -# CONFIG_ARM_PSCI is not set # CONFIG_OMAP2_DSS_DEBUG is not set diff --git a/config-armv7-generic b/config-armv7-generic index 514b3d1d8..883e8ffaf 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -9,8 +9,6 @@ CONFIG_AEABI=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_UNWIND=y CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y @@ -26,6 +24,13 @@ CONFIG_AUTO_ZRELADDR=y CONFIG_EARLY_PRINTK=y CONFIG_ATAGS=y CONFIG_ATAGS_PROC=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 + +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y # CONFIG_OABI_COMPAT is not set # CONFIG_FPE_NWFPE is not set @@ -63,6 +68,8 @@ CONFIG_ARM_ERRATA_775420=y # CONFIG_PL310_ERRATA_727915 is not set CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y +# Cortex-A15 +CONFIG_ARM_ERRATA_798181=y # generic that deviates from or should be merged into config-generic CONFIG_SMP=y @@ -105,7 +112,7 @@ CONFIG_HW_PERF_EVENTS=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_CC_STACKPROTECTOR=y -CONFIG_LOG_BUF_SHIFT=14 +CONFIG_LOG_BUF_SHIFT=18 CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y @@ -244,6 +251,7 @@ CONFIG_MPCORE_WATCHDOG=m # Thermal / powersaving CONFIG_THERMAL=y CONFIG_POWER_RESET_RESTART=y +CONFIG_ARM_PSCI=y # MTD CONFIG_MTD_OF_PARTS=y @@ -454,4 +462,3 @@ CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_LL is not set # CONFIG_IRQ_DOMAIN_DEBUG is not set # CONFIG_DEBUG_PINCTRL is not set -# CONFIG_ARM_ERRATA_798181 is not set diff --git a/config-armv7-lpae b/config-armv7-lpae index 7bae32788..9df571d55 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -46,7 +46,6 @@ CONFIG_S3C24XX_PWM=y CONFIG_SOC_EXYNOS5250=y CONFIG_SOC_EXYNOS5440=y CONFIG_MACH_EXYNOS5_DT=y -CONFIG_ARM_PSCI=y CONFIG_ARM_EXYNOS_CPUFREQ=y CONFIG_SERIAL_SAMSUNG=y CONFIG_I2C_S3C2410=m diff --git a/config-armv7-tegra b/config-armv7-tegra index 12235bae7..99d5985fa 100644 --- a/config-armv7-tegra +++ b/config-armv7-tegra @@ -4,6 +4,7 @@ CONFIG_ARCH_TEGRA_2x_SOC=y # CONFIG_ARCH_TEGRA_3x_SOC is not set # CONFIG_ARCH_TEGRA_114_SOC is not set +# CONFIG_NEON is not set # These are supported in the LPAE kernel # CONFIG_ARM_LPAE is not set # CONFIG_XEN is not set @@ -27,7 +28,7 @@ CONFIG_TEGRA_PCI=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y -# CONFIG_I2C_TEGRA is not set +CONFIG_I2C_TEGRA=m # This block is temporary until we work out why the MMC modules don't work as modules CONFIG_MMC=y @@ -37,35 +38,14 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF=y CONFIG_MMC_SDHCI_TEGRA=y -# CONFIG_RCU_BOOST is not set CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_TEGRA_AHB=y CONFIG_TEGRA20_APB_DMA=y -CONFIG_SPI_TEGRA20_SFLASH=y -CONFIG_SPI_TEGRA20_SLINK=y -CONFIG_ARM_THUMBEE=y -CONFIG_SWP_EMULATE=y -CONFIG_ARM_ERRATA_430973=y -# CONFIG_ARM_ERRATA_458693 is not set -# CONFIG_ARM_ERRATA_460075 is not set -CONFIG_ARM_ERRATA_742230=y -# CONFIG_ARM_ERRATA_742231 is not set -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_ARM_ERRATA_720789=y -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_ARM_ERRATA_743622 is not set -# CONFIG_ARM_ERRATA_751472 is not set -# CONFIG_ARM_ERRATA_753970 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_ARM_ERRATA_754327 is not set -# CONFIG_ARM_ERRATA_764369 is not set -# CONFIG_THUMB2_KERNEL is not set -# CONFIG_NEON is not set -CONFIG_GPIO_GENERIC_PLATFORM=y -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_KEYBOARD_TEGRA is not set +CONFIG_SPI_TEGRA20_SFLASH=m +CONFIG_SPI_TEGRA20_SLINK=m + +CONFIG_KEYBOARD_TEGRA=m CONFIG_PINCTRL_TEGRA=y CONFIG_PINCTRL_TEGRA20=y CONFIG_PINCTRL_TEGRA30=y @@ -96,14 +76,20 @@ CONFIG_NVEC_PAZ00=y CONFIG_PWM_TEGRA=m -# CONFIG_DRM_TEGRA is not set +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 -CONFIG_CPU_PM=y -CONFIG_ARM_CPU_SUSPEND=y +CONFIG_DRM_TEGRA=m CONFIG_CRYPTO_DEV_TEGRA_AES=m -CONFIG_PL310_ERRATA_753970=y CONFIG_LEDS_RENESAS_TPU=y CONFIG_OF=y @@ -114,7 +100,6 @@ CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y # CONFIG_DRM_TEGRA_DEBUG is not set -# CONFIG_ARM_PSCI is not set # CONFIG_TI_DAC7512 is not set # CONFIG_SPI_TOPCLIFF_PCH is not set # CONFIG_SPI_DW_PCI is not set diff --git a/kernel.spec b/kernel.spec index fadf055c3..5ecb9af2d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -708,6 +708,7 @@ Patch21002: arm-omap-ehci-fix.patch # ARM tegra Patch21004: arm-tegra-nvec-kconfig.patch Patch21005: arm-tegra-usb-no-reset-linux33.patch +Patch21006: arm-tegra-fixclk.patch #rhbz 754518 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1304,6 +1305,7 @@ ApplyPatch arm-lpae-ax88796.patch ApplyPatch arm-omap-ehci-fix.patch # ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch +ApplyPatch arm-tegra-fixclk.patch # # bugfixes to drivers and filesystems @@ -2277,6 +2279,10 @@ fi # ||----w | # || || %changelog +* Tue Apr 9 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Add patch to fix building some ARM tegra modules +- Some minor ARM OMAP updates + * Mon Apr 08 2013 Neil Horman <nhorman@redhat.com> - Fix dma unmap error in e100 (rhbz 907694) |