Doug / smarc-fsl-linux-kernel

24 May, 2011

1 commit

  • 234b6cedd   clocksource: convert ARM 32-bit up counting clocksources ... Browse Code »

    Convert ixp4xx, lpc32xx, mxc, netx, pxa, sa1100, tcc8k, tegra and u300
    to use the generic mmio clocksource recently introduced.

    Cc: Imre Kaloz
    Cc: Krzysztof Halasa
    Acked-by: Eric Miao
    Acked-by: "Hans J. Koch"
    Acked-by: Colin Cross
    Cc: Erik Gilling
    Cc: Olof Johansson
    Acked-by: Linus Walleij
    Acked-by: Sascha Hauer
    Signed-off-by: Russell King

    Russell King
     

31 Mar, 2011

1 commit

29 Mar, 2011

2 commits

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
     

16 Jan, 2011

1 commit

  • 16c102036   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: (161 commits)
    ARM: pxa: fix building issue of missing physmap.h
    ARM: mmp: PXA910 drive strength FAST using wrong value
    ARM: mmp: MMP2 drive strength FAST using wrong value
    ARM: pxa: fix recursive calls in pxa_low_gpio_chip
    AT91: Support for gsia18s board
    AT91: Acme Systems FOX Board G20 board files
    AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
    ARM: pxa: fix suspend/resume array index miscalculation
    ARM: pxa: use cpu_has_ipr() consistently in irq.c
    ARM: pxa: remove unused variable in clock-pxa3xx.c
    ARM: pxa: fix warning in zeus.c
    ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
    ARM mxs: clkdev related compile fixes
    ARM i.MX mx31_3ds: Fix MC13783 regulator names
    ARM: plat-stmp3xxx: irq_data conversion.
    ARM: plat-spear: irq_data conversion.
    ARM: plat-orion: irq_data conversion.
    ARM: plat-omap: irq_data conversion.
    ARM: plat-nomadik: irq_data conversion.
    ARM: plat-mxc: irq_data conversion.
    ...

    Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
    Buytenhek's irq_data conversion clashing with some omap irq updates)

    Linus Torvalds
     

14 Jan, 2011

2 commits

  • 008d23e48   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
    Documentation/trace/events.txt: Remove obsolete sched_signal_send.
    writeback: fix global_dirty_limits comment runtime -> real-time
    ppc: fix comment typo singal -> signal
    drivers: fix comment typo diable -> disable.
    m68k: fix comment typo diable -> disable.
    wireless: comment typo fix diable -> disable.
    media: comment typo fix diable -> disable.
    remove doc for obsolete dynamic-printk kernel-parameter
    remove extraneous 'is' from Documentation/iostats.txt
    Fix spelling milisec -> ms in snd_ps3 module parameter description
    Fix spelling mistakes in comments
    Revert conflicting V4L changes
    i7core_edac: fix typos in comments
    mm/rmap.c: fix comment
    sound, ca0106: Fix assignment to 'channel'.
    hrtimer: fix a typo in comment
    init/Kconfig: fix typo
    anon_inodes: fix wrong function name in comment
    fix comment typos concerning "consistent"
    poll: fix a typo in comment
    ...

    Fix up trivial conflicts in:
    - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
    - fs/ext4/ext4.h

    Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

    Linus Torvalds
     
  • 563853811   ARM: lpc32xx: irq_data conversion. ... Browse Code »

    Signed-off-by: Lennert Buytenhek

    Lennert Buytenhek
     

07 Jan, 2011

1 commit

23 Dec, 2010

1 commit

26 Nov, 2010

1 commit

16 Nov, 2010

1 commit

  • 2f55ac072   suspend: constify platform_suspend_ops ... Browse Code »

    While at it, fix two checkpatch errors.
    Several non-const struct instances constified by this patch were added after
    the introduction of platform_suspend_ops in checkpatch.pl's list of "should
    be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).

    Patch against mainline.
    Inspired by hunks of the grsecurity patch, updated for newer kernels.

    Signed-off-by: Lionel Debroux
    Acked-by: Ingo Molnar
    Signed-off-by: Jiri Kosina

    Lionel Debroux
     

22 Oct, 2010

1 commit

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

    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
    arm: remove machine_desc.io_pg_offst and .phys_io
    arm: use addruart macro to establish debug mappings
    arm: return both physical and virtual addresses from addruart
    arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
    ARM: make struct machine_desc definition coherent with its comment
    eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
    cpuimx27: fix compile when ULPI is selected
    mach-pcm037_eet: fix compile errors
    Fixing ethernet driver compilation error for i.MX31 ADS board
    cpuimx51: update board support
    mx5: add cpuimx51sd module and its baseboard
    iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
    imx-esdhc: update devices registration
    mx51: add resources for SD/MMC on i.MX51
    iomux-mx51: fix SD1 and SD2's iomux configuration
    clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
    clock-mx51: factorize clk_set_parent and clk_get_rate
    eukrea_mbimxsd: add support for DVI displays
    cpuimx25 & cpuimx35: fix OTG port registration in host mode
    i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
    ...

    Linus Torvalds
     

20 Oct, 2010

2 commits

  • 6451d7783   arm: remove machine_desc.io_pg_offst and .phys_io ... Browse Code »

    Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     
  • 0ea129300   arm: return both physical and virtual addresses from addruart ... Browse Code »

    Rather than checking the MMU status in every instance of addruart, do it
    once in kernel/debug.S, and change the existing addruart macros to
    return both physical and virtual addresses. The main debug code can then
    select the appropriate address to use.

    This will also allow us to retreive the address of a uart for the MMU
    state that we're not current in.

    Updated with fixes for OMAP from Jason Wang
    and Tony Lindgren , and fix for versatile express from
    Lorenzo Pieralisi .

    Signed-off-by: Jeremy Kerr
    Signed-off-by: Lorenzo Pieralisi
    Signed-off-by: Jason Wang
    Signed-off-by: Tony Lindgren
    Tested-by: Kevin Hilman

    Jeremy Kerr
     

13 Oct, 2010

1 commit

  • bde435a9c   spi/pl022: Add spi->mode support to AMBA SPI driver ... Browse Code »

    This patch adds spi->mode support for the AMBA pl022 driver and
    allows spidev to correctly alter SPI modes. Unused fields used in
    the pl022 header file for the pl022_config_chip have been removed.

    The ab8500 client driver selects the data transfer size instead
    of the platform data.

    For platforms that use the amba pl022 driver, the unused fields
    in the controller data structure have been removed and the .mode
    field in the SPI board info structure is used instead.

    Signed-off-by: Kevin Wells
    Tested-by: Linus Walleij
    Acked-by: Linus Walleij
    Signed-off-by: Grant Likely

    Kevin Wells
     

27 Jul, 2010

9 commits