04 Jan, 2013

1 commit

  • CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
    markings need to be removed.

    This change removes the use of __devinit, __devexit_p, __devinitdata,
    and __devexit from these drivers.

    Based on patches originally written by Bill Pemberton, but redone by me
    in order to handle some of the coding style issues better, by hand.

    Cc: Bill Pemberton
    Cc: Russell King
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

20 Dec, 2012

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "This is a batch of fixes for arm-soc platforms, most of it is for OMAP
    but there are others too (i.MX, Tegra, ep93xx). Fixes warnings, some
    broken platforms and drivers, etc. A bit all over the map really."

    There was some concern about commit 68136b10 ("RM: sunxi: Change device
    tree naming scheme for sunxi"), but Tony says:
    "Looks like that's trivial to fix as needed, no need to rebuild the
    branch to fix that AFAIK.

    The fix can be done once Olof is available online again.

    Linus, I suggest that you go ahead and pull this if there are no other
    issues with this branch."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
    ARM: sunxi: Change device tree naming scheme for sunxi
    ARM: ux500: fix missing include
    ARM: u300: delete custom pin hog code
    ARM: davinci: fix build break due to missing include
    ARM: exynos: Fix warning due to missing 'inline' in stub
    ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
    ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
    ARM: dts: mx27: Fix the AIPI bus for FEC
    ARM: OMAP2+: common: remove use of vram
    ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
    ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists
    ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider
    ARM: OMAP4: Fix EMU clock domain always on
    ARM: OMAP4460: Workaround ABE DPLL failing to turn-on
    ARM: OMAP4: Enhance support for DPLLs with 4X multiplier
    ARM: OMAP4: Add function table for non-M4X dplls
    ARM: OMAP4: Update timer clock aliases
    ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
    ARM: dts: Add build target for omap4-panda-a4
    ARM: dts: OMAP2420: Correct H4 board memory size
    ...

    Linus Torvalds
     

18 Dec, 2012

2 commits

  • rtc-omap driver is now capable of handling kicker mechanism, hence remove
    kicker handling at platform level, instead provide proper device name so
    that driver can handle kicker mechanism by itself

    Signed-off-by: Afzal Mohammed
    Acked-by: Sekhar Nori
    Cc: Grant Likely
    Cc: Sekhar Nori
    Cc: Kevin Hilman
    Cc: Russell King
    Cc: Alessandro Zummo
    Cc: Daniel Mack
    Cc: Vaibhav Hiremath
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Afzal Mohammed
     
  • arch/arm/mach-davinci/board-da850-evm.c: In function 'da850_evm_init':
    arch/arm/mach-davinci/board-da850-evm.c:1516:2: error: implicit declaration of function 'sram_get_gen_pool' [-Werror=implicit-function-declaration]
    arch/arm/mach-davinci/board-da850-evm.c:1516:31: warning: assignment makes pointer from integer without a cast [enabled by default]

    Signed-off-by: Olof Johansson
    Cc: Sekhar Nori
    Cc: Kevin Hilman

    Olof Johansson
     

16 Dec, 2012

1 commit

  • Pull fbdev changes from Tomi Valkeinen:
    "OMAPDSS changes, including:
    - use dynanic debug prints
    - OMAP platform dependency removals
    - Creation of compat-layer, helping us to improve omapdrm
    - Misc cleanups, aiming to make omadss more in line with the upcoming
    common display framework

    Exynos DP changes for the 3.8 merge window:
    - Device Tree support for Samsung Exynos DP
    - SW Link training is cleaned up.
    - HPD interrupt is supported.

    Samsung Framebuffer changes for the 3.8 merge window:
    - The bit definitions of header file are updated.
    - Some minor typos are fixed.
    - Some minor bugs of s3c_fb_check_var() are fixed.

    FB related changes for SH Mobile, Freescale DIU

    Add support for the Solomon SSD1307 OLED Controller"

    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
    OMAPDSS: fix TV-out issue with DSI PLL
    Revert "OMAPFB: simplify locking"
    OMAPFB: remove silly loop in fb2display()
    OMAPFB: fix error handling in omapfb_find_best_mode()
    OMAPFB: use devm_kzalloc to allocate omapfb2_device
    OMAPDSS: DISPC: remove dispc fck uses
    OMAPDSS: DISPC: get dss clock rate from dss driver
    drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
    drivers/video: add support for the Solomon SSD1307 OLED Controller
    OMAPDSS: use omapdss_compat_init() in other drivers
    OMAPDSS: export dispc functions
    OMAPDSS: export dss_feat functions
    OMAPDSS: export dss_mgr_ops functions
    OMAPDSS: separate compat files in the Makefile
    OMAPDSS: move display sysfs init to compat layer
    OMAPDSS: DPI: use dispc's check_timings
    OMAPDSS: DISPC: add dispc_ovl_check()
    OMAPDSS: move irq handling to dispc-compat
    OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
    OMAPDSS: move blocking mgr enable/disable to compat layer
    ...

    Conflicts:
    arch/arm/mach-davinci/devices-da8xx.c
    arch/arm/plat-omap/common.c
    drivers/media/platform/omap/omap_vout.c

    Linus Torvalds
     

14 Dec, 2012

2 commits

  • Pull sound updates from Takashi Iwai:
    "This update contains a fairly wide range of changes all over in sound
    subdirectory, mainly because of UAPI header moves by David and __dev*
    annotation removals by Bill. Other highlights are:

    - Introduced the support for wallclock timestamps in ALSA PCM core

    - Add the poll loop implementation for HD-audio jack detection

    - Yet more VGA-switcheroo fixes for HD-audio

    - New VIA HD-audio codec support

    - More fixes on resource management in USB audio and MIDI drivers

    - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
    Roland VG-99, etc

    - Add support for FastTrack C400 usb-audio

    - Clean ups in many drivers regarding firmware loading

    - Add PSC724 Ultiimate Edge support to ice1712

    - A few hdspm driver updates

    - New Stanton SCS.1d/1m FireWire driver

    - Standardisation of the logging in ASoC codes

    - DT and dmaengine support for ASoC Atmel

    - Support for Wolfson ADSP cores

    - New drivers for Freescale/iVeia P1022 and Maxim MAX98090

    - Lots of other ASoC driver fixes and developments"

    Fix up trivial conflicts. And go out on a limb and assume the dts file
    'status' field of one of the conflicting things was supposed to be
    "disabled", not "disable" like in pretty much all other cases.

    * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
    ALSA: hda - Move runtime PM check to runtime_idle callback
    ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
    ALSA: hda - Avoid doubly suspend after vga switcheroo
    ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
    ALSA: hda - Check validity of CORB/RIRB WP reads
    ALSA: hda - use usleep_range in link reset and change timeout check
    ALSA: HDA: VIA: Add support for codec VT1808.
    ALSA: HDA: VIA Add support for codec VT1705CF.
    ASoC: codecs: remove __dev* attributes
    ASoC: utils: remove __dev* attributes
    ASoC: ux500: remove __dev* attributes
    ASoC: txx9: remove __dev* attributes
    ASoC: tegra: remove __dev* attributes
    ASoC: spear: remove __dev* attributes
    ASoC: sh: remove __dev* attributes
    ASoC: s6000: remove __dev* attributes
    ASoC: OMAP: remove __dev* attributes
    ASoC: nuc900: remove __dev* attributes
    ASoC: mxs: remove __dev* attributes
    ASoC: kirkwood: remove __dev* attributes
    ...

    Linus Torvalds
     
  • Pull ARM SoC device tree conversions and enablement from Olof Johansson:
    "Continued device tree conversion and enablement across a number of
    platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
    smaller series as well.

    ux500 has seen continued conversion for platforms. Several platforms
    have seen pinctrl-via-devicetree conversions for simpler
    multiplatform. Tegra is adding data for new devices/drivers, and
    Exynos has a bunch of new bindings and devices added as well.

    So, pretty much the same progression in the right direction as the
    last few releases."

    Fix up conflicts as per Olof.

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
    ARM: ux500: Rename dbx500 cpufreq code to be more generic
    ARM: dts: add missing ux500 device trees
    ARM: ux500: Stop registering the PCM driver from platform code
    ARM: ux500: Move board specific GPIO info out to subordinate DTS files
    ARM: ux500: Disable the MMCI gpio-regulator by default
    ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
    ARM: Kirkwood: Add support LED of OpenBlocks A6
    ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
    ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
    ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
    ARM: kirkwood: Add support DT of second I2C bus
    ARM: kirkwood: Convert mplcec4 board to pinctrl
    ARM: Kirkwood: Convert km_kirkwood to pinctrl
    ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
    ARM: Kirkwood: Convert IX2-200 to pinctrl.
    ARM: Kirkwood: Convert lsxl boards to pinctrl.
    ARM: Kirkwood: Convert ib62x0 to pinctrl.
    ARM: Kirkwood: Convert GoFlex Net to pinctrl.
    ARM: Kirkwood: Convert dreamplug to pinctrl.
    ARM: Kirkwood: Convert dockstar to pinctrl.
    ...

    Linus Torvalds
     

13 Dec, 2012

4 commits

  • Pull ARM SoC board updates from Olof Johansson:
    "This branch contains a set of various board updates for ARM platforms.

    A few shmobile platforms that are stale have been removed, some
    defconfig updates for various boards selecting new features such as
    pinctrl subsystem support, and various updates enabling peripherals,
    etc."

    Fix up conflicts mostly as per Olof.

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
    ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
    ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore
    ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
    ARM: Dove: update defconfig
    ARM: Kirkwood: update defconfig for new boards
    arm: orion5x: add DT related options in defconfig
    arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
    arm: orion5x: basic Device Tree support
    arm: orion5x: mechanical defconfig update
    ARM: kirkwood: Add support for the MPL CEC4
    arm: kirkwood: add support for ZyXEL NSA310
    ARM: Kirkwood: new board USI Topkick
    ARM: kirkwood: use gpio-fan DT binding on lsxl
    ARM: Kirkwood: add Netspace boards to defconfig
    ARM: kirkwood: DT board setup for Network Space Mini v2
    ARM: kirkwood: DT board setup for Network Space Lite v2
    ARM: kirkwood: DT board setup for Network Space v2 and parents
    leds: leds-ns2: add device tree binding
    ARM: Kirkwood: Enable the second I2C bus
    ARM: mmp: select pinctrl driver
    ...

    Linus Torvalds
     
  • Pull ARM SoC updates from Olof Johansson:
    "This contains the bulk of new SoC development for this merge window.

    Two new platforms have been added, the sunxi platforms (Allwinner A1x
    SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
    series of ARMv7 platforms from them, where the hope is that we can
    keep the platform code generic enough to have them all share one mach
    directory. The new Broadcom platform is contributed by Christian
    Daudt.

    Highbank has grown support for Calxeda's next generation of hardware,
    ECX-2000.

    clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
    also taken on maintainership of the platform.

    Beyond this there has been a bunch of work from a number of people on
    converting more platforms to IRQ domains, pinctrl conversion, cleanup
    and general feature enablement across most of the active platforms."

    Fix up trivial conflicts as per Olof.

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
    mfd: vexpress-sysreg: Remove LEDs code
    irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
    clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
    irq: versatile: delete dangling variable
    ARM: sunxi: add missing include for mdelay()
    ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
    ARM: dts: add node for PL330 MDMA1 controller for exynos4
    ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
    ARM: EXYNOS: add UART3 to DEBUG_LL ports
    ARM: S3C24XX: Add clkdev entry for camif-upll clock
    ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
    ARM: sunxi: Add missing sun4i.dtsi file
    pinctrl: samsung: Do not initialise statics to 0
    ARM i.MX6: remove gate_mask from pllv3
    ARM i.MX6: Fix ethernet PLL clocks
    ARM i.MX6: rename PLLs according to datasheet
    ARM i.MX6: Add pwm support
    ARM i.MX51: Add pwm support
    ARM i.MX53: Add pwm support
    ARM: mx5: Replace clk_register_clkdev with clock DT lookup
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
    "Cleanup patches for various ARM platforms and some of their associated
    drivers. There's also a branch in here that enables Freescale i.MX to
    be part of the multiplatform support -- the first "big" SoC that is
    moved over (more multiplatform work comes in a separate branch later
    during the merge window)."

    Conflicts fixed as per Olof, including a silent semantic one in
    arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
    omap3xxx_restart(), and a new user of the old name was added).

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
    ARM: omap: fix typo on timer cleanup
    ARM: EXYNOS: Remove unused regs-mem.h file
    ARM: EXYNOS: Remove unused non-dt support for dwmci controller
    ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
    ARM: OMAP3: cm-t3517: use GPTIMER for system clock
    ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
    ARM: SAMSUNG: use devm_ functions for ADC driver
    ARM: EXYNOS: no duplicate mask/unmask in eint0_15
    ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
    ARM: EXYNOS: Remove i2c0 resource information and setting of device names
    ARM: Kirkwood: checkpatch cleanups
    ARM: Kirkwood: Fix sparse warnings.
    ARM: Kirkwood: Remove unused includes
    ARM: kirkwood: cleanup lsxl board includes
    ARM: integrator: use BUG_ON where possible
    ARM: integrator: push down SC dependencies
    ARM: integrator: delete static UART1 mapping
    ARM: integrator: delete SC mapping on the CP
    ARM: integrator: remove static CP syscon mapping
    ARM: integrator: remove static AP syscon mapping
    ...

    Linus Torvalds
     
  • Pull ARM SoC Non-critical bug fixes from Olof Johansson:
    "Simple bug fixes that were not considered important enough for
    inclusion into 3.7, especially those that arrived late during the
    merge window.

    There's also a MAINTAINERS update for the Renesas platforms in here,
    marking Simon Horman as a maintainer and changing the git url to his
    tree."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    Update ARM/SHMOBILE section of MAINTAINERS
    ARM: Fix Kconfig symbols typo for LEDS
    ARM: pxa: add dummy SA1100 rtc clock in pxa25x
    ARM: pxa: fix pxa25x gpio wakeup setting
    ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
    ARM: cns3xxx: drop unnecessary symbol selection
    ARM: vexpress: fix ll debug code when building multiplatform
    ARM: OMAP4: retrigger localtimers after re-enabling gic
    ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
    ARM: OMAP4: PM: add errata support
    ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init()
    ARM: davinci: uncompress.h: bail out if uart not initialized
    ARM: davinci: serial.h: fix uart number in the comment
    ARM: davinci: dm644x evm: move pointer dereference below NULL check
    ARM: vexpress: Make the debug UART detection more specific

    Linus Torvalds
     

02 Dec, 2012

1 commit


27 Nov, 2012

2 commits

  • do clk_get on connection id "fck" to support OMAP based
    platforms having multiple clocks for module. Without this
    driver change clk_get fails on am335x.

    This patch is based on the discussion in community
    http://marc.info/?l=linux-kernel&m=135166018907827&w=2

    Signed-off-by: Manjunathappa
    Cc: Vaibhav Hiremath
    Acked-by: Sekhar Nori
    Signed-off-by: Tomi Valkeinen

    Manjunathappa
     
  • Configure below LCDC configurations to optimal values, also have an
    option configure these optional parameters for platform.
    1) AC bias configuration: Required only for passive panels
    2) Dma_burst_size:
    3) FIFO_DMA_DELAY:
    4) FIFO threshold: Does not apply for da830 LCDC.

    Patch is verified for 16bpp and 24bpp configurations on da830, da850 and
    am335x EVMs.

    Signed-off-by: Manjunathappa, Prakash
    Signed-off-by: Tomi Valkeinen

    Manjunathappa, Prakash
     

26 Nov, 2012

1 commit

  • Merging in mainline back to next/cleanup since it has collected a few
    conflicts between fixes going upstream and some of the cleanup patches.
    Git doesn't auto-resolve some of them, and they're mostly noise so let's
    take care of it locally.

    Conflicts are in:
    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
    arch/arm/plat-omap/i2c.c
    drivers/video/omap2/dss/dss.c

    Signed-off-by: Olof Johansson

    Olof Johansson
     

20 Nov, 2012

2 commits


19 Nov, 2012

1 commit


13 Nov, 2012

2 commits

  • Separate patches from Marek Szyprowski :

    Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
    region") replaced custom consistent memory handling, so setting
    consistent dma memory size is not longer required. This patch series
    cleans sub-architecture platform code to remove all calls to the
    obsolated init_consistent_dma_size() function and finally removes the
    init_consistent_dma_size() stub itself.

    * cleanups/dma:
    ARM: at91: remove obsoleted init_consistent_dma_size()
    ARM: u300: remove obsoleted init_consistent_dma_size()
    ARM: dma-mapping: remove init_consistent_dma_size() stub
    ARM: shmobile: remove obsoleted init_consistent_dma_size()
    ARM: davinci: remove obsoleted init_consistent_dma_size()
    ARM: samsung: remove obsoleted init_consistent_dma_size()

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • Signed-off-by: Marek Szyprowski
    CC: Sekhar Nori
    CC: Kevin Hilman

    Marek Szyprowski
     

30 Oct, 2012

1 commit


29 Oct, 2012

6 commits


27 Oct, 2012

8 commits


26 Oct, 2012

1 commit


24 Oct, 2012

2 commits

  • As a first step towards migrating davinci platforms to use common clock
    framework, replace all instances of clk_enable() with clk_prepare_enable()
    and clk_disable() with clk_disable_unprepare(). Until the platform is
    switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
    adds a might_sleep() call and would work without any issues.

    This will make it easy later to switch to common clk based implementation
    of clk driver from DaVinci specific driver.

    Signed-off-by: Murali Karicheri
    Reviewed-by: Mike Turquette
    Signed-off-by: Sekhar Nori

    m-karicheri2@ti.com
     
  • Remove usage of CONFIG_USB_MUSB_OTG, CONFIG_USB_MUSB_PERIPHERAL
    and CONFIG_USB_MUSB_HOST in arch/arm/mach-davinci/usb.c since these
    are not used anymore and set mode configuration by default to
    MUSB_OTG.

    Signed-off-by: Constantine Shulyupin
    [prakash.pm@ti.com: Tested on DM6446-EVM]
    Acked-by: Manjunathappa, Prakash
    Acked-by: Felipe Balbi
    Signed-off-by: Sekhar Nori

    Constantine Shulyupin
     

22 Oct, 2012

1 commit


14 Oct, 2012

1 commit

  • As suggested by Andrew Morton:

    This is a pet peeve of mine. Any time there's a long list of items
    (header file inclusions, kconfig entries, array initalisers, etc) and
    someone wants to add a new item, they *always* go and stick it at the
    end of the list.

    Guys, don't do this. Either put the new item into a randomly-chosen
    position or, probably better, alphanumerically sort the list.

    lets sort all our select statements alphanumerically. This commit was
    created by the following perl:

    while (<>) {
    while (/\\\s*$/) {
    $_ .= <>;
    }
    undef %selects if /^\s*config\s+/;
    if (/^\s+select\s+(\w+).*/) {
    if (defined($selects{$1})) {
    if ($selects{$1} eq $_) {
    print STDERR "Warning: removing duplicated $1 entry\n";
    } else {
    print STDERR "Error: $1 differently selected\n".
    "\tOld: $selects{$1}\n".
    "\tNew: $_\n";
    exit 1;
    }
    }
    $selects{$1} = $_;
    next;
    }
    if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
    /^endif/ or /^endchoice/)) {
    foreach $k (sort (keys %selects)) {
    print "$selects{$k}";
    }
    undef %selects;
    }
    print;
    }
    if (%selects) {
    foreach $k (sort (keys %selects)) {
    print "$selects{$k}";
    }
    }

    It found two duplicates:

    Warning: removing duplicated S5P_SETUP_MIPIPHY entry
    Warning: removing duplicated HARDIRQS_SW_RESEND entry

    and they are identical duplicates, hence the shrinkage in the diffstat
    of two lines.

    We have four testers reporting success of this change (Tony, Stephen,
    Linus and Sekhar.)

    Acked-by: Jason Cooper
    Acked-by: Tony Lindgren
    Acked-by: Stephen Warren
    Acked-by: Linus Walleij
    Acked-by: Sekhar Nori
    Signed-off-by: Russell King

    Russell King