Eric Lee / smarc-fsl-linux-kernel

08 Nov, 2011

1 commit

  • 3c0030320   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    cpuidle: Single/Global registration of idle states
    cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
    cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
    cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
    ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
    ACPI: Export FADT pm_profile integer value to userspace
    thermal: Prevent polling from happening during system suspend
    ACPI: Drop ACPI_NO_HARDWARE_INIT
    ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
    PNPACPI: Simplify disabled resource registration
    ACPI: Fix possible recursive locking in hwregs.c
    ACPI: use kstrdup()
    mrst pmu: update comment
    tools/power turbostat: less verbose debugging

    Linus Torvalds
     

07 Nov, 2011

3 commits

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     
  • 46bcfad7a   cpuidle: Single/Global registration of idle states ... Browse Code »
    43

    This patch makes the cpuidle_states structure global (single copy)
    instead of per-cpu. The statistics needed on per-cpu basis
    by the governor are kept per-cpu. This simplifies the cpuidle
    subsystem as state registration is done by single cpu only.
    Having single copy of cpuidle_states saves memory. Rare case
    of asymmetric C-states can be handled within the cpuidle driver
    and architectures such as POWER do not have asymmetric C-states.

    Having single/global registration of all the idle states,
    dynamic C-state transitions on x86 are handled by
    the boot cpu. Here, the boot cpu would disable all the devices,
    re-populate the states and later enable all the devices,
    irrespective of the cpu that would receive the notification first.

    Reference:
    https://lkml.org/lkml/2011/4/25/83

    Signed-off-by: Deepthi Dharwar
    Signed-off-by: Trinabh Gupta
    Tested-by: Jean Pihet
    Reviewed-by: Kevin Hilman
    Acked-by: Arjan van de Ven
    Acked-by: Kevin Hilman
    Signed-off-by: Len Brown

    Deepthi Dharwar
     
  • e978aa7d7   cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state ... Browse Code »
    86

    Cpuidle governor only suggests the state to enter using the
    governor->select() interface, but allows the low level driver to
    override the recommended state. The actual entered state
    may be different because of software or hardware demotion. Software
    demotion is done by the back-end cpuidle driver and can be accounted
    correctly. Current cpuidle code uses last_state field to capture the
    actual state entered and based on that updates the statistics for the
    state entered.

    Ideally the driver enter routine should update the counters,
    and it should return the state actually entered rather than the time
    spent there. The generic cpuidle code should simply handle where
    the counters live in the sysfs namespace, not updating the counters.

    Reference:
    https://lkml.org/lkml/2011/3/25/52

    Signed-off-by: Deepthi Dharwar
    Signed-off-by: Trinabh Gupta
    Tested-by: Jean Pihet
    Reviewed-by: Kevin Hilman
    Acked-by: Arjan van de Ven
    Acked-by: Kevin Hilman
    Signed-off-by: Len Brown

    Deepthi Dharwar
     

04 Nov, 2011

4 commits

  • 1046a2c42   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Browse Code »

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
    [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
    [media] it913x [VER 1.07] Support for single ITE 9135 devices
    [media] Support for Terratec G1
    [media] cx25821: off by one in cx25821_vidioc_s_input()
    [media] media: tea5764: reconcile Kconfig symbol and macro
    [media] omap_vout: Add poll() support
    [media] omap3isp: preview: Add crop support on the sink pad
    [media] omap3isp: preview: Rename min/max input/output sizes defines
    [media] omap3isp: preview: Remove horizontal averager support
    [media] omap3isp: Report the ISP revision through the media controller API
    [media] omap3isp: ccdc: remove redundant operation
    [media] omap3isp: Fix memory leaks in initialization error paths
    [media] omap3isp: Add missing mutex_destroy() calls
    [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
    [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
    [media] MFC: Change MFC firmware binary name
    [media] vb2: add vb2_get_unmapped_area in vb2 core
    [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
    [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
    [media] media: ov6650: stylistic improvements
    ...

    Linus Torvalds
     
  • cb626371f   [media] sh: migor: remove unused ov772x buswidth flag ... Browse Code »

    The ov772x driver only supports 8 bits per sample pixel codes, hence
    the OV772X_FLAG_8BIT flag has no effect. Remove it.

    Signed-off-by: Guennadi Liakhovetski
    Acked-by: Magnus Damm
    Signed-off-by: Mauro Carvalho Chehab

    Guennadi Liakhovetski
     
  • 284f28eec   [media] sh: ap3rxa: remove redundant soc-camera platform data fields ... Browse Code »

    The sh_mobile_ceu_camera driver has been converted to use the V4L2
    subdevice .[gs]_mbus_config() operations, therefore we don't need
    SOCAM_* flags for the soc_camera_platform driver anymore. The ov772x
    driver only supports 8 bits per sample pixel codes, hence the
    OV772X_FLAG_8BIT flag has no effect. Remove both of them.

    Signed-off-by: Guennadi Liakhovetski
    Acked-by: Magnus Damm
    Signed-off-by: Mauro Carvalho Chehab

    Guennadi Liakhovetski
     
  • 7e5cf0ae2   [media] sh: convert ap325rxa to mediabus flags ... Browse Code »

    Prepare the board to switch to the new subdevice media-bus configuration
    operations.

    Signed-off-by: Guennadi Liakhovetski
    Acked-by: Magnus Damm
    Signed-off-by: Mauro Carvalho Chehab

    Guennadi Liakhovetski
     

01 Nov, 2011

4 commits

28 Oct, 2011

7 commits

29 Sep, 2011

2 commits

05 Sep, 2011

3 commits

30 Aug, 2011

1 commit

  • c42a2634d   Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x ... Browse Code »

    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
    sh: fix the compile error in setup-sh7757.c
    serial: sh-sci: report CTS as active for get_mctrl
    sh: Add unaligned memory access for PC relative intructions
    sh: Fix unaligned memory access for branches without delay slots
    sh: Fix up fallout from cpuidle changes.
    serial: sh-sci: console Runtime PM support
    sh: Fix conflicting definitions of ptrace_triggered
    serial: sh-sci: fix DMA build by including dma-mapping.h
    serial: sh-sci: Fix up default regtype probing.
    sh: intc: enable both edges GPIO interrupts on sh7372
    shwdt: fix usage of mod_timer
    clocksource: sh_cmt: wait for CMCNT on init V2

    Linus Torvalds
     

29 Aug, 2011

4 commits

27 Aug, 2011

1 commit

08 Aug, 2011

3 commits

05 Aug, 2011

1 commit

  • cbc158d6b   cpuidle: Consistent spelling of cpuidle_idle_call() ... Browse Code »

    Commit a0bfa1373859e9d11dc92561a8667588803e42d8 mispells
    cpuidle_idle_call() on ARM and SH code. Fix this to be consistent.

    Cc: Kevin Hilman
    Cc: Paul Mundt
    Cc: x86@kernel.org
    Cc: Len Brown
    Signed-off-by: David Brown
    [ Also done by Mark Brown - th ebug has been around forever, and was
    noticed in -next, but the idle tree never picked it up. Bad bad bad ]
    Signed-off-by: Linus Torvalds

    David Brown
     

04 Aug, 2011

2 commits

  • 35e51fe82   Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 ... Browse Code »

    * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
    cpuidle: stop depending on pm_idle
    x86 idle: move mwait_idle_with_hints() to where it is used
    cpuidle: replace xen access to x86 pm_idle and default_idle
    cpuidle: create bootparam "cpuidle.off=1"
    mrst_pmu: driver for Intel Moorestown Power Management Unit

    Linus Torvalds
     
  • a0bfa1373   cpuidle: stop depending on pm_idle ... Browse Code »

    cpuidle users should call cpuidle_call_idle() directly
    rather than via (pm_idle)() function pointer.

    Architecture may choose to continue using (pm_idle)(),
    but cpuidle need not depend on it:

    my_arch_cpu_idle()
    ...
    if(cpuidle_call_idle())
    pm_idle();

    cc: Kevin Hilman
    cc: Paul Mundt
    cc: x86@kernel.org
    Acked-by: H. Peter Anvin
    Signed-off-by: Len Brown

    Len Brown
     

03 Aug, 2011

3 commits

  • d0e323b47   Merge branch 'apei' into apei-release ... Browse Code »

    Some trivial conflicts due to other various merges
    adding to the end of common lists sooner than this one.

    arch/ia64/Kconfig
    arch/powerpc/Kconfig
    arch/x86/Kconfig
    lib/Kconfig
    lib/Makefile

    Signed-off-by: Len Brown

    Len Brown
     
  • df013ffb8   Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG ... Browse Code »

    cmpxchg() is widely used by lockless code, including NMI-safe lockless
    code. But on some architectures, the cmpxchg() implementation is not
    NMI-safe, on these architectures the lockless code may need a
    spin_trylock_irqsave() based implementation.

    This patch adds a Kconfig option: ARCH_HAVE_NMI_SAFE_CMPXCHG, so that
    NMI-safe lockless code can depend on it or provide different
    implementation according to it.

    On many architectures, cmpxchg is only NMI-safe for several specific
    operand sizes. So, ARCH_HAVE_NMI_SAFE_CMPXCHG define in this patch
    only guarantees cmpxchg is NMI-safe for sizeof(unsigned long).

    Signed-off-by: Huang Ying
    Acked-by: Mike Frysinger
    Acked-by: Paul Mundt
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Benjamin Herrenschmidt
    Acked-by: Chris Metcalf
    Acked-by: Richard Henderson
    CC: Mikael Starvik
    Acked-by: David Howells
    CC: Yoshinori Sato
    CC: Tony Luck
    CC: Hirokazu Takata
    CC: Geert Uytterhoeven
    CC: Michal Simek
    Acked-by: Ralf Baechle
    CC: Kyle McMartin
    CC: Martin Schwidefsky
    CC: Chen Liqin
    CC: "David S. Miller"
    CC: Ingo Molnar
    CC: Chris Zankel
    Signed-off-by: Len Brown

    Huang Ying
     
  • c84b51e65   sh: Fix conflicting definitions of ptrace_triggered ... Browse Code »

    The extra nmi argument is causing this compile fail:

    CC arch/sh/kernel/ptrace_32.o
    arch/sh/kernel/ptrace_32.c:66:6: error: conflicting types for 'ptrace_triggered'
    arch/sh/include/asm/ptrace.h:126:13: note: previous declaration of 'ptrace_triggered' was here
    make[3]: *** [arch/sh/kernel/ptrace_32.o] Error 1

    Signed-off-by: Paul Gortmaker
    Signed-off-by: Paul Mundt

    Paul Gortmaker
     

02 Aug, 2011

1 commit

  • e10b87d2b   Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x ... Browse Code »

    * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x: (39 commits)
    SH: static should be at beginning of declaration
    sh: move CLKDEV_xxx_ID macro to sh_clk.h
    sh: clock-shx3: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7786: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7785: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7757: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7366: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7343: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7722: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7724: add CLKDEV_ICK_ID for cleanup
    sh: clock-sh7366: modify I2C clock settings
    sh: clock-sh7343: modify I2C clock settings
    sh: clock-sh7723: modify I2C clock settings
    sh: clock-sh7722: modify I2C clock settings
    sh: clock-sh7724: modify I2C clock settings
    serial: sh-sci: Fix up pretty name printing for port IRQs.
    serial: sh-sci: Kill off per-port enable/disable callbacks.
    serial: sh-sci: Add missing module description/author bits.
    serial: sh-sci: Regtype probing doesn't need to be fatal.
    sh: Tidy up pre-clkdev clk_get() error handling.
    ...

    Linus Torvalds