diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-03-04 11:19:03 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-03-04 11:19:03 +0000 |
| commit | 83ef26c694c4c60df5451f649a01fc051dab3c89 (patch) | |
| tree | a308492bd68b59d7c6adf6e88b92594ade8755b5 | |
| parent | f5e36b421c636b05a9ef63763b1eff7f02587c7e (diff) | |
| download | kernel-83ef26c694c4c60df5451f649a01fc051dab3c89.tar.gz kernel-83ef26c694c4c60df5451f649a01fc051dab3c89.tar.xz kernel-83ef26c694c4c60df5451f649a01fc051dab3c89.zip | |
minor ARM updates
| -rw-r--r-- | arm-tegra-ahb.patch | 14 | ||||
| -rw-r--r-- | config-arm-omap | 4 | ||||
| -rw-r--r-- | config-armv7 | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 |
4 files changed, 23 insertions, 3 deletions
diff --git a/arm-tegra-ahb.patch b/arm-tegra-ahb.patch new file mode 100644 index 000000000..747b5c215 --- /dev/null +++ b/arm-tegra-ahb.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c +index ab92785..093c435 100644 +--- a/drivers/amba/tegra-ahb.c ++++ b/drivers/amba/tegra-ahb.c +@@ -130,7 +130,7 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset) + writel(value, ahb->regs + offset); + } + +-#ifdef CONFIG_ARCH_TEGRA_3x_SOC ++#ifdef CONFIG_TEGRA_IOMMU_SMMU + static int tegra_ahb_match_by_smmu(struct device *dev, void *data) + { + struct tegra_ahb *ahb = dev_get_drvdata(dev); + diff --git a/config-arm-omap b/config-arm-omap index d115b8c70..8ac6cb9c9 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -362,8 +362,8 @@ CONFIG_PWM_TWL_LED=m # CONFIG_OMAP_REMOTEPROC is not set # CONFIG_OMAP_IOVMM is not set -CONFIG_CRYPTO_DEV_OMAP_SHAM=m -CONFIG_CRYPTO_DEV_OMAP_AES=m +# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set +# CONFIG_CRYPTO_DEV_OMAP_AES is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_MTD_NAND_OMAP_BCH is not set diff --git a/config-armv7 b/config-armv7 index 445323ecd..73ce436be 100644 --- a/config-armv7 +++ b/config-armv7 @@ -362,7 +362,7 @@ CONFIG_PINCTRL_SINGLE=m # GPIO CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_GPIO_EM=m +# CONFIG_GPIO_EM is not set CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m CONFIG_POWER_RESET_GPIO=y diff --git a/kernel.spec b/kernel.spec index 10294e250..a2ffe2af1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -707,6 +707,8 @@ Patch21000: arm-export-read_current_timer.patch # ARM tegra Patch21004: arm-tegra-nvec-kconfig.patch Patch21005: arm-tegra-usb-no-reset-linux33.patch +# https://patchwork.kernel.org/patch/2106061/ +Patch21006: arm-tegra-ahb.patch # versatile @@ -1294,6 +1296,7 @@ ApplyPatch vmbugon-warnon.patch ApplyPatch arm-export-read_current_timer.patch # ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch +ApplyPatch arm-tegra-ahb.patch # # bugfixes to drivers and filesystems @@ -2267,6 +2270,9 @@ fi # ||----w | # || || %changelog +* Mon Mar 4 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM updates + * Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git14.1 - Linux v3.8-10206-gb0af9cd |