Doug / smarc-fsl-linux-kernel

29 Oct, 2011

1 commit

  • 1fdb24e96   Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/… ... Browse Code »

    …git-cur/linux-2.6-arm

    * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
    ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
    ARM: gic, local timers: use the request_percpu_irq() interface
    ARM: gic: consolidate PPI handling
    ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
    ARM: mach-s5p64x0: remove mach/memory.h
    ARM: mach-s3c64xx: remove mach/memory.h
    ARM: plat-mxc: remove mach/memory.h
    ARM: mach-prima2: remove mach/memory.h
    ARM: mach-zynq: remove mach/memory.h
    ARM: mach-bcmring: remove mach/memory.h
    ARM: mach-davinci: remove mach/memory.h
    ARM: mach-pxa: remove mach/memory.h
    ARM: mach-ixp4xx: remove mach/memory.h
    ARM: mach-h720x: remove mach/memory.h
    ARM: mach-vt8500: remove mach/memory.h
    ARM: mach-s5pc100: remove mach/memory.h
    ARM: mach-tegra: remove mach/memory.h
    ARM: plat-tcc: remove mach/memory.h
    ARM: mach-mmp: remove mach/memory.h
    ARM: mach-cns3xxx: remove mach/memory.h
    ...

    Fix up mostly pretty trivial conflicts in:
    - arch/arm/Kconfig
    - arch/arm/include/asm/localtimer.h
    - arch/arm/kernel/Makefile
    - arch/arm/mach-shmobile/board-ap4evb.c
    - arch/arm/mach-u300/core.c
    - arch/arm/mm/dma-mapping.c
    - arch/arm/mm/proc-v7.S
    - arch/arm/plat-omap/Kconfig
    largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
    CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
    addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

    Linus Torvalds
     

25 Oct, 2011

1 commit

17 Oct, 2011

1 commit

  • 40c6d8aee   ARM: 7022/1: allow to detect conflicting zreladdrs ... Browse Code »

    Boards used to specify zreladdr in their Makefile.boot with
    zreladdr-y := x, so conflicting zreladdrs were silently overwritten.
    This patch changes this to zreladdr-y += x, so that we end
    up with multiple words in zreladdr in such a case. We can
    detect this later and complain if necessary.

    Signed-off-by: Sascha Hauer
    Signed-off-by: Russell King

    Sascha Hauer
     

26 Sep, 2011

2 commits

14 Sep, 2011

1 commit

22 Aug, 2011

1 commit

30 Jul, 2011

1 commit

  • f85f19de9   Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... Browse Code »

    * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI: remove printks about disabled bridge windows
    PCI: fold pci_calc_resource_flags() into decode_bar()
    PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
    PCI: correct pcie_set_readrq write size
    PCI: pciehp: change wait time for valid configuration access
    x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
    PCI: ARI is a PCIe v2 feature
    x86/PCI: quirks: Use pci_dev->revision
    PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
    PCI hotplug: cpqphp: use pci_dev->vendor
    PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
    x86/PCI: config space accessor functions should not ignore the segment argument
    PCI: Assign values to 'pci_obff_signal_type' enumeration constants
    x86/PCI: reduce severity of host bridge window conflict warnings
    PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI
    PCI: PCIe AER: add aer_recover_queue
    x86/PCI: select direct access mode for mmconfig option
    PCI hotplug: Rename is_ejectable which also exists in dock.c

    Linus Torvalds
     

27 Jul, 2011

1 commit

  • 3960ef326   Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/arm/linux-arm-soc

    * 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: Consolidate the clkdev header files
    ARM: set vga memory base at run-time
    ARM: convert PCI defines to variables
    ARM: pci: make pcibios_assign_all_busses use pci_has_flag
    ARM: remove unnecessary mach/hardware.h includes
    pci: move microblaze and powerpc pci flag functions into asm-generic
    powerpc: rename ppc_pci_*_flags to pci_*_flags

    Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

    Linus Torvalds
     

22 Jul, 2011

1 commit

  • d5341942d   PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. ... Browse Code »

    Aside of the usual motivation for constification, this function has a
    history of being abused a hook for interrupt and other fixups so I turned
    this function const ages ago in the MIPS code but it should be done
    treewide.

    Due to function pointer passing in varous places a few other functions
    had to be constified as well.

    Signed-off-by: Ralf Baechle
    To: Anton Vorontsov
    To: Chris Metcalf
    To: Colin Cross
    Acked-by: "David S. Miller"
    To: Eric Miao
    To: Erik Gilling
    Acked-by: Guan Xuetao
    To: "H. Peter Anvin"
    To: Imre Kaloz
    To: Ingo Molnar
    To: Ivan Kokshaysky
    To: Jesse Barnes
    To: Krzysztof Halasa
    To: Lennert Buytenhek
    To: Matt Turner
    To: Nicolas Pitre
    To: Olof Johansson
    Acked-by: Paul Mundt
    To: Richard Henderson
    To: Russell King
    To: Thomas Gleixner
    Cc: Andrew Morton
    Cc: linux-alpha@vger.kernel.org
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Cc: linux-pci@vger.kernel.org
    Cc: linux-sh@vger.kernel.org
    Cc: linux-tegra@vger.kernel.org
    Cc: sparclinux@vger.kernel.org
    Cc: x86@kernel.org
    Signed-off-by: Jesse Barnes

    Ralf Baechle
     

13 Jul, 2011

3 commits

  • cc22b4c18   ARM: set vga memory base at run-time ... Browse Code »

    Convert the incorrectly named PCIMEM_BASE to a variable called vga_base.
    This removes the dependency on mach/hardware.h.

    Signed-off-by: Rob Herring
    Acked-by: Nicolas Pitre
    Reviewed-by: Arnd Bergmann

    Rob Herring
     
  • c9d95fbe5   ARM: convert PCI defines to variables ... Browse Code »

    Convert PCIBIOS_MIN_IO and PCIBIOS_MIN_MEM to variables to allow
    multi-platform builds. This also removes the requirement for a platform to
    have a mach/hardware.h.

    The default values for i/o and mem are 0x1000 and 0x01000000, respectively.
    Per Arnd Bergmann, other values are likely to be incorrect, but this commit
    does not try to address that issue.

    Signed-off-by: Rob Herring
    Acked-by: Nicolas Pitre
    Reviewed-by: Arnd Bergmann

    Rob Herring
     
  • dc8d966bc   ARM: pci: make pcibios_assign_all_busses use pci_has_flag ... Browse Code »

    Convert pcibios_assign_all_busses from a define to inline so platforms can
    control this setting.

    Signed-off-by: Rob Herring
    Acked-by: Nicolas Pitre
    Reviewed-by: Arnd Bergmann

    Rob Herring
     

17 Jun, 2011

1 commit

17 May, 2011

10 commits

29 Mar, 2011

4 commits

18 Mar, 2011

1 commit

  • 411f5c7a5   Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
    davinci: DM644x EVM: register MUSB device earlier
    davinci: add spi devices on tnetv107x evm
    davinci: add ssp config for tnetv107x evm board
    davinci: add tnetv107x ssp platform device
    spi: add ti-ssp spi master driver
    mfd: add driver for sequencer serial port
    ARM: EXYNOS4: Implement Clock gating for System MMU
    ARM: EXYNOS4: Enhancement of System MMU driver
    ARM: EXYNOS4: Add support for gpio interrupts
    ARM: S5P: Add function to register gpio interrupt bank data
    ARM: S5P: Cleanup S5P gpio interrupt code
    ARM: EXYNOS4: Add missing GPYx banks
    ARM: S3C64XX: Fix section mismatch from cpufreq init
    ARM: EXYNOS4: Add keypad device to the SMDKV310
    ARM: EXYNOS4: Update clocks for keypad
    ARM: EXYNOS4: Update keypad base address
    ARM: EXYNOS4: Add keypad device helpers
    ARM: EXYNOS4: Add support for SATA on ARMLEX4210
    plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
    mach-u300: define a dummy filter function for coh901318
    ...

    Fix up various conflicts in
    - arch/arm/mach-exynos4/cpufreq.c
    - arch/arm/mach-mxs/gpio.c
    - drivers/net/Kconfig
    - drivers/tty/serial/Kconfig
    - drivers/tty/serial/Makefile
    - drivers/usb/gadget/fsl_mxc_udc.c
    - drivers/video/Kconfig

    Linus Torvalds
     

17 Mar, 2011

1 commit

04 Mar, 2011

3 commits

  • 6920aaf08   ARM: Dove: Remove PXA compatibility IRQ defines. ... Browse Code »

    These are not currently used anywhere, but when the relevant
    peripherals are enabled on the Dove port, the IRQ numbers should be
    passed into the drivers via platform device resources rather than
    having the drivers get them from platform headers directly.

    Signed-off-by: Lennert Buytenhek
    Acked-by: Saeed Bishara
    Signed-off-by: Nicolas Pitre

    Lennert Buytenhek
     
  • 9eac6d0a4   ARM: Remove dependency of plat-orion GPIO code on mach directory includes. ... Browse Code »

    This patch makes the various mach dirs that use the plat-orion GPIO
    code pass in GPIO-related platform info (GPIO controller base address,
    secondary base IRQ number, etc) explicitly, instead of having
    plat-orion get those values by including a mach dir include file --
    the latter mechanism is problematic if you want to support multiple
    ARM platforms in the same kernel image.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Nicolas Pitre

    Lennert Buytenhek
     
  • 4ee1f6b57   ARM: Remove dependency of plat-orion time code on mach directory includes. ... Browse Code »

    This patch makes the various mach dirs that use the plat-orion time
    code pass in timer and bridge addresses explicitly, instead of having
    plat-orion get those values by including a mach dir include file --
    the latter mechanism is problematic if you want to support multiple
    ARM platforms in the same kernel image.

    Signed-off-by: Lennert Buytenhek
    Signed-off-by: Nicolas Pitre

    Lennert Buytenhek
     

18 Feb, 2011

1 commit

  • f4117ac9e   ARM: P2V: separate PHYS_OFFSET from platform definitions ... Browse Code »

    This uncouple PHYS_OFFSET from the platform definitions, thereby
    facilitating run-time computation of the physical memory offset.

    Acked-by: Nicolas Pitre
    Acked-by: Viresh Kumar
    Acked-by: H Hartley Sweeten
    Acked-by: Magnus Damm
    Acked-by: Tony Lindgren
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Wan ZongShun
    Acked-by: Kukjin Kim
    Acked-by: Eric Miao
    Acked-by: Jiandong Zheng
    Signed-off-by: Russell King

    Russell King
     

03 Feb, 2011

1 commit

14 Jan, 2011

1 commit

09 Jan, 2011

1 commit

15 Dec, 2010

2 commits

29 Nov, 2010

1 commit