07 Oct, 2011

1 commit

  • 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
     

28 May, 2011

1 commit

  • * git://git.infradead.org/mtd-2.6: (97 commits)
    mtd: kill CONFIG_MTD_PARTITIONS
    mtd: remove add_mtd_partitions, add_mtd_device and friends
    mtd: convert remaining users to mtd_device_register()
    mtd: samsung onenand: convert to mtd_device_register()
    mtd: omap2 onenand: convert to mtd_device_register()
    mtd: txx9ndfmc: convert to mtd_device_register()
    mtd: tmio_nand: convert to mtd_device_register()
    mtd: socrates_nand: convert to mtd_device_register()
    mtd: sharpsl: convert to mtd_device_register()
    mtd: s3c2410 nand: convert to mtd_device_register()
    mtd: ppchameleonevb: convert to mtd_device_register()
    mtd: orion_nand: convert to mtd_device_register()
    mtd: omap2: convert to mtd_device_register()
    mtd: nomadik_nand: convert to mtd_device_register()
    mtd: ndfc: convert to mtd_device_register()
    mtd: mxc_nand: convert to mtd_device_register()
    mtd: mpc5121_nfc: convert to mtd_device_register()
    mtd: jz4740_nand: convert to mtd_device_register()
    mtd: h1910: convert to mtd_device_register()
    mtd: fsmc_nand: convert to mtd_device_register()
    ...

    Fixed up trivial conflicts in
    - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
    - drivers/mtd/maps/physmap.c: addition of afs partition probe type
    clashing with removal of CONFIG_MTD_PARTITIONS

    Linus Torvalds
     

25 May, 2011

1 commit


07 May, 2011

1 commit

  • To be able to relocate the .bss section at run time independently from
    the rest of the code, we must make sure that no GOTOFF relocations are
    used with .bss symbols. This usually means that no global variables can
    be marked static unless they're also const.

    Let's remove the static qualifier from current offenders, or turn them
    into const variables when possible. Next commit will ensure the build
    fails if one of those is reintroduced due to otherwise enforced coding
    standards for the kernel.

    Signed-off-by: Nicolas Pitre
    Tested-by: Tony Lindgren

    Nicolas Pitre
     

29 Mar, 2011

3 commits


17 Mar, 2011

1 commit


18 Feb, 2011

1 commit

  • 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
     

25 Jan, 2011

1 commit


16 Jan, 2011

1 commit

  • * '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

1 commit


02 Nov, 2010

1 commit

  • "gadget", "through", "command", "maintain", "maintain", "controller", "address",
    "between", "initiali[zs]e", "instead", "function", "select", "already",
    "equal", "access", "management", "hierarchy", "registration", "interest",
    "relative", "memory", "offset", "already",

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Jiri Kosina

    Uwe Kleine-König
     

20 Oct, 2010

2 commits

  • 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
     
  • 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 May, 2010

3 commits


02 Mar, 2010

1 commit

  • * '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


19 Feb, 2010

1 commit


16 Feb, 2010

1 commit


13 Feb, 2010

1 commit

  • 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
     

18 Jan, 2010

1 commit

  • Because of the include of the decompress_inflate.c file from
    boot/compress/misc.c, there are different flush() defines:

    In file included from arch/arm/boot/compressed/misc.c:249:
    arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0

    Fix this by removing the define of flush() in misc.c for
    CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h,
    and that is being included unconditionally.

    Also use a static inline function instead of define
    for mach-mxc and mach-gemini to avoid similar bug
    for those platforms.

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

    Tony Lindgren
     

28 May, 2009

1 commit


30 Mar, 2009

1 commit


26 Mar, 2009

3 commits