Eric Lee / smarc-fsl-linux-kernel

22 Jul, 2011

4 commits

  • 1f922d077   Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb ... Browse Code »

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    sparc,kgdbts: fix compile regression with kgdb test suite

    Linus Torvalds
     
  • 33d8881af   sparc,kgdbts: fix compile regression with kgdb test suite ... Browse Code »

    Commit 63ab25ebbc (kgdbts: unify/generalize gdb breakpoint adjustment)
    introduced a compile regression on sparc.

    kgdbts.c: In function 'check_and_rewind_pc':
    kgdbts.c:307: error: implicit declaration of function 'instruction_pointer_set'

    Simply add the correct macro definition for instruction pointer on the
    Sparc architecture.

    Signed-off-by: Jason Wessel
    Acked-by: Mike Frysinger
    Acked-by: David S. Miller

    Jason Wessel
     
  • a536877e7   x86: Make Dell Latitude E6420 use reboot=pci ... Browse Code »

    Yet another variant of the Dell Latitude series which requires
    reboot=pci.

    From the E5420 bug report by Daniel J Blueman:

    > The E6420 is affected also (same platform, different casing and
    > features), which provides an external confirmation of the issue; I can
    > submit a patch for that later or include it if you prefer:
    > http://linux.koolsolutions.com/2009/08/04/howto-fix-linux-hangfreeze-during-reboots-and-restarts/

    Reported-by: Daniel J Blueman
    Signed-off-by: H. Peter Anvin
    Cc:

    H. Peter Anvin
     
  • b7798d28e   x86: Make Dell Latitude E5420 use reboot=pci ... Browse Code »

    Rebooting on the Dell E5420 often hangs with the keyboard or ACPI
    methods, but is reliable via the PCI method.

    [ hpa: this was deferred because we believed for a long time that the
    recent reshuffling of the boot priorities in commit
    660e34cebf0a11d54f2d5dd8838607452355f321 fixed this platform.
    Unfortunately that turned out to be incorrect. ]

    Signed-off-by: Daniel J Blueman
    Link: http://lkml.kernel.org/r/1305248699-2347-1-git-send-email-daniel.blueman@gmail.com
    Signed-off-by: H. Peter Anvin
    Cc:

    Daniel J Blueman
     

21 Jul, 2011

1 commit

20 Jul, 2011

1 commit

19 Jul, 2011

2 commits

18 Jul, 2011

3 commits

17 Jul, 2011

1 commit

  • 1ef48593b   sparc: sun4m SMP: fix wrong shift instruction in IPI handler ... Browse Code »

    This shift instruction appears to be shifting in the wrong direction.
    Without this change, my SparcStation-20MP hangs just after bringing up
    the second CPU:

    Entering SMP Mode...
    Starting CPU 2 at f02b4e90
    Brought up 2 CPUs
    Total of 2 processors activated (99.52 BogoMIPS).
    *** stuck ***

    Signed-off-by: Will Simoneau
    Signed-off-by: David S. Miller

    Will Simoneau
     

16 Jul, 2011

4 commits

  • d670ac019   ARM: SAMSUNG: DMA Cleanup as per sparse ... Browse Code »
    43

    Function declaration differs between file: dma.c and file:dma.h
    and SPARSE (Documentation/sparse.txt) gives error messages

    All dma channels are members of 'enum dma_ch' and not 'unsigned int'
    Please have a look at channel definitions in:
    arch/arm/mach-s3c64xx/include/mach/dma.h
    arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h
    arch/arm/mach-s3c2410/include/mach/dma.h
    So all arguments should be of type 'enum dma_ch'

    Signed-off-by: Sangwook Lee
    Signed-off-by: Kukjin Kim

    Sangwook Lee
     
  • 691abd0ab   ARM: SAMSUNG: Check NULL return from irq_alloc_generic_chip ... Browse Code »

    Signed-off-by: Todd Poynor
    Signed-off-by: Kukjin Kim

    Todd Poynor
     
  • 900b170af   ARM: fix regression in IXP4xx clocksource ... Browse Code »

    Commit 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868

    clocksource: convert ARM 32-bit up counting clocksources

    broke the build for ixp4xx and made big endian operation impossible.
    This commit restores the original behaviour.

    Signed-off-by: Richard Cochran
    Signed-off-by: Krzysztof Hałasa
    [ Thomas says that we might want to have generic BE accessor functions
    to the MMIO clock source, but that hasn't happened yet, so in the
    meantime this seems to be the short-term fix for the particular
    problem - Linus ]
    Signed-off-by: Linus Torvalds

    Richard Cochran
     
  • 84652e834   PM / MIPS: Convert i8259.c to using syscore_ops ... Browse Code »

    The code in arch/mips/kernel/i8259.c still hasn't been converted to
    using struct syscore_ops instead of a sysdev for resume and shutdown.
    As a result, this code doesn't build any more after suspend, resume
    and shutdown callbacks have been removed from struct sysdev_class.
    Fix this problem by converting i8259.c to using syscore_ops.

    Reported-and-tested-by: Roland Vossen
    Signed-off-by: Rafael J. Wysocki
    Acked-by: Ralf Baechle

    Rafael J. Wysocki
     

13 Jul, 2011

3 commits

12 Jul, 2011

4 commits

  • f299bb952   arm: davinci: Fix low level gpio irq handlers' argument ... Browse Code »

    Commit 7416401 ("arm: davinci: Fix fallout from generic irq chip
    conversion") introduced a bug, causing low level interrupt handlers to
    get a bogus irq number as an argument. The gpio irq handler falsely
    assumes that the handler data is the irq base number and that is no
    longer true.

    Set the irq handler data to be a pointer to the corresponding gpio
    controller. The chained irq handler can then use it to extract both the
    irq base number and the gpio registers structure.

    Signed-off-by: Ido Yariv
    CC: Thomas Gleixner
    [nsekhar@ti.com: renamed "ctl" to "d", simplified indexing logic for chips and
    took care of odd bank handling in irq handler]
    Signed-off-by: Sekhar Nori

    Ido Yariv
     
  • 770e1ac5f   powerpc/mm: Fix memory_block_size_bytes() for non-pseries ... Browse Code »

    Just compiling pseries in the kernel causes it to override
    memory_block_size_bytes() regardless of what is the runtime
    platform.

    This cleans up the implementation of that function, fixing
    a bug or two while at it, so that it's harmless (and potentially
    useful) for other platforms. Without this, bugs in that code
    would trigger a WARN_ON() in drivers/base/memory.c when
    booting some different platforms.

    If/when we have another platform supporting memory hotplug we
    might want to either move that out to a generic place or
    make it a ppc_md. callback.

    Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • a63fdc515   mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header ... Browse Code »

    The macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c
    files, and I need it in a third one to fix a powerpc bug, so let's
    first move it into a header

    Signed-off-by: Benjamin Herrenschmidt
    Acked-by: Ingo Molnar

    Benjamin Herrenschmidt
     
  • 24109afd1   Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes Browse Code »
    Arnd Bergmann
     

11 Jul, 2011

5 commits

  • 5da0ef9a8   x86: Disable AMD_NUMA for 32bit for now ... Browse Code »

    Commit 2706a0bf7b ("x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit
    too") enabled AMD NUMA for 32bit too. Unfortunately, SPARSEMEM
    on 32bit had rather coarse (512MiB) addr->node mapping
    granularity due to lack of space in page->flags. This led to
    boot failure on certain AMD NUMA machines which had 128MiB
    alignment on nodes.

    Patches to properly detect this condition and reject NUMA
    configuration are posted[1] but deemed too pervasive for merge
    at this point (-rc6). Disable AMD NUMA for 32bit for now and
    re-enable once the detection logic is merged.

    [1] http://thread.gmane.org/gmane.linux.kernel/1161279/focus=1162583

    Reported-by: Hans Rosenfeld
    Signed-off-by: Tejun Heo
    Cc: Conny Seidel
    Link: http://lkml.kernel.org/r/20110711083432.GC943@htj.dyndns.org
    Signed-off-by: Ingo Molnar

    Tejun Heo
     
  • 9c0de4947   ARM: pxa/raumfeld: fix device name for codec ak4104 ... Browse Code »

    In commit f0fba2ad (ASoC: multi-component - ASoC Multi-Component
    Support), the name of the ak4104 codec driver was changed without
    amending the platform code which uses it as well.

    Signed-off-by: Daniel Mack
    Signed-off-by: Eric Miao

    Daniel Mack
     
  • a74fe1194   ARM: pxa/raumfeld: display initialisation fixes ... Browse Code »

    The display requires some milliseconds between GPIO_TFT_VA_EN
    and GPIO_DISPLAY_ENABLE. Reorder initialisation to comply with
    the display spec.

    Also tune timings for better compliance with the spec.

    Signed-off-by: Sven Neumann
    Acked-by: Daniel Mack
    Signed-off-by: Eric Miao

    Sven Neumann
     
  • 8c568df9d   ARM: pxa/raumfeld: adapt to upcoming hardware change ... Browse Code »

    The backlight control is going to change back to PWM in the
    upcoming Raumfeld Controller hardware revision.

    Signed-off-by: Sven Neumann
    Acked-by: Daniel Mack
    Signed-off-by: Eric Miao

    Sven Neumann
     
  • a065685d2   ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace ... Browse Code »

    The PXA platform code has a static inline helper called
    gpio_to_chip which clashes with the gpiolib namespace if we
    try to expose the function with the same name from gpiolib,
    and it's still confusing even if we don't do that. So rename
    it to gpio_to_pxachip().

    Reported-by: H Hartley Sweeten
    Cc: Eric Miao
    Signed-off-by: Linus Walleij
    Signed-off-by: Eric Miao

    Linus Walleij
     

10 Jul, 2011

1 commit

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

    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
    ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
    ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
    ARM: 6980/1: mmci: use StartBitErr to detect bad connections
    ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
    ARM: move memory layout sanity checking before meminfo initialization
    ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
    ARM: 6989/1: perf: do not start the PMU when no events are present
    ARM: dmabounce: fix map_single() error return value

    Linus Torvalds
     

09 Jul, 2011

2 commits

  • f1a04dbd1   Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/kgene/linux-samsung

    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: S3C2440: fix section mismatch on mini2440
    ARM: S3C24XX: drop return codes in void function of dma.c
    ARM: S3C24XX: don't use uninitialized variable in dma.c
    ARM: EXYNOS4: Set appropriate I2C device variant
    ARM: S5PC100: Fix for compilation error
    spi/s3c64xx: Bug fix for SPI with different FIFO level
    ARM: SAMSUNG: Add tx_st_done variable
    ARM: EXYNOS4: Address a section mismatch w/ suspend issue.
    ARM: S5P: Fix bug on init of PWMTimers for HRTimer
    ARM: SAMSUNG: header file revised to prevent declaring duplicated
    ARM: EXYNOS4: fix improper gpio configuration
    ARM: EXYNOS4: Fix card detection for sdhci 0 and 2

    Linus Torvalds
     
  • c60ffcbb6   Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/tmlind/linux-omap-2.6

    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
    omap: drop __initdata tags from static struct platform_device declarations

    Linus Torvalds
     

08 Jul, 2011

8 commits

  • d34c1fcdd   ARM: S3C2440: fix section mismatch on mini2440 ... Browse Code »

    If mini2440_init() is in __init, mini2440_parse_features() should also
    be in __init. Fixes:

    (.text+0x9adc): Section mismatch in reference from the function mini2440_parse_features.clone.0() to the
    (unknown reference) .init.data:(unknown)
    The function mini2440_parse_features.clone.0() references the (unknown reference) __initdata (unknown).

    Signed-off-by: Wolfram Sang
    Cc: Michel Pollet
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • cb26a7b1c   ARM: S3C24XX: drop return codes in void function of dma.c ... Browse Code »

    Commit bb072c3c (ARM / Samsung: Use struct syscore_ops for "core" power
    management) turned s3c2410_dma_resume_chan() from int to void. So, drop
    the actual return values, too. Fixes:

    arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_resume_chan':
    arch/arm/plat-s3c24xx/dma.c:1238:3: warning: 'return' with a value, in function returning void
    arch/arm/plat-s3c24xx/dma.c:1250:2: warning: 'return' with a value, in function returning void

    Signed-off-by: Wolfram Sang
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • 5838e9b8d   ARM: S3C24XX: don't use uninitialized variable in dma.c ... Browse Code »

    Commit 8970ef47 (S3C24XX: Remove hardware specific registers from DMA
    calls) removed the parameter dcon in s3c2410_dma_config() and calculates
    it on its own. So the debug-output for the old parameter can go, too.
    Fixes:

    arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_config':
    arch/arm/plat-s3c24xx/dma.c:1030:2: warning: 'dcon' is used uninitialized in this function

    Signed-off-by: Wolfram Sang
    Cc: Ben Dooks
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • 075d9db13   Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.

    Linus Torvalds
     
  • e55f1b1c0   Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/tip/linux-2.6-tip

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Don't use the EFI reboot method by default
    x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
    x86, reboot: Acer Aspire One A110 reboot quirk
    x86-32, NUMA: Fix boot regression caused by NUMA init unification on highmem machines

    Linus Torvalds
     
  • 27a3b735b   Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgen… ... Browse Code »

    …t-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    debugobjects: Fix boot crash when kmemleak and debugobjects enabled

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    jump_label: Fix jump_label update for modules
    oprofile, x86: Fix race in nmi handler while starting counters

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Disable (revert) SCHED_LOAD_SCALE increase
    sched, cgroups: Fix MIN_SHARES on 64-bit boxen

    Linus Torvalds
     
  • ee339fe63   xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci. ... Browse Code »

    Previously we would check for acpi_sci_override_gsi == gsi every time
    a PCI device was enabled. That works during early bootup, but later
    on it could lead to triggering unnecessarily the acpi_gsi_to_irq(..) lookup.
    The reason is that acpi_sci_override_gsi was declared in __initdata and
    after early bootup could contain bogus values.

    This patch moves the check for acpi_sci_override_gsi to the
    site where the ACPI SCI is preset.

    CC: stable@kernel.org
    Reported-by: Raghavendra D Prabhu
    Tested-by: Raghavendra D Prabhu
    [http://lists.xensource.com/archives/html/xen-devel/2011-07/msg00154.html]
    Suggested-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 659fb32d1   genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) ... Browse Code »

    This fixes a regression introduced by e59347a "arm: orion:
    Use generic irq chip".

    Depending on the device, interrupts acknowledgement is done by setting
    or by clearing a dedicated register. Replace irq_gc_ack() with some
    {set,clr}_bit variants allows to handle both cases.

    Note that this patch affects the following SoCs: Davinci, Samsung and
    Orion. Except for this last, the change is minor: irq_gc_ack() is just
    renamed into irq_gc_ack_set_bit().

    For the Orion SoCs, the edge GPIO interrupts support is currently
    broken. irq_gc_ack() try to acknowledge a such interrupt by setting
    the corresponding cause register bit. The Orion GPIO device expect the
    opposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.

    Tested on Network Space v2.

    Reported-by: Joey Oravec
    Signed-off-by: Simon Guinot
    Signed-off-by: Arnd Bergmann

    Simon Guinot
     

07 Jul, 2011

1 commit

  • d30e1521b   arm: mach-vt8500: add forgotten irq_data conversion ... Browse Code »

    This platform has not been converted to 'struct irq_data' when the big
    pile was done. It fails to compile nowadays, because the compatibility
    code has gone.

    CC arch/arm/mach-vt8500/irq.o
    arch/arm/mach-vt8500/irq.c:118:2: error: unknown field 'ack' specified in initializer
    arch/arm/mach-vt8500/irq.c:118:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:119:2: error: unknown field 'mask' specified in initializer
    arch/arm/mach-vt8500/irq.c:119:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:120:2: error: unknown field 'unmask' specified in initializer
    arch/arm/mach-vt8500/irq.c:120:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:121:2: error: unknown field 'set_type' specified in initializer
    arch/arm/mach-vt8500/irq.c:121:2: warning: initialization from incompatible pointer type
    make[1]: *** [arch/arm/mach-vt8500/irq.o] Error 1

    Add the missing conversion. Tested on a JayPC-Tablet.

    Signed-off-by: Wolfram Sang
    Acked-by: Alexey Charkov
    Cc: Russell King
    Cc: Thomas Gleixner
    Cc: Andrew Morton
    Signed-off-by: Arnd Bergmann

    Wolfram Sang