Eric Lee / smarc-fsl-linux-kernel

16 Jan, 2012

1 commit

  • 1a51a0ce1   ARM: OMAP3: fix build on !CONFIG_IOMMU_API ... Browse Code »

    omap3isp depends on CONFIG_IOMMU_API, so avoid registering its
    device (and defining its configuration structs) on !CONFIG_IOMMU_API.

    This is generally nice to have, but more importantly, it fixes:

    arch/arm/plat-omap/include/plat/iommu.h: In function 'dev_to_omap_iommu':
    arch/arm/plat-omap/include/plat/iommu.h:135: error: 'struct
    dev_archdata' has no member named 'iommu'
    arch/arm/mach-omap2/devices.c: In function 'omap3_init_camera':
    arch/arm/mach-omap2/devices.c:222: error: 'struct dev_archdata' has no
    member named 'iommu'
    make[1]: *** [arch/arm/mach-omap2/devices.o] Error 1
    make: *** [arch/arm/mach-omap2] Error 2

    Which happens because while setting up the omap3isp device we try
    to access the (now nonexistent) iommu member of dev_archdata.

    Compile tested with omap2plus_defconfig on today's:

    commit e343a895a9f342f239c5e3c5ffc6c0b1707e6244
    Merge: 06792c4 193a667
    Author: Linus Torvalds
    Date: Tue Jan 10 18:04:27 2012 -0800

    Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

    Reported-by: Govindraj Raja
    Reported-by: Arik Nemtsov
    Signed-off-by: Ohad Ben-Cohen
    Cc: Tony Lindgren
    Cc: Joerg Roedel
    Cc: Laurent Pinchart
    Acked-by: Laurent Pinchart
    Acked-by: Tony Lindgren
    Signed-off-by: Joerg Roedel

    Ohad Ben-Cohen
     

05 Dec, 2011

1 commit

05 Nov, 2011

1 commit

  • 927dbbb22   ARM: OMAP2+: devices: Fixes for McPDM ... Browse Code »

    Commit f718e2c034bf6ff872106344935006230764cb12 (ARM: OMAP2+: devices:
    Remove all omap_device_pm_latency structures) removed these structures.
    Commit 3528c58eb9e818b7821501afa2916eb12131994a (OMAP: omap_device:
    when building return platform_device instead of omap_device) now
    returns platform_device instead of omap_device.

    Fix up the omap-mcpdm init function since this part comes via sound
    tree, and there has been changes regarding to hwmod/omap_device_build.

    Signed-off-by: Peter Ujfalusi
    CC: Benoit Cousson
    CC: Kevin Hilman
    [tony@atomide.com: updated comments]
    Signed-off-by: Tony Lindgren

    Peter Ujfalusi
     

02 Nov, 2011

2 commits

  • 81a3c10ce   Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
    ARM: OMAP: Warn if omap_ioremap is called before SoC detection
    ARM: OMAP: Move set_globals initialization to happen in init_early
    ARM: OMAP: Map SRAM later on with ioremap_exec()
    ARM: OMAP: Remove calls to SRAM allocations for framebuffer
    ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
    ARM: OMAP1: Use generic map_io, init_early and init_irq
    arm/dts: OMAP3+: Add mpu, dsp and iva nodes
    arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
    ARM: OMAP2+: l3-noc: Add support for device-tree
    ARM: OMAP2+: board-generic: Add i2c static init
    ARM: OMAP2+: board-generic: Add DT support to generic board
    arm/dts: Add support for OMAP3 Beagle board
    arm/dts: Add initial device tree support for OMAP3 SoC
    arm/dts: Add support for OMAP4 SDP board
    arm/dts: Add support for OMAP4 PandaBoard
    arm/dts: Add initial device tree support for OMAP4 SoC
    ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
    ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
    of: Add helpers to get one string in multiple strings property
    ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
    ...

    Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c

    Linus Torvalds
     
  • 952414505   Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
    ARM: mach-mxs: fix machines' initializers order
    mmc: mxcmmc: explicitly includes mach/hardware.h
    arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
    arm/imx: remove mx27_setup_weimcs() from mx27.h
    arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
    arm/imx: remove mx31_setup_weimcs() from mx31.h
    ARM: tegra: devices.c should include devices.h
    ARM: tegra: cpu-tegra: unexport two functions
    ARM: tegra: cpu-tegra: sparse type fix
    ARM: tegra: dma: staticify some tables and functions
    ARM: tegra: tegra2_clocks: don't export some tables
    ARM: tegra: tegra_powergate_is_powered should be static
    ARM: tegra: tegra_rtc_read_ms should be static
    ARM: tegra: tegra_init_cache should be static
    ARM: tegra: pcie: 0 -> NULL changes
    ARM: tegra: pcie: include board.h
    ARM: tegra: pcie: don't cast __iomem pointers
    ARM: tegra: tegra2_clocks: 0 -> NULL changes
    ARM: tegra: tegra2_clocks: don't cast __iomem pointers
    ARM: tegra: timer: don't cast __iomem pointers
    ...

    Fix up trivial conflicts in
    arch/arm/mach-omap2/Makefile,
    arch/arm/mach-u300/{Makefile.boot,core.c}
    arch/arm/plat-{mxc,omap}/devices.c

    Linus Torvalds
     

01 Nov, 2011

1 commit

29 Oct, 2011

1 commit

  • 68d99b2c8   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: (549 commits)
    ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
    ALSA: hda - Keep EAPD turned on for old Conexant chips
    ALSA: hda/realtek - Fix missing volume controls with ALC260
    ASoC: wm8940: Properly set codec->dapm.bias_level
    ALSA: hda - Fix pin-config for ASUS W90V
    ALSA: hda - Fix surround/CLFE headphone and speaker pins order
    ALSA: hda - Fix typo
    ALSA: Update the sound git tree URL
    ALSA: HDA: Add new revision for ALC662
    ASoC: max98095: Convert codec->hw_write to snd_soc_write
    ASoC: keep pointer to resource so it can be freed
    ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
    ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
    ASoC: da7210: Add support for line out and DAC
    ASoC: da7210: Add support for DAPM
    ALSA: hda/realtek - Fix DAC assignments of multiple speakers
    ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
    ASoC: Set sgtl5000->ldo in ldo_regulator_register
    ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
    ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    ...

    Linus Torvalds
     

05 Oct, 2011

2 commits

22 Sep, 2011

1 commit

  • d231f5cba   OMAP: McPDM: Convert McPDM device to omap_device ... Browse Code »

    McPDM device is converted to omap device.

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Jorge Eduardo Candelaria
    Signed-off-by: Margarita Olaya Cabrera
    Signed-off-by: Liam Girdwood
    Signed-off-by: Misael Lopez Cruz
    Acked-by: Mark Brown
    Signed-off-by: Peter Ujfalusi
    Acked-by: Tony Lindgren

    Peter Ujfalusi
     

16 Sep, 2011

1 commit

  • 3528c58eb   OMAP: omap_device: when building return platform_device instead of omap_device ... Browse Code »
    43

    All of the device init and device driver interaction with omap_device
    is done using platform_device pointers. To make this more explicit,
    have omap_device return a platform_device pointer instead of an
    omap_device pointer.

    All current users of the omap_device pointer were only using it to get
    at the platform_device pointer or struct device pointer, so fixing all
    of the users was trivial.

    This also makes it more difficult for device init code to directly
    access members of struct omap_device, and allows for easier changing
    of omap_device internals.

    Cc: Paul Walmsley
    Signed-off-by: Kevin Hilman

    Kevin Hilman
     

08 Aug, 2011

1 commit

05 Jul, 2011

1 commit

01 Jun, 2011

1 commit

31 Mar, 2011

1 commit

28 Mar, 2011

1 commit

25 Mar, 2011

1 commit

  • 76d21c563   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... Browse Code »

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
    [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
    [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
    [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
    [media] v4l: soc-camera: Store negotiated buffer settings
    [media] rc: interim support for 32-bit NEC-ish scancodes
    [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
    [media] lirc_zilog: error out if buffer read bytes != chunk size
    [media] lirc: silence some compile warnings
    [media] hdpvr: use same polling interval as other OS
    [media] ir-kbd-i2c: pass device code w/key in hauppauge case
    [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
    [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
    [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
    [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
    [media] rc-rc5-hauppauge-new: Add support for the old Black RC
    [media] rc-rc5-hauppauge-new: Add the old control to the table
    [media] rc-winfast: Fix the keycode tables
    [media] a800: Fix a few wrong IR key assignments
    [media] opera1: Use multimedia keys instead of an app-specific mapping
    [media] dw2102: Use multimedia keys instead of an app-specific mapping
    ...

    Fix up trivial conflicts (remove/modify and some real conflicts) in:
    arch/arm/mach-omap2/devices.c
    drivers/staging/Kconfig
    drivers/staging/Makefile
    drivers/staging/dabusb/dabusb.c
    drivers/staging/dabusb/dabusb.h
    drivers/staging/easycap/easycap_ioctl.c
    drivers/staging/usbvideo/usbvideo.c
    drivers/staging/usbvideo/vicam.c

    Linus Torvalds
     

22 Mar, 2011

4 commits

19 Mar, 2011

1 commit

09 Mar, 2011

2 commits

03 Mar, 2011

1 commit

02 Mar, 2011

3 commits

  • 4621d5f8c   OMAP: adapt hsmmc to hwmod framework ... Browse Code »

    OMAP2420 platform consists of mmc block as in omap1 and not the
    hsmmc block as present in omap2430, omap3, omap4 platforms.
    Removing all base address macro defines except keeping one for OMAP2420 and
    adapting only hsmmc device registration and driver to hwmod framework.

    Changes involves:
    1) Remove controller reset in devices.c which is taken care of
    by hwmod framework.
    2) Using omap-device layer to register device and utilizing data from
    hwmod data file for base address, dma channel number, Irq_number,
    device attribute.
    3) Update the driver to use dev_attr to find whether controller
    supports dual volt cards

    Signed-off-by: Paul Walmsley
    Signed-off-by: Kishore Kadiyala
    Reviewed-by: Balaji T K
    Cc: Benoit Cousson
    CC: Kevin Hilman
    Cc: Tony Lindgren
    Signed-off-by: Tony Lindgren

    Kishore Kadiyala
     
  • d8d0a61c6   OMAP: hsmmc: Move mux configuration to hsmmc.c ... Browse Code »

    Moving the definition of mux setting API from devices.c to hsmmc.c
    and renaming it from "omap2_mmc_mux" to "omap_hsmmc_mux".
    Also calling "omap_hsmmc_mux" from omap2_hsmmc_init.

    Signed-off-by: Kishore Kadiyala
    Cc: Chris Ball

    Kishore Kadiyala
     
  • e08016d0f   omap: mmc: split out init for 2420 ... Browse Code »

    The MMC controller on the OMAP2420 is different from those
    on the OMAP2430, OMAP3 and OMAP4 families - all of the latter
    are identical. The one on the OMAP2420 is closer to that
    on OMAP1 chips.

    Currently, the n8x0 is the only OMAP2420 platform supported
    in mainline which registers the MMC controller. Upcoming
    changes to register the controllers using hwmod data are
    potentially invasive. To reduce the risk, separate out the
    2420 controller registration from the common init function
    and update its only user. Also seperating out mux settings
    for OMAP2420.

    Signed-off-by: Anand Gadiyar
    Signed-off-by: Kishore Kadiyala
    Cc: Tony Lindgren
    Cc: Madhusudhan Chikkature
    Cc: Chris Ball
    Signed-off-by: Tony Lindgren

    Anand Gadiyar
     

25 Feb, 2011

1 commit

  • 69dbf857c   OMAP: mailbox: build device using omap_device/omap_hwmod ... Browse Code »

    Remove static platform_device and resource data within
    omap mailbox driver; use the one defined in the hwmod
    database along with omap_device framework for device
    build and registration.

    Add device latency functions to be used, so clock can be
    enabled and sysconfig is configured.

    Signed-off-by: Felipe Contreras
    Signed-off-by: Omar Ramirez Luna
    Signed-off-by: Tony Lindgren

    Felipe Contreras
     

24 Feb, 2011

1 commit

18 Feb, 2011

2 commits

  • 59556765c   OMAP4: keypad: Add the board support ... Browse Code »
    43

    -Add the platform changes for the keypad driver
    -Register keyboard device with hwmod framework.

    Signed-off-by: Syed Rafiuddin
    Signed-off-by: Abraham Arce
    Signed-off-by: Shubhrajyoti D
    Signed-off-by: Tony Lindgren

    Syed Rafiuddin
     
  • 1a5d81905   OMAP: devices: Modify McSPI device to adapt to hwmod framework ... Browse Code »

    Cleans up all base address definitions for omap_mcspi
    and adapts the device registration and driver to hwmod framework.
    Changes involves:
    1) Removing all base address macro defines.
    2) Using omap-device layer to register device and utilizing data from
    hwmod data file for base address, dma channel number, Irq_number,
    device attribute(number of chipselect).
    3) Appending base address with pdata reg_offset for omap4 boards.
    For omap4 all regs used in driver deviate with reg_offset_macros
    defined with an value of 0x100. So pass this offset through pdata
    and append the same to base address retrieved from hwmod data file
    and we are not mapping *_HL_* regs which are not used in driver.

    Signed-off-by: Charulatha V
    Signed-off-by: Govindraj.R
    Acked-by: Grant Likely
    Reviewed-by: Partha Basak
    Reviewed-by: Kevin Hilman
    Signed-off-by: Tony Lindgren

    Charulatha V
     

28 Jan, 2011

1 commit

  • 59b479e09   omap: Start using CONFIG_SOC_OMAP ... Browse Code »

    We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
    are nowadays just subcategories of these.

    Search and replace the following:

    ARCH_OMAP2420 SOC_OMAP2420
    ARCH_OMAP2430 SOC_OMAP2430
    ARCH_OMAP3430 SOC_OMAP3430

    No functional changes.

    Signed-off-by: Tony Lindgren
    Signed-off-by: Thomas Weber
    Acked-by: Sourav Poddar

    Tony Lindgren
     

07 Jan, 2011

1 commit

  • a9b365bdc   omap2+: wdt: trivial sparse fixes ... Browse Code »

    omap2_wd_timer_disable is declared in wdtimer.h and used by hwmod
    function pointers for usage, the header inclusion is necessary
    to ensure that the prototype and function remains consistent.
    omap_wdt_latency is passed as a pointer and does not need global scope

    Fixes sparse warnings:
    arch/arm/mach-omap2/devices.c:981:31: warning: symbol 'omap_wdt_latency' was not declared. Should it be static?
    arch/arm/mach-omap2/wd_timer.c:27:5: warning: symbol 'omap2_wd_timer_disable' was not declared. Should it be static?

    Signed-off-by: Nishanth Menon
    Signed-off-by: Tony Lindgren

    Nishanth Menon
     

22 Dec, 2010

2 commits

  • ff2516fbe   OMAP2+: wd_timer: disable on boot via hwmod postsetup mechanism ... Browse Code »

    The OMAP watchdog timer IP blocks require a specific set of register
    writes to occur before they will be disabled[1], even if the device
    clocks appear to be disabled in the CM_*CLKEN registers. In the MPU
    watchdog case, failure to execute this reset sequence will eventually
    cause the watchdog to reset the OMAP unexpectedly.

    Previously, the code to disable this watchdog was manually called from
    mach-omap2/devices.c during device initialization. This causes the
    watchdog to be unconditionally disabled for a portion of kernel
    initialization. This should be controllable by the board-*.c files,
    since some system integrators will want full watchdog coverage of
    kernel initialization. Also, the watchdog disable code was not
    connected to the hwmod shutdown code. This means that calling
    omap_hwmod_shutdown() will not, in fact, disable the watchdog, and the
    goal of omap_hwmod_shutdown() is to be able to shutdown any on-chip
    OMAP device.

    To resolve the latter problem, populate the pre_shutdown pointer in
    the watchdog timer hwmod classes with a function that executes the
    watchdog shutdown sequence. This allows the hwmod code to fully
    disable the watchdog.

    Then, to allow some board files to support watchdog coverage
    throughout kernel initialization, add common code to mach-omap2/io.c
    to cause the MPU watchdog to be disabled on boot unless a board file
    specifically requests it to remain enabled. Board files can do this
    by changing the watchdog timer hwmod's postsetup state between the
    omap2_init_common_infrastructure() and omap2_init_common_devices()
    function calls.

    1. OMAP34xx Multimedia Device Silicon Revision 3.1.x Rev. ZH
    [SWPU222H], Section 16.4.3.6, "Start/Stop Sequence for WDTs (Using
    WDTi.WSPR Register)"

    Signed-off-by: Paul Walmsley
    Cc: Benoît Cousson
    Cc: Kevin Hilman
    Cc: Charulatha Varadarajan

    Paul Walmsley
     
  • 81fbc5ef9   OMAP2+: wd_timer: separate watchdog disable code from the rest of mach-omap2/devices.c ... Browse Code »

    Split the wd_timer disable code out into its own file,
    mach-omap2/wd_timer.c; it belongs in its own file rather than
    cluttering up devices.c.

    Signed-off-by: Paul Walmsley
    Cc: Charulatha Varadarajan

    Paul Walmsley
     

21 Dec, 2010

1 commit

26 Oct, 2010

1 commit

  • 7b6181e06   Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... Browse Code »

    * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
    omap: complete removal of machine_desc.io_pg_offst and .phys_io
    omap: UART: fix wakeup registers for OMAP24xx UART2
    omap: Fix spotty MMC voltages
    ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
    serial: omap-serial: fix signess error
    OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
    omap: dma: Fix buffering disable bit setting for omap24xx
    omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
    OMAP3: PM: fix scratchpad memory accesses for off-mode
    omap4: pandaboard: enable the ehci port on pandaboard
    omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
    omap4: pandaboard: remove unused hsmmc definition
    OMAP: McBSP: Remove null omap44xx ops comment
    OMAP: McBSP: Swap CLKS source definition
    OMAP: McBSP: Fix CLKR and FSR signal muxing
    OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
    OMAP: control: move plat-omap/control.h to mach-omap2/control.h
    OMAP: split plat-omap/common.c
    OMAP: McBSP: implement functional clock switching via clock framework
    OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
    ...

    Fixed up trivial conflicts in arch/arm/mach-omap2/
    {board-zoom-peripherals.c,devices.c} as per Tony

    Linus Torvalds
     

25 Oct, 2010

2 commits

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

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
    ALSA: hda - Disable sticky PCM stream assignment for AD codecs
    ALSA: usb - Creative USB X-Fi volume knob support
    ALSA: ca0106: Use card specific dac id for mute controls.
    ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
    ALSA: ca0106: Create a nice spot for mapping channels to dacs.
    ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
    ALSA: ca0106: Pull out dac powering routine into separate function.
    ALSA: ca0106 - add Sound Blaster 5.1vx info.
    ASoC: tlv320dac33: Use usleep_range for delays
    ALSA: usb-audio: add Novation Launchpad support
    ALSA: hda - Add workarounds for CT-IBG controllers
    ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
    ASoC: tpa6130a2: Error handling for broken chip
    ASoC: max98088: Staticise m98088_eq_band
    ASoC: soc-core: Fix codec->name memory leak
    ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
    ALSA: hda - Add some workarounds for Creative IBG
    ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
    ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
    ALSA: hda - Add alc_init_jacks() call to other codecs
    ...

    Linus Torvalds
     
  • 188e213db   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: Makefile - replace the use of -objs with -y
    crypto: hifn_795x - use cancel_delayed_work_sync()
    crypto: talitos - sparse check endian fixes
    crypto: talitos - fix checkpatch warning
    crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
    crypto: cryptd - Adding the AEAD interface type support to cryptd
    crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
    crypto: Kconfig - update broken web addresses
    crypto: omap-sham - Adjust DMA parameters
    crypto: fips - FIPS requires algorithm self-tests
    crypto: omap-aes - OMAP2/3 AES hw accelerator driver
    crypto: updates to enable omap aes
    padata: add missing __percpu markup in include/linux/padata.h
    MAINTAINERS: Add maintainer entries for padata/pcrypt

    Linus Torvalds