aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-07-24blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkitBob Liu1-0/+8
In user xip test, there is a cplb error when ROMKERNEL try to mount romfs using 'mount -t romfs /dev/mtdblock2 /mnt', becasue the CPLB setting is not correct. Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: Add double fault, hardware error and NMI SEC handlerSonic Zhang2-1/+35
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: update anomaly id in serial and twi driver headers.Sonic Zhang2-2/+2
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: vs6624 pin updateVivi Li1-1/+3
Change ce pin to PE4 according to new adaptor board and re-define ppi for vs6624 to avoid gpio conflict. Signed-off-by: Vivi Li <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: add default anomaly setting.Sonic Zhang1-0/+2
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: update bf60x anomaly list.Sonic Zhang1-88/+56
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: sec: Enable sec interrupt source priority configuration.Sonic Zhang5-1/+190
Customize the SEC interrupt priority array in machine ints-priority.c. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: sec: Clean up interrupt initialization code for SEC.Sonic Zhang3-87/+125
Turn SEC related macro CONFIG_BF60x into SEC_GCTL. Move machine specific GPIO_PINT macros to machine gpio header. Split SEC init_arch_irq() and vec_to_irq() from old SIC. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driverScott Jiang1-2/+2
It's the same for both bf5xx and bf6xx soc. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf561: add capabilities in adv7183_inputsScott Jiang1-0/+3
Add capabilities in adv7183_inputs to indicate that S_STD is supported. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: convert vs6624 blank_clocks to black_pixelsScott Jiang1-1/+1
PPI driver has changed blank units from clocks to pixels. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24blackfin: fix musb macro nameBob Liu2-4/+4
Musb can't work since the marco name has been changed. Signed-off-by: Bob Liu <[email protected]>
2012-07-24cleanup: sec and linkport only built on bf60xSteven Miao1-0/+2
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin: pint: add pint suspend and resumeSteven Miao1-0/+4
Add pint suspend and resume if defined BFIN_GPIO_PINT. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: pm: add pint suspend and resume supportSteven Miao5-21/+76
save and restore pint sec CTL save and restore pint registers add pint suspend and resume when suspend to mem Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: add HDMI support for adv7842Scott Jiang1-7/+20
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: add CVBS and S-Video support for adv7842Scott Jiang1-5/+18
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24gpiokeys: add gpio keyboard platform deviceSteven Miao1-0/+22
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: pm: pass wakeup paramSteven Miao1-9/+10
Pass wake up source mask and wakeup source polarity to deepsleep and hibernate. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: pm: add smc nor flash syscore opsSteven Miao2-1/+25
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin: simple_timer: add READ_COUNTER ioctl and add NOIRQ timer modeSteven Miao1-0/+6
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24blackfin: bf609-ezkit: add probe_type for norflashBob Liu1-0/+3
Set .probe_type = "map_rom" for norflash so that xip_test can run correctly. Signed-off-by: Bob Liu <[email protected]>
2012-07-24i2c: i2c-bfin-twi: Always access 16 bit MMR by bfin 16 bit access Macro.Sonic Zhang1-2/+2
Otherwise, the compiler may optimize assemble code into 8bit access instruction when target register is 8 bit width. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: add ssm2602 support on bf609 platformScott Jiang1-0/+5
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24blackfin: mach-common: ints-priority add irq_set_wakeBob Liu1-1/+5
Add irq_set_wake to bfin_sec_irqchip, drivers like stmmac need it. Signed-off-by: Bob Liu <[email protected]>
2012-07-24v4l2: add adv7842 video decoder driverScott Jiang1-0/+99
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24cache: enable L2 sram icache in menuconfigSteven Miao1-1/+1
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24cpufreq: change debug message level to show clock change errorSteven Miao2-2/+3
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: Add wake up latency bench for deep sleep mode.Sonic Zhang1-0/+2
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin: pm: add deepsleep for bf60xSonic Zhang7-127/+197
Add add deepsleep for bf60x. 1. Call DMC init functions to enter and exit DDR self refresh mode. 2. Wait till CGU PLL is locked after wake up and exit DDR self refresh mode. 3. Make asessembly function enter_deepsleep comply with C funtion ABI in order to call other C functions. 4. Switch kernel stack by register EX_SCRATCH_REG. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24irq: set cgu event handle to fasteoi handleSteven Miao1-1/+1
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24blackfin: Kconfig: fix ROM range for bf60xBob Liu1-1/+2
ROM range of bf60x is above 0xb0000000. Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin: reorg clock init steps for bf609Bob Liu4-133/+224
So that user can set the clocks through menuconfig. Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin-dma: only use MDMA3 on bf609Steven Miao1-2/+2
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: bfin_crc: Remove unused CRC TX DMA platform resources.Sonic Zhang1-5/+0
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24pm: dpmc macro typo fixSteven Miao1-1/+1
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: bfin_crc: move structure bfin_crc out of head file.Sonic Zhang1-14/+0
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf60x: Enable Blackfin CRC crypto driver by default.Sonic Zhang1-0/+2
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: crypto: Add blackfin crypto crc driver platform data.Sonic Zhang1-0/+41
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24blackfin: Call sg_for_each to pass through the whole sg list.Sonic Zhang1-4/+6
Otherwise, chained sg list may be missed. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bfin: add 32M, 16M and 8M uncached DMA region optionsScott Jiang2-1/+13
We need larger DMA region to support HD video. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-24bf609: change ad7877 cs and irq pinScott Jiang1-4/+4
Extend chip select number supported by spi master as well because we can accept SPISEL1-SPISEL7 and all GPIO. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-07-23Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tileLinus Torvalds72-406/+11240
Pull arch/tile updates from Chris Metcalf: "These changes provide support for PCIe root complex and USB host mode for tilegx's on-chip I/Os. In addition, this pull provides the required underpinning for the on-chip networking support that was pulled into 3.5. The changes have all been through LKML (with several rounds for PCIe RC) and on linux-next." * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: updates to pci root complex from community feedback bounce: allow use of bounce pool via config option usb: add host support for the tilegx architecture arch/tile: provide kernel support for the tilegx USB shim tile pci: enable IOMMU to support DMA for legacy devices arch/tile: enable ZONE_DMA for tilegx tilegx pci: support I/O to arbitrarily-cached pages tile: remove unused header arch/tile: tilegx PCI root complex support arch/tile: provide kernel support for the tilegx TRIO shim arch/tile: break out the "csum a long" function to <asm/checksum.h> arch/tile: provide kernel support for the tilegx mPIPE shim arch/tile: common DMA code for the GXIO IORPC subsystem arch/tile: support MMIO-based readb/writeb etc. arch/tile: introduce GXIO IORPC framework for tilegx
2012-07-23Merge tag 'please-pull-misc-3.6' of ↵Linus Torvalds2-13/+35
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux Pull misc Itanium fixes from Tony Luck. * tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC [IA64] Port OOM changes to ia64_do_page_fault
2012-07-23Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds37-1978/+2244
Pull SuperH updates from Paul Mundt: - Migration off of old-style dynamic IRQ API. - irqdomain and generic irq chip propagation. - div4/6 clock consolidation, another step towards co-existing with the common struct clk infrastructure. - Extensive PFC rework - Decoupling GPIO from pin state. - Initial pinctrl support to facilitate incremental migration off of legacy pinmux. - gpiolib support made optional, and made pinctrl-backed. * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (38 commits) sh: pfc: pin config get/set support. sh: pfc: Prefer DRV_NAME over KBUILD_MODNAME. sh: pfc: pinctrl legacy group support. sh: pfc: Ignore pinmux GPIOs with invalid enum IDs. sh: pfc: Export pinctrl binding init symbol. sh: pfc: Error out on pinctrl init resolution failure. sh: pfc: Make pr_fmt consistent across pfc drivers. sh: pfc: pinctrl legacy function support. sh: pfc: Rudimentary pinctrl-backed GPIO support. sh: pfc: Dumb GPIO stringification. sh: pfc: Shuffle PFC support core. sh: pfc: Verify pin type encoding size at build time. sh: pfc: Kill off unused pinmux bias flags. sh: pfc: Make gpio chip support optional where possible. sh: pfc: Split out gpio chip support. sh64: Fix up section mismatch warnings. sh64: Attempt to make reserved insn trap handler resemble C. sh: Consolidate die definitions for trap handlers. sh64: Kill off old exception debugging helpers. sh64: Use generic unaligned access control/counters. ...
2012-07-23Merge branch 'next' of ↵Linus Torvalds163-3008/+4611
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc updates from Benjamin Herrenschmidt: "Notable highlights: - iommu improvements from Anton removing the per-iommu global lock in favor of dividing the DMA space into pools, each with its own lock, and hashed on the CPU number. Along with making the locking more fine grained, this gives significant improvements in multiqueue networking scalability. - Still from Anton, we know provide a vdso based variant of getcpu which makes sched_getcpu with the appropriate glibc patch something like 18 times faster. - More anton goodness (he's been busy !) in other areas such as a faster __clear_user and copy_page on P7, various perf fixes to improve sampling quality, etc... - One more step toward removing legacy i2c interfaces by using new device-tree based probing of platform devices for the AOA audio drivers - A nice series of patches from Michael Neuling that helps avoiding confusion between register numbers and litterals in assembly code, trying to enforce the use of "%rN" register names in gas rather than plain numbers. - A pile of FSL updates - The usual bunch of small fixes, cleanups etc... You may spot a change to drivers/char/mem. The patch got no comment or ack from outside, it's a trivial patch to allow the architecture to skip creating /dev/port, which we use to disable it on ppc64 that don't have a legacy brige. On those, IO ports 0...64K are not mapped in kernel space at all, so accesses to /dev/port cause oopses (and yes, distros -still- ship userspace that bangs hard coded ports such as kbdrate)." * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits) powerpc/mpic: Create a revmap with enough entries for IPIs and timers Remove stale .rej file powerpc/iommu: Fix iommu pool initialization powerpc/eeh: Check handle_eeh_events() return value powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS powerpc/e500: add paravirt QEMU platform powerpc/mpc85xx_ds: convert to unified PCI init powerpc/fsl-pci: get PCI init out of board files powerpc/85xx: Update corenet64_smp_defconfig powerpc/85xx: Update corenet32_smp_defconfig powerpc/85xx: Rename P1021RDB-PC device trees to be consistent powerpc/watchdog: move booke watchdog param related code to setup-common.c sound/aoa: Adapt to new i2c probing scheme i2c/powermac: Improve detection of devices from device-tree powerpc: Disable /dev/port interface on systems without an ISA bridge of: Improve prom_update_property() function powerpc: Add "memory" attribute for mfmsr() powerpc/ftrace: Fix assembly trampoline register usage powerpc/hw_breakpoints: Fix incorrect pointer access powerpc: Put the gpr save/restore functions in their own section ...
2012-07-23Merge branch 'next' of ↵Linus Torvalds38-2168/+153
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull security subsystem updates from James Morris: "Nothing groundbreaking for this kernel, just cleanups and fixes, and a couple of Smack enhancements." * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits) Smack: Maintainer Record Smack: don't show empty rules when /smack/load or /smack/load2 is read Smack: user access check bounds Smack: onlycap limits on CAP_MAC_ADMIN Smack: fix smack_new_inode bogosities ima: audit is compiled only when enabled ima: ima_initialized is set only if successful ima: add policy for pseudo fs ima: remove unused cleanup functions ima: free securityfs violations file ima: use full pathnames in measurement list security: Fix nommu build. samples: seccomp: add .gitignore for untracked executables tpm: check the chip reference before using it TPM: fix memleak when register hardware fails TPM: chip disabled state erronously being reported as error MAINTAINERS: TPM maintainers' contacts update Merge branches 'next-queue' and 'next' into next Remove unused code from MPI library Revert "crypto: GnuPG based MPI lib - additional sources (part 4)" ...
2012-07-23r8169: revert "add byte queue limit support".Francois Romieu1-22/+5
This reverts commit 036dafa28da1e2565a8529de2ae663c37b7a0060. First it appears in bisection, then reverting it solves the usual netdev watchdog problem for different people. I don't have a proper fix yet so get rid of it. Bisected-and-reported-by: Alex Villacís Lasso <[email protected]> Signed-off-by: Francois Romieu <[email protected]> Cc: Josh Boyer <[email protected]> Cc: Hayes Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-07-23Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds33-203/+1347
Pull arm-soc clk changes from Arnd Bergmann: "Clock support is moving to the clk subsystem. These tegra, omap and imx changes are for code that is still platform specific and not (yet) part of that subsystem." Fix up conflicts in arch/arm/mach-{imx/clk-imx51-imx53.c,omap2/Makefile} * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) ARM: imx: clk-imx31: Fix clock id for rnga driver ARM: imx: add missing item to the list of clock event modes ARM: i.MX5x CSPI: Fixed clock name for CSPI ARM: i.MX5x clocks: Fix GPT clocks ARM: i.MX5x clocks: Fix parent for PWM clocks ARM: i.MX5x clocks: Add EPIT support ARM: mx27: Reenable silicon version print ARM: clk-imx27: Fix rtc clock id ARM: tegra: Provide clock for only one PWM controller ARM: tegra: Fix PWM clock programming ARM: OMAP3+: clock33xx: Add AM33XX clock tree data ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file ARM: tegra: dma: rename driver name for clock to "tegra-apbdma" ARM: tegra: Remove second instance of uart clk crypto: add clk_prepare/clk_unprepare ASoC: tegra: add clk_prepare/clk_unprepare staging: nvec: add clk_prepare/clk_unprepare spi/tegra: add clk_prepare/clk_unprepare Input: tegra-kbc - add clk_prepare/clk_unprepare USB: ehci-tegra: add clk_prepare/clk_unprepare ...
2012-07-23Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds46-522/+810
Pull arm-soc power management changes from Arnd Bergmann: "These are various power management related changes, mainly concerning cpuidle on i.MX and OMAP, as well as a the move of the omap smartreflex driver to live in the power subsystem." Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h} * tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits) ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge ARM: OMAP2+: do not allow SmartReflex to be built as a module ARM: OMAP2: Use hwmod to initialize mmc for 2420 ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state ARM: OMAP3: PM: cleanup cam_pwrdm leftovers ARM: OMAP3: PM: call pre/post transition per powerdomain ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux ARM: OMAP3+: PRM: Enable IO wake up ARM: OMAP4: PRM: Add IO Daisychain support ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file ARM: OMAP3: PM: correct enable/disable of daisy io chain ARM: OMAP2+: PRM: fix compile for OMAP4-only build W1: OMAP HDQ1W: use runtime PM ARM: OMAP2+: HDQ1W: use omap_device W1: OMAP HDQ1W: use 32-bit register accesses W1: OMAP HDQ1W: allow driver to be built on all OMAP2+ ...