aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2013-11-25ARM: OMAP2+: Remove board file for H4Tony Lindgren3-373/+0
The old 2420 based H4 is probably not used at all as 2420 was Nokia specific SoC. I have one, but I'm not using it because of it's large size, and I doubt anybody else is using it either. We do have minimal omap2420-h4.dts in place, so if anybody wants more support on H4, patches are welcome. So let's just remove it as that helps us making mach-omap2 to be device tree only. Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Remove legacy booting support for n8x0Tony Lindgren2-227/+0
Now we can boot n8x with the appended device tree with: $ ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- make omap2420-n800.dtb $ cat arch/arm/boot/zImage arch/arm/boot/dts/omap2420-n800.dtb > /tmp/zImage Note that you need at least the following enabled: CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Add quirks support for n8x0Tony Lindgren3-2/+38
This allows us to keep things working when booted with device tree. Note that we still need to initialize most things with platform data as the drivers are lacking support for device tree. Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Make n8x0 behave better with device tree based bootingTony Lindgren1-8/+22
Initialize some devices using a late_initcall and test for the device tree based booting for some devices. This way we can keep things working for legacy platform devices when booted with device tree. Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Add device tree compatible revision checks for n8x0Tony Lindgren1-9/+42
This allows us to initialize the legacy devices when booted with device tree. Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Add support for board specific auxdata quirksTony Lindgren1-7/+25
Looks like some boards need to fill in the auxdata before we call of_platform_populate(). Let's add support for auxdata quirks like we already have for pdata quirks for legacy drivers. Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25Merge branch 'omap-for-v3.14/dt' into omap-for-v3.14/board-removalTony Lindgren7-0/+343
2013-11-25ARM: dts: Add basic support for omap3 LDP zoom1 labradorTony Lindgren2-0/+232
Basic things like serial, Ethernet, MMC, NAND, DSS, touchscreen and GPIO keys work. For twl4030-keypad we're still missing the binding, but support for that should be trivial to add once the driver has been updated. MUSB I'm pretty sure I got got to enumerate once, but I suspect the battery charging somehow disrupts it and it's not enumerating in general for some reason. Patches are welcome to improve things if people are still using this board. For reference, here's some more info on this old board: http://www.openomap.org/wiki/tiki-index.php?page=HardwareInfo Cc: [email protected] Cc: "Benoît Cousson" <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: dts: Add basic Nokia N8X0 supportTony Lindgren5-0/+61
Add minimal device tree support for n8x0 boards so we can make omap2 device tree only. Note that we still need to initialize various platform data quirks to keep things working until n8x0 drivers support device tree. Here's a rough todo list for the people using n8x0: 1. Update menelaus for device tree and set up regulators at least for the MMC driver 2. Remove the MMC regulator platform data callback by using the Menlaus regulators directly in the driver passed from the .dts file 3. Update GPMC connected devices for onenand and tusb6010 for device tree We're planning to remove all legacy platform data for mach-omap2 over next few merge cycles, so if people are still using n8x0, please fix the issues above. Cc: [email protected] Cc: "Benoît Cousson" <[email protected]> Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: dts: Add basic device tree support for omap2430 sdpTony Lindgren2-0/+50
I doubt that there are many people using 2430 sdp, but as that's been historically an important acid test platform for omap2+ related changes, let's add minimal device tree support for it. If anybody is using it beyond minimal boot testing, patches for more complete device tree support are welcome. Cc: [email protected] Cc: "Benoît Cousson" <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: dts: Add max77686 RTC interrupt to cros5250-commonDoug Anderson1-0/+12
Without the interrupt you'll get problems if you enable CONFIG_RTC_DRV_MAX77686. Setup the interrupt properly in the device tree. Signed-off-by: Doug Anderson <[email protected]> Tested-by: Marc Zyngier <[email protected]> Signed-off-by: Olof Johansson <[email protected]> Cc: [email protected]
2013-11-25Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4Tony Lindgren816-7390/+19519
2013-11-25ARM: OMAP2+: Fix eMMC on n900 with device treeTony Lindgren2-1/+23
Looks like we need to configure the regulators and use the pdata quirk to make eMMC work with device tree. It seems that mostly vaux3 is used, and only some earlier revisions used vmmc2. This has been tested to work on devices where the system_rev passed by the bootloader has versions 0x0010, 0x2101 and 0x2204. Cc: [email protected] Cc: Pavel Machek <[email protected]> Cc: Aaro Koskinen <[email protected]> Signed-off-by: Sebastian Reichel <[email protected]> [[email protected]: updated with pinctrl changes and comments from Sebastian] Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Add fixed regulator to omap2plus_defconfigTony Lindgren1-0/+1
We do not have REGULATOR_FIXED selected if no boards are selected and we boot with device tree. This can cause various devices to fail. Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: OMAP2+: Fix more missing data for omap3.dtsi fileTony Lindgren1-0/+42
After dropping the duplicate data in hwmod that now should come from the .dts files, I noticed few more entries missing. Let's add these as otherwise devices relying on these won't work. Looks like the side tone entries are bundled into the mcbsp1 to 3, so that may needs some special handling in the hwmod code as it's currently trying to look up mcbsp2_sidetone and mcbsp3_sidetone entries. Signed-off-by: Tony Lindgren <[email protected]>
2013-11-25ARM: vexpress/TC2: Implement MCPM power_down_finish()Dave Martin3-5/+102
This patch implements the power_down_finish() method for TC2, to enable the kernel to confirm when CPUs are safely powered down. The information required for determining when a CPU is parked cannot be obtained from any single place, so a few sources of information must be combined: * mcpm_cpu_power_down() must be pending for the CPU, so that we don't get confused by false STANDBYWFI positives arising from CPUidle. This is detected by waiting for the tc2_pm use count for the target CPU to reach 0. * Either the SPC must report that the CPU has asserted STANDBYWFI, or the TC2 tile's reset control logic must be holding the CPU in reset. Just checking for STANDBYWFI is not sufficient, because this signal is not latched when the the cluster is clamped off and powered down: the relevant status bits just drop to zero. This means that STANDBYWFI status cannot be used for reliable detection of the last CPU in a cluster reaching WFI. This patch is required in order for kexec to work with MCPM on TC2. MCPM code was changed in commit 0de0d6467525 ('ARM: 7848/1: mcpm: Implement cpu_kill() to synchronise on powerdown'), and since then it will hit a WARN_ON_ONCE() due to power_down_finish not being implemented on the TC2 platform. Signed-off-by: Dave Martin <[email protected]> Acked-by: Pawel Moll <[email protected]> Reviewed-by: Nicolas Pitre <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2013-11-25Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of ↵Olof Johansson11-180/+199
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: Few more fixes for issues found booting older omaps using device tree. Also few randconfig build fixes and removal of some dead code for omap4 as it no longer has legacy platform data based booting support. * tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init ARM: OMAP2+: Remove legacy mux code for display.c ARM: OMAP2+: Fix undefined reference to set_cntfreq gpio: twl4030: Fix passing of pdata in the device tree case gpio: twl4030: Fix regression for twl gpio output ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain ARM: dts: Fix omap2 specific dtsi files by adding the missing entries ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x i2c: omap: Fix missing device tree flags for omap2
2013-11-25ARM: omap: fix warning with LPAE buildOlof Johansson1-1/+1
Some omap3 code is throwing a warning: arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context': arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case. Signed-off-by: Olof Johansson <[email protected]> Acked-by: Tony Lindgren <[email protected]>
2013-11-25ARM: mvebu: re-enable PCIe on Armada 370 DBThomas Petazzoni1-14/+14
Commit 14fd8ed0a7fd19913 ("ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes") relocated the PCIe controller DT nodes one level up in the Device Tree, to reflect a more correct representation of the hardware introduced by the mvebu-mbus Device Tree binding. However, while most of the boards were properly adjusted accordingly, the Armada 370 DB board was left unchanged, and therefore, PCIe is seen as not enabled on this board. This patch fixes that by moving the PCIe controller node one level-up in armada-370-db.dts. Signed-off-by: Thomas Petazzoni <[email protected]> Cc: <[email protected]> # v3.12+ Fixes: 14fd8ed0a7fd19913 "ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes" Signed-off-by: Jason Cooper <[email protected]>
2013-11-25ARM: mvebu: use the virtual CPU registers to access coherency registersGregory CLEMENT1-1/+1
The Armada XP provides a mechanism called "virtual CPU registers" or "per-CPU register banking", to access the per-CPU registers of the current CPU, without having to worry about finding on which CPU we're running. CPU0 has its registers at 0x21800, CPU1 at 0x21900, CPU2 at 0x21A00 and CPU3 at 0x21B00. The virtual registers accessing the current CPU registers are at 0x21000. However, in the Device Tree node that provides the register addresses for the coherency unit (which is responsible for ensuring coherency between processors, and I/O coherency between processors and the DMA-capable devices), a mistake was made: the CPU0-specific registers were specified instead of the virtual CPU registers. This means that the coherency barrier needed for I/O coherency was not behaving properly when executed from a CPU different from CPU0. This patch fixes that by using the virtual CPU registers. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]> Cc: <[email protected]> # v3.8+ Fixes: e60304f8cb7bb5 "arm: mvebu: Add hardware I/O Coherency support" Signed-off-by: Jason Cooper <[email protected]>
2013-11-25arm64: Unmask asynchronous aborts when in kernel modeCatalin Marinas3-0/+9
The asynchronous aborts are generally fatal for the kernel but they can be masked via the pstate A bit. If a system error happens while in kernel mode, it won't be visible until returning to user space. This patch enables this kind of abort early to help identifying the cause. Signed-off-by: Catalin Marinas <[email protected]>
2013-11-25arm64: dts: Reserve the memory used for secondary CPU release addressCatalin Marinas1-0/+2
With the spin-table SMP booting method, secondary CPUs poll a location passed in the DT. The foundation-v8.dts file doesn't have this memory reserved and there is a risk of Linux using it before secondary CPUs are started. Signed-off-by: Catalin Marinas <[email protected]>
2013-11-25arm64: let the core code deal with preempt_countMarc Zyngier1-22/+7
Commit f27dde8deef3 (sched: Add NEED_RESCHED to the preempt_count) introduced the use of bit 31 in preempt_count for obscure scheduling purposes. This causes interrupts taken from EL0 to hit the (open coded) BUG when this flag is flipped while handling the interrupt (we compare the values before and after, and kill the kernel if they are different). The fix is to stop messing with the preempt count entirely, as this is already being dealt with in the generic code (irq_enter/irq_exit). Tested on a dual A53 FPGA running cyclictest. Signed-off-by: Marc Zyngier <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
2013-11-25s390/mm: handle asce-type exceptions as normal page faultMartin Schwidefsky1-1/+1
Git commit 9e34f2686bb088b211b6cac8772e1f644c6180f8 "s390/mm,tlb: tlb flush on page table upgrade fixup" removed the exception handler for the asce-type exception. This is incorrect as the user-copy with MVCOS can cause asce-type exceptions in the kernel if a user pointer is too large. Those need to be handled with do_no_context to branch to the fixup in the user-copy code. The simplest fix for this problem is to call do_dat_exception for asce-type excpetions, as there is no vma for the address the code will handle the exception correctly. Signed-off-by: Martin Schwidefsky <[email protected]>
2013-11-25s390,time: revert direct ktime path for s390 clockevent deviceMartin Schwidefsky1-15/+4
Git commit 4f37a68cdaf6dea833cfdded2a3e0c47c0f006da "s390: Use direct ktime path for s390 clockevent device" makes use of the CLOCK_EVT_FEAT_KTIME clockevent option to avoid the delta calculation with ktime_get() in clockevents_program_event and the get_tod_clock() in s390_next_event. This is based on the assumption that the difference between the internal ktime and the hardware clock is reflected in the wall_to_monotonic delta. But this is not true, the ntp corrections are applied via changes to the tk->mult multiplier and this is not reflected in wall_to_monotonic. In theory this could be solved by using the raw monotonic clock but it is simpler to switch back to the standard clock delta calculation. Signed-off-by: Martin Schwidefsky <[email protected]>
2013-11-25s390/time,vdso: convert to the new update_vsyscall interfaceMartin Schwidefsky8-45/+62
Switch to the improved update_vsyscall interface that provides sub-nanosecond precision for gettimeofday and clock_gettime. Signed-off-by: Martin Schwidefsky <[email protected]>
2013-11-25s390/uaccess: add missing page table walk range checkHeiko Carstens1-0/+3
When translating a user space address, the address must be checked against the ASCE limit of the process. If the address is larger than the maximum address that is reachable with the ASCE, an ASCE type exception must be generated. The current code simply ignored the higher order bits. This resulted in an address wrap around in user space instead of an exception in user space. Cc: [email protected] # v3.9+ Reviewed-by: Gerald Schaefer <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2013-11-25arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflowChen Gang1-1/+1
for tmp_part->header.name: it is "Terminating null required only for names < 12 chars". so need to limit the %.12s for it in printk additional info: %12s limit the width, not for the original string output length if name length is more than 12, it still can be fully displayed. if name length is less than 12, the ' ' will be filled before name. %.12s truly limit the original string output length (precision) Signed-off-by: Chen Gang <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-11-25powerpc/signals: Improved mark VSX not saved with small contexts fixMichael Neuling2-9/+13
In a recent patch: commit c13f20ac48328b05cd3b8c19e31ed6c132b44b42 Author: Michael Neuling <[email protected]> powerpc/signals: Mark VSX not saved with small contexts We fixed an issue but an improved solution was later discussed after the patch was merged. Firstly, this patch doesn't handle the 64bit signals case, which could also hit this issue (but has never been reported). Secondly, the original patch isn't clear what MSR VSX should be set to. The new approach below always clears the MSR VSX bit (to indicate no VSX is in the context) and sets it only in the specific case where VSX is available (ie. when VSX has been used and the signal context passed has space to provide the state). This reverts the original patch and replaces it with the improved solution. It also adds a 64 bit version. Signed-off-by: Michael Neuling <[email protected]> Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-11-25powerpc/kdump: Adding symbols in vmcoreinfo to facilitate dump filteringHari Bathini2-0/+13
When CONFIG_SPARSEMEM_VMEMMAP option is used in kernel, makedumpfile fails to filter vmcore dump as it fails to do vmemmap translations. So far dump filtering on ppc64 never had to deal with vmemmap addresses seperately as vmemmap regions where mapped in zone normal. But with the inclusion of CONFIG_SPARSEMEM_VMEMMAP config option in kernel, this vmemmap address translation support becomes necessary for dump filtering. For vmemmap adress translation, few kernel symbols are needed by dump filtering tool. This patch adds those symbols to vmcoreinfo, which a dump filtering tool can use for filtering the kernel dump. Tested this changes successfully with makedumpfile tool that supports vmemmap to physical address translation outside zone normal. [ Removed unneeded #ifdef as suggested by Michael Ellerman --BenH ] Signed-off-by: Hari Bathini <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-11-25powerpc: allyesconfig should not select CONFIG_CPU_LITTLE_ENDIANAnton Blanchard1-3/+17
Stephen reported a failure in an allyesconfig build. CONFIG_CPU_LITTLE_ENDIAN=y gets set but his toolchain is not new enough to support little endian. We really want to default to a big endian build; Ben suggested using a choice which defaults to CPU_BIG_ENDIAN. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-11-25powerpc: Fix error when cross building TAGS & cscopeMichael Neuling1-0/+2
Currently if I cross build TAGS or cscope from x86 I get this: % make ARCH=powerpc TAGS gcc-4.8.real: error: unrecognized command line option ‘-mbig-endian’ GEN TAGS % I'm not setting CROSS_COMPILE= as logically I shouldn't need to and I haven't needed to in the past when building TAGS or cscope. Also, the above completess correct as the error is not fatal to the build. This was caused by: commit d72b08017161ab385d4ae080ea415c9eb7ceef83 Author: Ian Munsie <[email protected]> powerpc: Add ability to build little endian kernels The below fixes this by testing for the -mbig-endian option before adding it. I've not done the same thing in the little endian case as if -mlittle-endian doesn't exist, we probably want to fail quickly as you probably have an old big endian compiler. Signed-off-by: Michael Neuling <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2013-11-24ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfigSimon Horman1-0/+1
This is required to allow the load address to be supplied as an environment variable when building a uImage. LOADADDR=0x40008000 ARCH=arm make uImage This is necessary since "ARM: shmobile: Remove legacy KZM9D board code" Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: enable HPB-DMAC in defconfigSergei Shtylyov1-0/+2
Enable HPB-DMAC driver in 'bockw_defconfig'. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: enable HPB-DMAC in defconfigSergei Shtylyov1-0/+2
Enable HPB-DMAC driver in 'marzen_defconfig'. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfigSimon Horman1-1/+0
CONFIG_SMC911X is not needed by marzen. It appears to have been accidently enabled as well as CONFIG_SMSC911X which is needed by marzen. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfigSimon Horman1-0/+1
CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfigSimon Horman1-0/+1
CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfigSimon Horman1-2/+0
This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfigSimon Horman1-2/+0
This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Enable CONFIG_VFP in defconfigSimon Horman1-0/+1
CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: Enable CONFIG_VFP in defconfigSimon Horman1-0/+1
CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfigSimon Horman1-1/+0
CONFIG_INOTIFY_USER is required for udev to function. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfigSimon Horman1-1/+0
CONFIG_INOTIFY_USER is required for udev to function. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: marzen: Do not set command line in defconfigSimon Horman1-2/+0
As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config. marzen already has the command line present in its DTS file but it was being overrirden by the kernel config. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: Do not set command line in defconfigSimon Horman1-2/+0
As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config. bockw already has the command line present in its DTS file but it was being overrirden by the kernel config. A side effect of this change is that "rw" is now present on the command line which allows a boot using nfs root to succeed in the case where userspace expects to be able to write to the root filesystem. Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: bockw: enable CONFIG_REGULATORKuninori Morimoto1-0/+1
CONFIG_REGULATOR is required from MMCIF and SMSC Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-11-24ARM: shmobile: Genmai defconfigMagnus Damm1-0/+116
Add a defconfig for the Genmai board. In the future this board will use a shared defconfig for multiplatform, but until CCF is implemented this will be used. Signed-off-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-11-23Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds16-209/+36
Pull crypto update from Herbert Xu: - Made x86 ablk_helper generic for ARM - Phase out chainiv in favour of eseqiv (affects IPsec) - Fixed aes-cbc IV corruption on s390 - Added constant-time crypto_memneq which replaces memcmp - Fixed aes-ctr in omap-aes - Added OMAP3 ROM RNG support - Add PRNG support for MSM SoC's - Add and use Job Ring API in caam - Misc fixes [ NOTE! This pull request was sent within the merge window, but Herbert has some questionable email sending setup that makes him public enemy #1 as far as gmail is concerned. So most of his emails seem to be trapped by gmail as spam, resulting in me not seeing them. - Linus ] * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (49 commits) crypto: s390 - Fix aes-cbc IV corruption crypto: omap-aes - Fix CTR mode counter length crypto: omap-sham - Add missing modalias padata: make the sequence counter an atomic_t crypto: caam - Modify the interface layers to use JR API's crypto: caam - Add API's to allocate/free Job Rings crypto: caam - Add Platform driver for Job Ring hwrng: msm - Add PRNG support for MSM SoC's ARM: DT: msm: Add Qualcomm's PRNG driver binding document crypto: skcipher - Use eseqiv even on UP machines crypto: talitos - Simplify key parsing crypto: picoxcell - Simplify and harden key parsing crypto: ixp4xx - Simplify and harden key parsing crypto: authencesn - Simplify key parsing crypto: authenc - Export key parsing helper function crypto: mv_cesa: remove deprecated IRQF_DISABLED hwrng: OMAP3 ROM Random Number Generator support crypto: sha256_ssse3 - also test for BMI2 crypto: mv_cesa - Remove redundant of_match_ptr crypto: sahara - Remove redundant of_match_ptr ...
2013-11-23ARM: kirkwood: enable HIGHMEM in defconfigThomas Petazzoni1-0/+1
The Kirkwood-based OpenBlocks A7 platform has 1 GB of memory. To make use of this memory completely, enabling HIGHMEM is needed, so we enable it by default in the kirkwood_defconfig. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Andrew Lunn <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>