10 Apr, 2013

1 commit


22 Mar, 2013

1 commit

  • Fix the following build regression in 3.9-rc1 by including
    :

    drivers/video/omap/omapfb_main.c: In function 'set_fb_var':
    drivers/video/omap/omapfb_main.c:505:3: error: implicit declaration of function 'cpu_is_omap15xx' [-Werror=implicit-function-declaration]

    Signed-off-by: Aaro Koskinen
    Signed-off-by: Tomi Valkeinen

    Aaro Koskinen
     

05 Mar, 2013

1 commit

  • Commit 16559ae4 (kgdb: remove #include from kgdb.h)
    had a side effect of breaking omap1_defconfig build as some headers
    were included indirectly:

    arch/arm/mach-omap1/board-h2.c:249: error: ‘INT_KEYBOARD’ undeclared here (not in a function)
    ...

    This worked earlier as linux/serial_8250.h included linux/serial_core.h,
    via linux/serial_8250.h from linux/kgdb.h. Fix this by including the
    necessary headers directly.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

22 Jan, 2013

1 commit

  • The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
    while now and is almost always enabled by default. As agreed during the
    Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

    CC: Tomi Valkeinen
    CC: Florian Tobias Schandinat
    Signed-off-by: Kees Cook
    Signed-off-by: Greg Kroah-Hartman

    Kees Cook
     

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,
    __devinitconst, 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
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

01 Dec, 2012

1 commit

  • Based on earlier discussions[1] we attempted to find a suitable
    location for the omap DMA header in commit 2b6c4e73 (ARM: OMAP:
    DMA: Move plat/dma.h to plat-omap/dma-omap.h) until the conversion
    to dmaengine is complete.

    Unfortunately that was before I was able to try to test compile
    of the ARM multiplatform builds for omap2+, and the end result
    was not very good.

    So I'm creating yet another all over the place patch to cut the
    last dependency for building omap2+ for ARM multiplatform. After
    this, we have finally removed the driver dependencies to the
    arch/arm code, except for few drivers that are being worked on.

    The other option was to make the path
    to work, but we'd have to add some new header directory to for
    multiplatform builds.

    Or we would have to manually include arch/arm/plat-omap/include
    again from arch/arm/Makefile for omap2+.

    Neither of these alternatives sound appealing as they will
    likely lead addition of various other headers exposed to the
    drivers, which we want to avoid for the multiplatform kernels.

    Since we already have a minimal include/linux/omap-dma.h,
    let's just use that instead and add a note to it to not
    use the custom omap DMA functions any longer where possible.

    Note that converting omap DMA to dmaengine depends on
    dmaengine supporting automatically incrementing the FIFO
    address at the device end, and converting all the remaining
    legacy drivers. So it's going to be few more merge windows.

    [1] https://patchwork.kernel.org/patch/1519591/#

    cc: Russell King
    cc: Kevin Hilman
    cc: "Benoît Cousson"
    cc: Herbert Xu
    cc: "David S. Miller"
    cc: Vinod Koul
    cc: Dan Williams
    cc: Mauro Carvalho Chehab
    cc: Laurent Pinchart
    cc: Guennadi Liakhovetski
    cc: David Woodhouse
    cc: Kyungmin Park
    cc: Greg Kroah-Hartman
    cc: Tomi Valkeinen
    cc: Florian Tobias Schandinat
    cc: Hans Verkuil
    cc: Vaibhav Hiremath
    cc: Lokesh Vutla
    cc: Rusty Russell
    cc: Artem Bityutskiy
    cc: Afzal Mohammed
    cc: linux-crypto@vger.kernel.org
    cc: linux-media@vger.kernel.org
    cc: linux-mtd@lists.infradead.org
    cc: linux-usb@vger.kernel.org
    cc: linux-fbdev@vger.kernel.org
    Acked-by: Felipe Balbi
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

18 Oct, 2012

1 commit

  • There's no need to have this file in plat/fpga.h. We can
    make it local to plat-omap replacing fpga_read/write
    functions directly with readb/writeb as that's how
    they are already defined in fpga.h.

    Note that 2420 based H4 is also using the fpga, so let's
    keep the led support around in plat-omap until we flip
    over mach-omap2 to device tree.

    Cc: Tomi Valkeinen
    Cc: Florian Tobias Schandinat
    Cc: linux-fbdev@vger.kernel.org
    Cc: Felipe Balbi
    Cc: linux-usb@vger.kernel.org
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

16 Oct, 2012

1 commit


12 Oct, 2012

1 commit

  • Pull fbdev updates from Florian Tobias Schandinat:
    "This includes:
    - large updates for OMAP
    - basic OMAP5 DSS support for DPI and DSI outputs
    - large cleanups and restructuring
    - some update to Exynos and da8xx-fb
    - removal of the pnx4008 driver (arch removed)
    - various other small patches"

    Fix up some trivial conflicts (mostly just include line changes, but
    also some due to the renaming of the deferred work functions by Tejun).

    * tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
    gbefb: fix compile error
    video: mark nuc900fb_map_video_memory as __devinit
    video/mx3fb: set .owner to prevent module unloading while being used
    video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
    drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
    drivers/video/savage/savagefb_driver.c: fix error return code
    video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
    da8xx-fb: save and restore LCDC context across suspend/resume cycle
    da8xx-fb: add pm_runtime support
    video/udlfb: fix line counting in fb_write
    OMAPDSS: add missing include for string.h
    OMAPDSS: DISPC: Configure color conversion coefficients for writeback
    OMAPDSS: DISPC: Add manager like functions for writeback
    OMAPDSS: DISPC: Configure writeback FIFOs
    OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
    OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
    OMAPDSS: DISPC: Add function to set channel in for writeback
    OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
    OMAPDSS: DISPC: Downscale chroma if plane is writeback
    OMAPDSS: DISPC: Configure input and output sizes for writeback
    ...

    Linus Torvalds
     

21 Sep, 2012

2 commits

  • This is only used by omap1.

    And to fix things properly, this should not be included
    from the drivers at all.

    Acked-by: Janusz Krzysztofik
    Cc: Tomi Valkeinen
    Cc: linux-fbdev@vger.kernel.org
    Cc: Artem Bityutskiy
    Cc: linux-mtd@lists.infradead.org
    Cc: Dmitry Torokhov
    Cc: linux-input@vger.kernel.org
    Cc: Peter Ujfalusi
    Cc: Liam Girdwood
    Acked-by: Mark Brown
    Cc: alsa-devel@alsa-project.org
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • We are moving omap2+ to use the device tree based pinctrl-single.c
    and will be removing the old mux framework. This will remove the
    omap1 specific parts from plat-omap.

    Acked-by: Felipe Balbi
    Cc: Grant Likely
    Cc: Alan Stern
    Cc: Greg Kroah-Hartman
    Cc: Richard Purdie
    Cc: Florian Tobias Schandinat
    Cc: Tomi Valkeinen
    Cc: linux-usb@vger.kernel.org
    Cc: linux-pcmcia@lists.infradead.org
    Cc: spi-devel-general@lists.sourceforge.net
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

19 Sep, 2012

1 commit

  • Platform data for device drivers should be defined in
    include/linux/platform_data/*.h, not in the architecture
    and platform specific directories.

    This moves such data out of the omap include directories

    Signed-off-by: Arnd Bergmann
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Nicolas Pitre
    Acked-by: Tony Lindgren
    Cc: Kevin Hilman
    Cc: "Benoît Cousson"
    Cc: Dmitry Torokhov
    Cc: David Woodhouse
    Cc: Kyungmin Park
    Cc: Ohad Ben-Cohen
    Cc: Grant Likely
    Cc: Omar Ramirez Luna
    Cc: Tomi Valkeinen
    Cc: Florian Tobias Schandinat
    Cc: Peter Ujfalusi
    Cc: Jarkko Nikula
    Cc: Liam Girdwood
    Cc: Artem Bityutskiy
    Cc: Jean Pihet
    Cc: J Keerthy
    Cc: linux-omap@vger.kernel.org

    Arnd Bergmann
     

08 Sep, 2012

2 commits


23 Apr, 2012

1 commit


28 Mar, 2012

1 commit

  • Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
    "These changes are all specific to one board only. We're trying to
    keep the number of board files low, but generally board level updates
    are ok on platforms that are working on moving towards DT based
    probing, which will eventually lead to removing them.

    The board-ams-delta.c board file gets a conflict between the removal
    of ams_delta_config and the addition of a lot of other data. The
    Kconfig file has two changes in the same line, and in exynos, the
    power domain cleanup conflicts with the addition of the image sensor
    device.

    Signed-off-by: Arnd Bergmann
    [olof: Amended a fix for a mismerge to board-omap4panda.c]
    Signed-off-by: Olof Johansson "

    Fixed up some fairly trivial conflicts manually.

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
    i.MX35-PDK: Add Camera support
    ARM : mx35: 3ds-board: add framebuffer device
    pxa/hx4700: Remove pcmcia platform_device structure
    ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
    ARM: pxa/hx4700: Remove unwanted request for GPIO105
    ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
    ARM: EXYNOS: Register JPEG on nuri
    ARM: EXYNOS: Register JPEG on universal_c210
    ARM: S5PV210: Enable JPEG on SMDKV210
    ARM: S5PV210: Add JPEG board definition
    ARM: EXYNOS: Enable JPEG on Origen
    ARM: EXYNOS: Enable JPEG on SMDKV310
    ARM: EXYNOS: Add __init attribute to universal_camera_init()
    ARM: EXYNOS: Add __init attribute to nuri_camera_init()
    ARM: S5PV210: Enable FIMC on SMDKC110
    ARM: S5PV210: Enable FIMC on SMDKV210
    ARM: S5PV210: Enable MFC on SMDKC110
    ARM: S5PV210: Enable MFC on SMDKV210
    ARM: EXYNOS: Enable G2D on SMDKV310
    ARM: tegra: update defconfig
    ...

    Linus Torvalds
     

20 Mar, 2012

1 commit


02 Mar, 2012

1 commit

  • The main purpose of this patch is to fix several section mismatch
    warnings from the board file and a few board specific drivers,
    introduced with recent Amstrad Delta patch series, some of them rising
    up only when building with CONFIG_MODULES not set.

    While being at it, section tagging of all init data found in the board
    file have been revised and hopefully corrected and/or optimized.

    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Tony Lindgren

    Janusz Krzysztofik
     

23 Feb, 2012

5 commits

  • Now that the old omapfb driver is only omap1 display driver, there's no
    need to check if the arch is omap1. This patch removes the few remaining
    checks for the arch.

    Signed-off-by: Tomi Valkeinen
    Acked-by: Tony Lindgren

    Tomi Valkeinen
     
  • include/linux/omapfb.h contains structs that are used only by the
    omapfb driver. Move the structs into drivers/video/omap/omapfb.h.

    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     
  • omapfb driver used platform_data to get fb memory areas and formats
    defined by the board file.

    This patch removes omapfb's (both old and new omapfb) use of the
    memory data in platform_data, because:

    - No board uses them currently
    - It's not board file's job to define things like amount of default
    framebuffer memory. These should come from the bootloader via command
    line parameters.

    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     
  • In an effort to clean up the old omapfb driver, this patch removes
    HWA742 (the display chip used in N770) platform data. This can be done
    as N770 is the only user of HWA742, and the platform data contains only
    one field, te_connected, which we can just presume to be true in the
    HWA742 driver.

    This allows us to remove omapfb_set_ctrl_platform_data(), and the
    mechanism to pass the platform data, in a later patch.

    Signed-off-by: Tomi Valkeinen
    Acked-by: Tony Lindgren

    Tomi Valkeinen
     
  • OMAP SRAM can be used as video memory on OMAP1 and 2. However, there
    usually is very little SRAM available, thus limiting its use, and no
    board supported by the kernel currently uses it.

    This patch removes the use of SRAM as video ram for the old omapfb
    driver to simplify memory handling.

    Signed-off-by: Tomi Valkeinen
    Acked-by: Tony Lindgren

    Tomi Valkeinen
     

22 Feb, 2012

2 commits


29 Jan, 2012

2 commits

  • This patch converts the drivers in drivers/video/* to use the
    module_spi_driver() macro which makes the code smaller and a bit simpler.

    Signed-off-by: Axel Lin
    Cc: Imre Deak
    Cc: Roger Quadros
    Cc: Steve Sakoman
    Cc: Erik Gilling
    Cc: Gražvydas Ignotas
    Signed-off-by: Florian Tobias Schandinat

    Axel Lin
     
  • Using gpio_request_one can make the code simpler because it can
    set the direction and initial value in one shot.

    Signed-off-by: Jingoo Han
    Acked-by: Tomi Valkeinen
    Cc: Michael Hennerich
    Cc: Pavel Machek
    Signed-off-by: Florian Tobias Schandinat

    Jingoo Han
     

20 Jan, 2012

1 commit


15 Jan, 2012

1 commit

  • * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (175 commits)
    module_param: make bool parameters really bool (drivers/video/i810)
    Revert "atmel_lcdfb: Adjust HFP calculation so it matches the manual."
    OMAPDSS: HDMI: Disable DDC internal pull up
    OMAPDSS: HDMI: Move duplicate code from boardfile
    OMAPDSS: add OrtusTech COM43H4M10XTC display support
    OMAP: DSS2: Support for UMSH-8173MD TFT panel
    ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver
    OMAPDSS: HDMI: Create function to enable HDMI audio
    ASoC: OMAP: HDMI: Correct signature of ASoC functions
    ASoC: OMAP: HDMI: Introduce driver data for audio codec
    grvga: fix section mismatch warnings
    video: s3c-fb: Don't keep device runtime active when open
    video: s3c-fb: Hold runtime PM references when touching registers
    video: s3c-fb: Take a runtime PM reference when unblanked
    video: s3c-fb: Disable runtime PM in error paths from probe
    video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer
    video: s3c-fb: Make runtime PM functional again
    drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()
    drivers/video: fsl-diu-fb: add default platform ops functions
    drivers/video: fsl-diu-fb: remove broken reference count enabling the display
    ...

    Linus Torvalds
     

13 Jan, 2012

1 commit


09 Jan, 2012

1 commit

  • * '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
     

08 Jan, 2012

1 commit


02 Jan, 2012

3 commits


23 Dec, 2011

1 commit


04 Dec, 2011

1 commit

  • In ancient times it was necessary to manually initialize the bus field of an
    spi_driver to spi_bus_type. These days this is done in spi_driver_register(),
    so we can drop the manual assignment.

    The patch was generated using the following coccinelle semantic patch:
    //
    @@
    identifier _driver;
    @@
    struct spi_driver _driver = {
    .driver = {
    - .bus = &spi_bus_type,
    },
    };
    //

    Signed-off-by: Lars-Peter Clausen
    Acked-by: Tomi Valkeinen
    Cc: linux-fbdev@vger.kernel.org
    Cc: linux-omap@vger.kernel.org
    Signed-off-by: Florian Tobias Schandinat

    Lars-Peter Clausen
     

18 Nov, 2011

1 commit


01 Nov, 2011

1 commit


31 Oct, 2011

1 commit

  • * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
    video: platinumfb: Add __devexit_p at necessary place
    drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
    drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
    drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
    drivers/video: fsl-diu-fb: remove unused panel operating mode support
    drivers/video: fsl-diu-fb: use an enum for the AOI index
    drivers/video: fsl-diu-fb: add several new video modes
    drivers/video: fsl-diu-fb: remove broken screen blanking support
    drivers/video: fsl-diu-fb: move some definitions out of the header file
    drivers/video: fsl-diu-fb: fix some ioctls
    video: da8xx-fb: Increased resolution configuration of revised LCDC IP
    OMAPDSS: picodlp: add missing #include
    fb: fix au1100fb bitrot.
    mx3fb: fix NULL pointer dereference in screen blanking.
    video: irq: Remove IRQF_DISABLED
    smscufx: change edid data to u8 instead of char
    OMAPDSS: DISPC: zorder support for DSS overlays
    OMAPDSS: DISPC: VIDEO3 pipeline support
    OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
    video/omap: fix build dependencies
    ...

    Fix up conflicts in:
    - drivers/staging/xgifb/XGI_main_26.c
    Changes to XGIfb_pan_var()
    - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
    Removed (or in the case of apollon.c, merged into the generic
    DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)

    Linus Torvalds