Eric Lee / smarc-fsl-linux-kernel

05 Jan, 2012

3 commits

  • 7b9dd4713   Merge branch 'restart' into for-linus ... Browse Code »

    Conflicts:
    arch/arm/mach-exynos/cpu.c

    The changes to arch/arm/mach-exynos/cpu.c were moved to
    mach-exynos/common.c.

    Russell King
     
  • f88b8979d   ARM: restart: remove the now empty arch_reset() ... Browse Code »

    Remove the now empty arch_reset() from all the mach/system.h includes,
    and remove its callsite. Remove arm_machine_restart() as this function
    no longer does anything useful.

    For samsung platforms, remove the include of mach/system-reset.h and
    plat/system-reset.h from their respective mach/system.h headers as these
    just define their arch_reset functions. As a result, the s3c2410 and
    plat-samsung system-reset.h files are no longer referenced, so remove
    these files entirely.

    Acked-by: Nicolas Pitre
    Acked-by: H Hartley Sweeten
    Acked-by: Jamie Iles
    Acked-by: Tony Lindgren
    Acked-by: Linus Walleij
    Signed-off-by: Russell King

    Russell King
     
  • 35b47a405   ARM: restart: nomadik: use new restart hook ... Browse Code »

    Hook the Nomadik NHK platform restart code into the new restart hook.

    Signed-off-by: Russell King

    Russell King
     

06 Dec, 2011

1 commit

01 Dec, 2011

1 commit

27 Nov, 2011

1 commit

16 Nov, 2011

1 commit

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
     

27 Oct, 2011

1 commit

  • ca9066628   Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... Browse Code »

    * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
    ARM: 7135/1: ep93xx: bring back missing
    ARM: 7104/1: plat-pxa: break out GPIO driver specifics
    ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
    ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
    ARM: 7101/1: arm/tegra: Replace with
    ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
    ARM: 7083/1: rewrite U300 GPIO to use gpiolib
    ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
    ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
    ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
    ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
    ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
    ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
    ARM: 7057/1: mach-pnx4008: rename GPIO header
    ARM: 7056/1: plat-nomadik: kill off
    ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
    ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
    ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
    ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
    ARM: 7043/1: mach-ixp2000: rename GPIO header
    ...

    Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

    Linus Torvalds
     

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
     

14 Oct, 2011

1 commit

26 Sep, 2011

1 commit

  • 639da5ee3   ARM: add an extra temp register to the low level debugging addruart macro ... Browse Code »

    Some platforms (like OMAP not to name it) are doing rather complicated
    hacks just to determine the base UART address to use. Let's give their
    addruart macro some slack by providing an extra work register which will
    allow for much needed cleanups.

    This is basically a no-op as this commit is only adding the extra argument
    to the macro but no one is using it yet.

    Signed-off-by: nicolas Pitre
    Reviewed-by: Kevin Hilman

    Nicolas Pitre
     

23 Aug, 2011

1 commit

22 Aug, 2011

2 commits

20 Jul, 2011

1 commit

  • aa3831cf9   ARM: Consolidate the clkdev header files ... Browse Code »

    Now most of ARM machines has the alsmot same __clk_get/put() macro

    So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files

    But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config

    Now there are only 3 caese.

    1) define the clk structure with clkdev macro => Need to move clk structure to proper header file

    arch/arm/mach-versatile/include/mach/clkdev.h
    arch/arm/mach-realview/include/mach/clkdev.h
    arch/arm/mach-vexpress/include/mach/clkdev.h
    arch/arm/mach-integrator/include/mach/clkdev.h

    2) export the __clk_get/put function at clock.c

    arch/arm/mach-shmobile/include/mach/clkdev.h

    3) demuxing the clk source
    arch/arm/mach-u300/include/mach/clkdev.h

    Acked-by: Viresh Kumar
    Acked-by: H Hartley Sweeten
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Kyungmin Park

    Kyungmin Park
     

27 May, 2011

1 commit

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
     

26 Nov, 2010

1 commit

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
     

22 Jul, 2010

1 commit

27 May, 2010

1 commit

  • ba327b1e5   ARM: 6145/1: ux500 MTU clockrate correction ... Browse Code »

    This adjusts the clockrate for the MTU timer. On the different
    UX500 variants this rate is different. The platform can also have
    been set up at hardware initialization, bootloader or early init
    for different clock speeds. To have the clock framework available
    early so the timers can use them, the clock initialization for
    Nomadik and ux500 is moved to IRQ init time. A custom per-clock
    callback is added to handle special cases like this.

    This solves a user-visible bug: without this patch the current
    UX500 platforms will not be synchronized to wall-clock time and
    the platform will drift in time.

    Acked-by: Rabin Vincent
    Signed-off-by: Linus Walleij
    Signed-off-by: Russell King

    Linus Walleij
     

21 May, 2010

1 commit

07 May, 2010

2 commits

  • af7dc2281   ARM: 6104/1: nomadik-gpio: use clk API ... Browse Code »

    Add clocks with appropriate names in platforms that use it, and use the
    clk API in nomadik-gpio.

    Acked-by: Alessandro Rubini
    Acked-by: Linus Walleij
    Acked-by: Srinidhi Kasagar
    Signed-off-by: Rabin Vincent
    Signed-off-by: Russell King

    Rabin Vincent
     
  • dc6048c7f   ARM: 6103/1: nomadik: define clocks statically ... Browse Code »

    Add a table for clocks to be defined statically, so that new clocks can
    be added without having to call nmdk_clk_create() for each of them.
    Remove the now unused nmdk_clk_create() function.

    Acked-by: Alessandro Rubini
    Acked-by: Linus Walleij
    Signed-off-by: Rabin Vincent
    Signed-off-by: Russell King

    Rabin Vincent
     

20 Mar, 2010

2 commits

  • 3e3c62ca5   ARM: 5972/1: nomadik-gpio: convert to platform driver ... Browse Code »

    On the U8500 platform there are four GPIO blocks, each with a 4K address
    space, including the peripheral identification. However, each of these
    blocks have a varying number of banks, each of which have 32 GPIOs and
    an interrupt line.

    The current nomadik-gpio driver implementation can handle each of these
    sub-banks easily with one instance each, but cannot as-is be hooked up
    to them because it is an AMBA driver and it expects to see a peripheral
    with the appropriate peripheral ids but having only one bank and only
    one interrupt.

    Solve this by converting the driver to a platform driver.

    Acked-by: Alessandro Rubini
    Acked-by: Linus Walleij
    Signed-off-by: Rabin Vincent
    Signed-off-by: Russell King

    Rabin Vincent
     
  • 3a5e854e0   ARM: 5969/1: nomadik: move gpio to plat-nomadik ... Browse Code »

    Move the Nomadik GPIO driver to plat-nomadik so that it can also be used
    on the Ux500 platform.

    The mach-nomadik include/mach/gpio.h is replaced by one that includes
    the one now in plat-nomadik, so that code doesn't need to include the
    one in plat specifically, and can instead use as usual.

    Acked-by: Alessandro Rubini
    Acked-by: Linus Walleij
    Signed-off-by: Rabin Vincent
    Signed-off-by: Russell King

    Rabin Vincent
     

08 Mar, 2010

1 commit

02 Mar, 2010

1 commit

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

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
    ARM: Eliminate decompressor -Dstatic= PIC hack
    ARM: 5958/1: ARM: U300: fix inverted clk round rate
    ARM: 5956/1: misplaced parentheses
    ARM: 5955/1: ep93xx: move timer defines into core.c and document
    ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
    ARM: 5953/1: ep93xx: fix broken build of clock.c
    ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
    ARM: 5949/1: NUC900 add gpio virtual memory map
    ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
    ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
    ARM: make_coherent(): fix problems with highpte, part 2
    MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
    ARM: 5945/1: ep93xx: include correct irq.h in core.c
    ARM: 5933/1: amba-pl011: support hardware flow control
    ARM: 5930/1: Add PKMAP area description to memory.txt.
    ARM: 5929/1: Add checks to detect overlap of memory regions.
    ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
    ARM: 5927/1: Make delimiters of DMA area globally visibly.
    ARM: 5926/1: Add "Virtual kernel memory..." printout.
    ARM: 5920/1: OMAP4: Enable L2 Cache
    ...

    Fix up trivial conflict in arch/arm/mach-mx25/clock.c

    Linus Torvalds
     

26 Feb, 2010

1 commit

16 Feb, 2010

1 commit

13 Feb, 2010

1 commit

  • 4e6d488af   ARM: 5910/1: ARM: Add tmp register for addruart and loadsp ... Browse Code »

    Otherwise more complicated uart configuration won't be possible.
    We can use r1 for tmp register for both head.S and debug.S.

    NOTE: This patch depends on another patch to add the the tmp register
    into all debug-macro.S files. That can be done with:

    $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/"
    arch/arm/*/include/*/debug-macro.S

    Signed-off-by: Tony Lindgren
    Signed-off-by: Russell King

    Tony Lindgren
     

09 Feb, 2010

1 commit

  • 3ad2f3fbb   tree-wide: Assorted spelling fixes ... Browse Code »

    In particular, several occurances of funny versions of 'success',
    'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
    'beginning', 'desirable', 'separate' and 'necessary' are fixed.

    Signed-off-by: Daniel Mack
    Cc: Joe Perches
    Cc: Junio C Hamano
    Signed-off-by: Jiri Kosina

    Daniel Mack
     

19 Dec, 2009

1 commit

17 Dec, 2009

1 commit

  • 60d9aa758   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (90 commits)
    jffs2: Fix long-standing bug with symlink garbage collection.
    mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
    mtd: cfi_cmdset_0002, fix lock imbalance
    Revert "mtd: move mxcnd_remove to .exit.text"
    mtd: m25p80: add support for Macronix MX25L4005A
    kmsg_dump: fix build for CONFIG_PRINTK=n
    mtd: nandsim: add support for 4KiB pages
    mtd: mtdoops: refactor as a kmsg_dumper
    mtd: mtdoops: make record size configurable
    mtd: mtdoops: limit the maximum mtd partition size
    mtd: mtdoops: keep track of used/unused pages in an array
    mtd: mtdoops: several minor cleanups
    core: Add kernel message dumper to call on oopses and panics
    mtd: add ARM pismo support
    mtd: pxa3xx_nand: Fix PIO data transfer
    mtd: nand: fix multi-chip suspend problem
    mtd: add support for switching old SST chips into QRY mode
    mtd: fix M29W800D dev_id and uaddr
    mtd: don't use PF_MEMALLOC
    mtd: Add bad block table overrides to Davinci NAND driver
    ...

    Fixed up conflicts (mostly trivial) in
    drivers/mtd/devices/m25p80.c
    drivers/mtd/maps/pcmciamtd.c
    drivers/mtd/nand/pxa3xx_nand.c
    kernel/printk.c

    Linus Torvalds
     

28 Nov, 2009

1 commit

  • 59b559d7a   ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization ... Browse Code »

    Introduce the plat-nomadik folder for ST-Ericsson
    machines including the existing nomadik 8815 architecture.
    This also moves the existing MTU (MultiTimerUnit)
    of nomadik 8815 to the proposed plat-nomadik and adds
    HAS_MTU. The patch has been re-based to 2.6.32-rc6

    Signed-off-by: srinidhi kasagar
    Acked-by: Alessandro Rubini
    Signed-off-by: Russell King

    Srinidhi Kasagar
     

25 Sep, 2009

1 commit

20 Sep, 2009

2 commits