Eric Lee / smarc-fsl-linux-kernel

13 Jan, 2012

1 commit

  • 716a3dc20   ARM: Add arm_memblock_steal() to allocate memory away from the kernel ... Browse Code »
    43

    Several platforms are now using the memblock_alloc+memblock_free+
    memblock_remove trick to obtain memory which won't be mapped in the
    kernel's page tables. Most platforms do this (correctly) in the
    ->reserve callback. However, OMAP has started to call these functions
    outside of this callback, and this is extremely unsafe - memory will
    not be unmapped, and could well be given out after memblock is no
    longer responsible for its management.

    So, provide arm_memblock_steal() to perform this function, and ensure
    that it panic()s if it is used inappropriately. Convert everyone
    over, including OMAP.

    As a result, OMAP with OMAP4_ERRATA_I688 enabled will panic on boot
    with this change. Mark this option as BROKEN and make it depend on
    BROKEN. OMAP needs to be fixed, or 137d105d50 (ARM: OMAP4: Fix
    errata i688 with MPU interconnect barriers.) reverted until such
    time it can be fixed correctly.

    Signed-off-by: Russell King

    Russell King
     

02 Nov, 2011

1 commit

  • 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
     

27 Sep, 2011

1 commit

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
     

08 Aug, 2011

1 commit

31 Mar, 2011

1 commit

25 Feb, 2011

1 commit

  • 3cf32bba8   OMAP: McBSP: Convert McBSP to platform device model ... Browse Code »

    Implement McBSP as platform device and add support for
    registering through platform device layer using resource
    structures.

    Later in this patch series, OMAP2+ McBSP driver would be modified to
    use hwmod framework after populating the omap2+ hwmod database.

    Signed-off-by: Kishon Vijay Abraham I
    Acked-by: Peter Ujfalusi
    Acked-by: Jarkko Nikula
    Acked-by: Mark Brown
    Signed-off-by: Tony Lindgren

    Kishon Vijay Abraham I
     

18 Dec, 2010

1 commit

  • 6bc56aaec   omap: remove dead wdt code in plat-omap/devices.c ... Browse Code »

    Commit f2ce62312650 (OMAP: WDT: Split OMAP1 and OMAP2PLUS device
    registration) removed omap_init_wdt and related structures from
    plat-omap/devices.c. However a subsequent commit or merge
    seems to have reintroduced these by accident. The caller of
    omap_init_wdt was also removed by that commit, and this did
    not get restored. So we have the following build warning now:

    CC arch/arm/plat-omap/devices.o
    arch/arm/plat-omap/devices.c:252: warning: 'omap_init_wdt' defined but not used

    Fix this by removing this dead code.

    Signed-off-by: Anand Gadiyar
    Cc: Tony Lindgren
    Signed-off-by: Tony Lindgren

    Anand Gadiyar
     

11 Nov, 2010

1 commit

  • 89346f950   omap: dsp: remove shm from normal memory ... Browse Code »

    Also, don't be picky about the location, which incidentally fixes the
    build since MEMBLOCK_REAL_LIMIT is gone on 2.6.37.

    arch/arm/plat-omap/devices.c: In function 'omap_dsp_reserve_sdram_memblock':
    arch/arm/plat-omap/devices.c:287: error: 'MEMBLOCK_REAL_LIMIT'
    undeclared (first use in this function)

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

    Felipe Contreras
     

29 Oct, 2010

1 commit

09 Oct, 2010

1 commit

  • aa218dafd   OMAP: split plat-omap/common.c ... Browse Code »

    Split plat-omap/common.c into three pieces:

    1. the 32KiHz sync timer and clocksource code, which now lives in
    plat-omap/counter_32k.c;

    2. the OMAP2+ common code, which has been moved to mach-omap2/common.c;

    3. and the remainder of the OMAP-wide common code, which includes the
    deprecated ATAGs code and a deprecated video RAM reservation function.

    The primary motivation for doing this is to move the OMAP2+-specific parts
    into an OMAP2+-specific file, so that build breakage related to the
    System Control Module code can be resolved.

    Benoît Cousson suggested a new filename and found
    some bugs in the counter_32k.c comments - thanks Benoît.

    Signed-off-by: Paul Walmsley
    Cc: Benoît Cousson

    Paul Walmsley
     

06 Oct, 2010

1 commit

  • 90173882e   omap: add dsp platform device ... Browse Code »

    Otherwise tidspbridge cannot work.

    It looks like this was dropped in the conversion to staging. I took the
    liberty of doing some cleaning up.

    Signed-off-by: Felipe Contreras
    Acked-by: Tony Lindgren
    Signed-off-by: Greg Kroah-Hartman

    Felipe Contreras
     

30 Sep, 2010

1 commit

  • f2ce62312   OMAP: WDT: Split OMAP1 and OMAP2PLUS device registration ... Browse Code »

    This patch splits omap_init_wdt() into separate omap_init_wdt()
    functions under mach-omap1 and mach-omap2 and set them up with
    subsys_initcall.

    Also it uses omap_device_build() API instead of
    platform_device_register() for watchdog timer device registration
    for OMAP2plus chips.

    For OMAP2plus chips, the device specific data defined in centralized
    hwmod database will be used.

    Signed-off-by: Charulatha V
    Acked-by: Cousson, Benoit
    Signed-off-by: Kevin Hilman

    Varadarajan, Charulatha
     

05 Jul, 2010

2 commits

  • ab6f77519   Removing dead OMAP_DSP ... Browse Code »

    OMAP_DSP doesn't exist in Kconfig, therefore removing all
    references for it from the source code.

    Signed-off-by: Christoph Egger
    [tony@atomide.com: updated to apply on top of already queued patches]
    Signed-off-by: Tony Lindgren

    Christoph Egger
     
  • 93c43f256   omap: mux: Do keypad muxing in board-*.c files ... Browse Code »

    This way we get pin muxing out of plat-omap and can convert H4 to use the
    new mux functions.

    Note that it should be safe to assume we can mux all the keypad pins
    except on H4 which may have Menelaus connected.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

24 Feb, 2010

1 commit

  • 5772ca7d7   omap4: Use irq line defines from irq-44xx.h ... Browse Code »

    This patch removes all the omap4 specific irq line
    defines from plat/irqs.h and includes auto-generated
    irqs-44xx.h
    All the legacy naming style defines are replaced with the one
    from irqs-44xx.h

    Signed-off-by: Santosh Shilimkar
    Reviewed-by: Kevin Hilman
    Reviewed-by: Paul Walmsley
    [tony@atomide.com: updated to compile with usb-musb.c]
    Signed-off-by: Tony Lindgren

    Santosh Shilimkar
     

16 Feb, 2010

2 commits

12 Dec, 2009

1 commit

21 Oct, 2009

1 commit

  • ce491cf85   omap: headers: Move remaining headers from include/mach to include/plat ... Browse Code »

    Move the remaining headers under plat-omap/include/mach
    to plat-omap/include/plat. Also search and replace the
    files using these headers to include using the right path.

    This was done with:

    #!/bin/bash
    mach_dir_old="arch/arm/plat-omap/include/mach"
    plat_dir_new="arch/arm/plat-omap/include/plat"
    headers=$(cd $mach_dir_old && ls *.h)
    omap_dirs="arch/arm/*omap*/ \
    drivers/video/omap \
    sound/soc/omap"
    other_files="drivers/leds/leds-ams-delta.c \
    drivers/mfd/menelaus.c \
    drivers/mfd/twl4030-core.c \
    drivers/mtd/nand/ams-delta.c"

    for header in $headers; do
    old="#include

    Tony Lindgren
     

08 Oct, 2009

1 commit

29 May, 2009

1 commit

  • 44169075e   ARM: OMAP4: Add minimal support for omap4 ... Browse Code »

    This patch adds the support for OMAP4. The platform and machine specific
    headers and sources updated for OMAP4430 SDP platform.

    OMAP4430 is Texas Instrument's SOC based on ARM Cortex-A9 SMP architecture.
    It's a dual core SOC with GIC used for interrupt handling and SCU for cache
    coherency.

    Signed-off-by: Santosh Shilimkar
    Signed-off-by: Tony Lindgren

    Santosh Shilimkar
     

24 Mar, 2009

1 commit

30 Jan, 2009

1 commit

11 Dec, 2008

1 commit

  • d88746652   omap mmc: Add better MMC low-level init ... Browse Code »

    This will simplify the MMC low-level init, and make it more
    flexible to add support for a newer MMC controller in the
    following patches.

    The patch rearranges platform data and gets rid of slot vs
    controller confusion in the old data structures. Also fix
    device id numbering in the clock code.

    Some code snippets are based on an earlier patch by
    Russell King .

    Cc: Pierre Ossman
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

16 Oct, 2008

1 commit

15 Oct, 2008

4 commits

13 Oct, 2008

1 commit

  • 94a9f8ad3   Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] orion5x_wdt.c: add spinlocking
    [WATCHDOG] Orion: add hardware watchdog support
    [WATCHDOG] omap_wdt.c: cleanup a bit omap_wdt.c
    [WATCHDOG] omap_wdt.c: another ioremap() fix
    [WATCHDOG] omap_wdt.c: sync linux-omap changes
    [WATCHDOG] Add AT91SAM9X watchdog
    [WATCHDOG] Add driver for winbond w83697ug/uf watchdog feature
    [WATCHDOG] add watchdog driver IT8716 IT8726 IT8712J/K

    Linus Torvalds
     

12 Oct, 2008

1 commit

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

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
    [ARM] 5300/1: fixup spitz reset during boot
    [ARM] 5295/1: make ZONE_DMA optional
    [ARM] 5239/1: Palm Zire 72 power management support
    [ARM] 5298/1: Drop desc_handle_irq()
    [ARM] 5297/1: [KS8695] Fix two compile-time warnings
    [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
    [ARM] pxa: allow multi-machine PCMCIA builds
    [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
    [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
    [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
    [ARM] pxa/zylonite: add support for USB OHCI
    [ARM] ohci-pxa27x: use ioremap() and offset for register access
    [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
    [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
    [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
    [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
    [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
    [ARM] pxa: simplify DMA register definitions
    [ARM] pxa: make additional DCSR bits valid for PXA3xx
    [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
    ...

    Fixed up conflicts in
    arch/arm/mach-versatile/core.c
    sound/soc/pxa/pxa2xx-ac97.c
    sound/soc/pxa/pxa2xx-i2s.c
    manually.

    Linus Torvalds
     

10 Oct, 2008

2 commits

09 Oct, 2008

1 commit

  • cc26b3b01   ARM: OMAP3: Add minimal omap3430 support ... Browse Code »

    Add minimal omap3430 support based on earlier patches from
    Syed Mohammed Khasim. Also merge in omap34xx SRAM support
    from Karthik Dasu and use consistent naming for sram init
    functions.

    Also do following changes that make 34xx support usable:

    - Remove unused sram.c functions for 34xx

    - Rename IRQ_SIR_IRQ to INTCPS_SIR_IRQ and define it locally
    in entry-macro.S

    - Update mach-omap2/io.c to support 2420, 2430, and 34xx

    - Also merge in 34xx GPMC changes to add fields wr_access and
    wr_data_mux_bus from Adrian Hunter

    - Remove memory initialization call omap2_init_memory() until
    until more generic memory initialization patches are posted.
    It's OK to rely on bootloader initialization until then.

    Signed-off-by: Syed Mohammed, Khasim
    Signed-off-by: Karthik Dasu
    Signed-off-by: Adrian Hunter
    Signed-off-by: Tony Lindgren

    Syed Mohammed, Khasim
     

06 Oct, 2008

1 commit

  • 646e3ed1a   ARM: OMAP2: Misc updates from linux-omap tree ... Browse Code »

    Misc updates from linux-omap tree, mostly to update common
    device initialization and add missing defines from linux-omap
    tree. Also some changes to make room for adding 34xx in
    following patches.

    Note that the I2C resources are now set up in
    arch/arm/plat-omap/i2c.c helper, and can be removed
    from devices.c.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

18 Sep, 2008

1 commit

  • 7e8bc3c6d   [ARM] omap: back out 'internal_clock' support ... Browse Code »

    The structures weren't ready for this change:

    arch/arm/plat-omap/devices.c:320: error: 'struct omap_mmc_conf' has no member named 'internal_clock'
    arch/arm/plat-omap/devices.c:326: error: implicit declaration of function 'omap_ctrl_readl'
    arch/arm/plat-omap/devices.c:326: error: 'OMAP2_CONTROL_DEVCONF0' undeclared (first use in this function)
    arch/arm/plat-omap/devices.c:328: error: implicit declaration of function 'omap_ctrl_writel'

    Signed-off-by: Russell King

    Russell King