Eric Lee / smarc-fsl-linux-kernel

13 Jan, 2012

1 commit

  • a429638ca   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
    ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
    ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
    ALSA: usb-audio: add Yamaha MOX6/MOX8 support
    ALSA: virtuoso: add S/PDIF input support for all Xonars
    ALSA: ice1724 - Support for ooAoo SQ210a
    ALSA: ice1724 - Allow card info based on model only
    ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
    ALSA: hdspm - Provide unique driver id based on card serial
    ASoC: Dynamically allocate the rtd device for a non-empty release()
    ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
    ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
    ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
    ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
    ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
    ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
    ALSA: hda/cirrus - support for iMac12,2 model
    ASoC: cx20442: add bias control over a platform provided regulator
    ALSA: usb-audio - Avoid flood of frame-active debug messages
    ALSA: snd-usb-us122l: Delete calls to preempt_disable
    mfd: Put WM8994 into cache only mode when suspending
    ...

    Fix up trivial conflicts in:
    - arch/arm/mach-s3c64xx/mach-crag6410.c:
    renamed speyside_wm8962 to tobermory, added littlemill right
    next to it
    - drivers/base/regmap/{regcache.c,regmap.c}:
    duplicate diff that had already come in with other changes in
    the regmap tree

    Linus Torvalds
     

10 Jan, 2012

5 commits

  • 2ac9d7aac   Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Driver specific changes

    Again, a lot of platforms have changes in here: pxa, samsung, omap,
    at91, imx, ...

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
    ARM: sa1100: clean up of the clock support
    ARM: pxa: add dummy clock for sa1100-rtc
    RTC: sa1100: support sa1100, pxa and mmp soc families
    RTC: sa1100: remove redundant code of setting alarm
    RTC: sa1100: Clean out ost register
    Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
    pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
    ARM: EXYNOS: Modified files for SPI consolidation work
    ARM: S5P64X0: Enable SDHCI support
    ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
    ARM: S5P64X0: Add HSMMC setup for host Controller
    ARM: EXYNOS: Add USB OHCI support to ORIGEN board
    USB: Add Samsung Exynos OHCI diver
    ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
    ARM: EXYNOS: Add USB OHCI device
    net: macb: fix build break with !CONFIG_OF
    i2c: tegra: Support DVC controller in device tree
    i2c: tegra: Add __devinit/exit to probe/remove
    net/at91_ether: use gpio_is_valid for phy IRQ line
    ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
    ...

    Linus Torvalds
     
  • 6d889d03a   Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Board-level changes

    This adds and extends support for specific boards on a number of
    ARM platforms: omap, imx, samsung, tegra, ...

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
    Enable 32 bit flash support for iMX21ADS board
    ARM: mx31pdk: Add MC13783 RTC support
    iomux-mx25: configuration to support CSPI3 on CSI pins
    MX1:apf9328: Add i2c support
    mioa701: add newly available DoC G3 chip
    arm/tegra: remove __initdata annotation from pinmux tables
    arm/tegra: Use bus notifiers to trigger pinmux setup
    arm/tegra: Refactor board-*-pinmux.c to share code
    arm/tegra: Fix mistake in Trimslice's pinmux
    arm/tegra: Rework Seaboard-vs-Ventana pinmux table
    arm/tegra: Remove useless entries from ventana_pinmux[]
    arm/tegra: PCIe: Remove include of mach/pinmux.h
    arm/tegra: Harmony PCIe: Don't touch pinmux
    arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
    arm/tegra: Split Seaboard GPIO table to allow for Ventana
    ARM: imx6q: generate imx6q dtb files
    arm/imx6q: Rename Sabreauto to Armadillo2
    arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
    arm/imx6: add imx6q sabrelite board support
    dts/imx: rename uart labels to consistent with hw spec
    ...

    Linus Torvalds
     
  • 57e964e1a   Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Non-critical bug fixes

    Simple bug fixes that were not considered important enough for inclusion
    into 3.2.

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    MAINTAINERS: update pxa and mmp
    ARM: pxa: Include linux/export.h in balloon3.c
    ARM: OMAP4: clock: Add CPU local timer clock node
    ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported
    ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data
    ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot
    ARM: OMAP2+: DMA: Workaround for invalid destination position
    ARM: OMAP2+: DMA: Workaround for invalid source position

    Linus Torvalds
     
  • 421b759b8   Merge branch 'samsung/cleanup' into next/boards ... Browse Code »

    Conflicts:
    arch/arm/mach-imx/mach-imx6q.c
    arch/arm/mach-omap2/board-ti8168evm.c
    arch/arm/mach-s3c64xx/Kconfig
    arch/arm/mach-tegra/Makefile
    arch/arm/mach-tegra/board-dt-tegra20.c
    arch/arm/mach-tegra/common.c

    Lots of relatively simple conflicts between the board
    changes and stuff from the arm tree. This pulls in
    the resolution from the samsung/cleanup tree, so we
    don't get conflicting merges.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • dcf7ec5ee   Merge branch 'samsung/driver' into next/drivers ... Browse Code »

    Conflicts:
    arch/arm/mach-mxs/include/mach/common.h

    Pull in previous samsung conflict merges and do a trivial
    merge of an mxs double-add conflict.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

09 Jan, 2012

1 commit

  • 98793265b   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
    Kconfig: acpi: Fix typo in comment.
    misc latin1 to utf8 conversions
    devres: Fix a typo in devm_kfree comment
    btrfs: free-space-cache.c: remove extra semicolon.
    fat: Spelling s/obsolate/obsolete/g
    SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
    tools/power turbostat: update fields in manpage
    mac80211: drop spelling fix
    types.h: fix comment spelling for 'architectures'
    typo fixes: aera -> area, exntension -> extension
    devices.txt: Fix typo of 'VMware'.
    sis900: Fix enum typo 'sis900_rx_bufer_status'
    decompress_bunzip2: remove invalid vi modeline
    treewide: Fix comment and string typo 'bufer'
    hyper-v: Update MAINTAINERS
    treewide: Fix typos in various parts of the kernel, and fix some comments.
    clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
    gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
    leds: Kconfig: Fix typo 'D2NET_V2'
    sound: Kconfig: drop unknown symbol ARCH_CLPS7500
    ...

    Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
    kconfig additions, close to removed commented-out old ones)

    Linus Torvalds
     

05 Jan, 2012

5 commits

02 Jan, 2012

1 commit

30 Dec, 2011

1 commit

28 Dec, 2011

6 commits

19 Dec, 2011

1 commit

  • 2f0778afa   ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime ... Browse Code »
    86

    sched_clock() is yet another blocker on the road to the single
    image. This patch implements an idea by Russell King:

    http://www.spinics.net/lists/linux-omap/msg49561.html

    Instead of asking the platform to implement both sched_clock()
    itself and the rollover callback, simply register a read()
    function, and let the ARM code care about sched_clock() itself,
    the conversion to ns and the rollover. sched_clock() uses
    this read() function as an indirection to the platform code.
    If the platform doesn't provide a read(), the code falls back
    to the jiffy counter (just like the default sched_clock).

    This allow some simplifications and possibly some footprint gain
    when multiple platforms are compiled in. Among the drawbacks,
    the removal of the *_fixed_sched_clock optimization which could
    negatively impact some platforms (sa1100, tegra, versatile
    and omap).

    Tested on 11MPCore, OMAP4 and Tegra.

    Cc: Imre Kaloz
    Cc: Eric Miao
    Cc: Colin Cross
    Cc: Erik Gilling
    Cc: Olof Johansson
    Cc: Sascha Hauer
    Cc: Alessandro Rubini
    Cc: STEricsson
    Cc: Lennert Buytenhek
    Cc: Ben Dooks
    Tested-by: Jamie Iles
    Tested-by: Tony Lindgren
    Tested-by: Kyungmin Park
    Acked-by: Linus Walleij
    Acked-by: Nicolas Pitre
    Acked-by: Krzysztof Halasa
    Acked-by: Kukjin Kim
    Signed-off-by: Marc Zyngier
    Signed-off-by: Russell King

    Marc Zyngier
     

17 Dec, 2011

5 commits

09 Dec, 2011

3 commits

06 Dec, 2011

3 commits

27 Nov, 2011

1 commit

24 Nov, 2011

1 commit

22 Nov, 2011

1 commit

21 Nov, 2011

3 commits

  • 59136ef3c   Merge branch 'restart-cleanup' into restart Browse Code »
    Russell King
     
  • 3f1517a76   ARM: restart: remove poodle restart handler ... Browse Code »

    The poodle restart handler was added in 74617fb6b8 (3593/1: Add reboot
    and shutdown handlers for Zaurus handhelds), and at that time it was
    necessary to deal with the RCSR register. This commit also forced all
    restarts to use the 'hard' restart method.

    In dc38e2ad53 (pxa: Fix RCSR handling), the RCSR handling was removed,
    leaving just the forcing to use a 'hard' restart. As hard restarts are
    the default (in the absense of a reboot= command line argument), this
    seems pointless. In any case, Richard Purdie says:

    > From what I remember that hardware either always reboots or always
    > halts. I think the option was therefore left hardcoded to make it clear
    > it wasn't expected to work. Later Zaurii models could do either but
    > required some manual poking of registers to make it happen iirc.
    >
    > Regardless, you can probably clean this up as you suggest now.

    So, lets remove the unnecessary interception and rely on the default
    restart mode.

    Acked-by: Richard Purdie
    Signed-off-by: Russell King

    Russell King
     
  • e879c862f   ARM: restart: only perform setup for restart when soft-restarting ... Browse Code »

    We only need to set the system up for a soft-restart if we're going to
    be doing a soft-restart. Provide a new function (soft_restart()) which
    does the setup and final call for this, and make platforms use it.
    Eliminate the call to setup_restart() from the default handler.

    This means that platforms arch_reset() function is no longer called with
    the page tables prepared for a soft-restart, and caches will still be
    enabled.

    Acked-by: Nicolas Pitre
    Acked-by: Will Deacon
    Acked-by: H Hartley Sweeten
    Acked-by: Kukjin Kim
    Acked-by: Sascha Hauer
    Acked-by: Viresh Kumar
    Acked-by: Krzysztof Ha■asa
    Acked-by: Paul Mundt
    Acked-by: Richard Purdie
    Acked-by: Wan ZongShun
    Acked-by: Eric Miao
    Signed-off-by: Russell King

    Russell King
     

16 Nov, 2011

1 commit

  • abeb24ae4   ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusive ... Browse Code »

    Even when CONFIG_MULTI_IRQ_HANDLER is selected, the core code
    requires the arch_irq_handler_default macro to be defined as
    a fallback.

    It turns out nobody is using that particular feature as both PXA
    and shmobile have all their machine descriptors populated with
    the interrupt handler, leaving unused code (or empty macros) in
    their entry-macro.S file just to be able to compile entry-armv.S.

    Make CONFIG_MULTI_IRQ_HANDLER exclusive wrt arch_irq_handler_default,
    which allows to remove one test from the hot path. Also cleanup both
    PXA and shmobile entry-macro.S.

    Cc: Paul Mundt
    Acked-by: Nicolas Pitre
    Acked-by: Eric Miao
    Tested-by: Jamie Iles
    Signed-off-by: Marc Zyngier

    Marc Zyngier
     

15 Nov, 2011

1 commit