Eric Lee / smarc-fsl-linux-kernel

15 Jan, 2012

1 commit

  • 51be08419   Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 ... Browse Code »

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

  • 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
     

08 Jan, 2012

1 commit

02 Jan, 2012

3 commits

04 Dec, 2011

1 commit

  • 9056df19c   video: Remove redundant spi driver bus initialization ... Browse Code »

    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

  • acff987d9   Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 ... Browse Code »

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

30 Sep, 2011

4 commits

08 Aug, 2011

1 commit

27 May, 2011

1 commit

  • 829ae2732   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: (33 commits)
    OMAP3: PM: Boot message is not an error, and not helpful, remove it
    OMAP3: cpuidle: change the power domains modes determination logic
    OMAP3: cpuidle: code rework for improved readability
    OMAP3: cpuidle: re-organize the C-states data
    OMAP3: clean-up mach specific cpuidle data structures
    OMAP3 cpuidle: remove useless SDP specific timings
    usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
    usb: otg: OMAP4430: Fixing the omap4430_phy_init function
    usb: musb: am35x: fix compile error when building am35x
    usb: musb: OMAP4430: Power down the PHY during board init
    omap: drop board-igep0030.c
    omap: igep0020: add support for IGEP3
    omap: igep0020: minor refactoring
    omap: igep0020: name refactoring for future merge with IGEP3
    omap: Remove support for omap2evm
    arm: omap2plus: GPIO cleanup
    omap: musb: introduce default board config
    omap: move detection of NAND CS to common-board-devices
    omap: use common initialization for PMIC i2c bus
    omap: consolidate touch screen initialization among different boards
    ...

    Linus Torvalds
     

13 May, 2011

2 commits

31 Mar, 2011

1 commit

22 Mar, 2011

1 commit

11 Mar, 2011

2 commits

  • 08a0a6579   omapfb: Fix linker error in drivers/video/omap/lcd_2430sdp.c ... Browse Code »

    There is a linker error from lcd_2430sdp.c if CONFIG_TWL4030_CORE is not
    set. This can be triggered on OMAP2 builds when OMAP3 or OMAP4 are not set.

    drivers/built-in.o: In function `sdp2430_panel_disable':
    drivers/video/omap/lcd_2430sdp.c:123: undefined reference to `twl_i2c_write_u8'
    drivers/video/omap/lcd_2430sdp.c:124: undefined reference to `twl_i2c_write_u8'
    drivers/built-in.o: In function `sdp2430_panel_enable':
    drivers/video/omap/lcd_2430sdp.c:110: undefined reference to `twl_i2c_write_u8'
    drivers/video/omap/lcd_2430sdp.c:112: undefined reference to `twl_i2c_write_u8'

    Fix this by selecting the TWL4030_CORE for MACH_OMAP_2430SDP when building
    with CONFIG_FB_OMAP as there is no own Kconfig entry for lcd_2430 and it is
    compiled always when both MACH_OMAP_2430SDP and FB_OMAP are set.

    Signed-off-by: Jarkko Nikula
    Signed-off-by: Tomi Valkeinen

    Jarkko Nikula
     
  • 0897cc210   OMAP: OMAPFB: Adding help for FB_OMAP_LCD_VGA option ... Browse Code »

    CONFIG_FB_OMAP_LCD_VGA option is present in drivers/video/omap
    There is no explaination about what this flag does.
    Lets add information about it.

    FB_OMAP_LCD_VGA flag sets resolution of display to VGA (640 X 480).
    The default resolution of 3430 LDP is 320 X 240.

    Signed-off-by: Mayuresh Janorkar
    Signed-off-by: Tomi Valkeinen

    Janorkar, Mayuresh
     

08 Jan, 2011

1 commit

  • 23d69b09b   Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq ... Browse Code »

    * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
    usb: don't use flush_scheduled_work()
    speedtch: don't abuse struct delayed_work
    media/video: don't use flush_scheduled_work()
    media/video: explicitly flush request_module work
    ioc4: use static work_struct for ioc4_load_modules()
    init: don't call flush_scheduled_work() from do_initcalls()
    s390: don't use flush_scheduled_work()
    rtc: don't use flush_scheduled_work()
    mmc: update workqueue usages
    mfd: update workqueue usages
    dvb: don't use flush_scheduled_work()
    leds-wm8350: don't use flush_scheduled_work()
    mISDN: don't use flush_scheduled_work()
    macintosh/ams: don't use flush_scheduled_work()
    vmwgfx: don't use flush_scheduled_work()
    tpm: don't use flush_scheduled_work()
    sonypi: don't use flush_scheduled_work()
    hvsi: don't use flush_scheduled_work()
    xen: don't use flush_scheduled_work()
    gdrom: don't use flush_scheduled_work()
    ...

    Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
    as per Tejun.

    Linus Torvalds
     

15 Dec, 2010

2 commits

  • afe2c511f   workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() ... Browse Code »

    cancel_rearming_delayed_work[queue]() has been superceded by
    cancel_delayed_work_sync() quite some time ago. Convert all the
    in-kernel users. The conversions are completely equivalent and
    trivial.

    Signed-off-by: Tejun Heo
    Acked-by: "David S. Miller"
    Acked-by: Greg Kroah-Hartman
    Acked-by: Evgeniy Polyakov
    Cc: Jeff Garzik
    Cc: Benjamin Herrenschmidt
    Cc: Mauro Carvalho Chehab
    Cc: netdev@vger.kernel.org
    Cc: Anton Vorontsov
    Cc: David Woodhouse
    Cc: "J. Bruce Fields"
    Cc: Neil Brown
    Cc: Alex Elder
    Cc: xfs-masters@oss.sgi.com
    Cc: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Andrew Morton
    Cc: netfilter-devel@vger.kernel.org
    Cc: Trond Myklebust
    Cc: linux-nfs@vger.kernel.org

    Tejun Heo
     
  • b99ddbf83   OMAP: OMAPFB: disable old omapfb for OMAP4 builds ... Browse Code »

    Build fails when OMAP4 and FB_OMAP are defined:

    drivers/built-in.o: In function `omapfb_do_probe':
    drivers/video/omap/omapfb_main.c:1773: undefined reference to `omap2_int_ctrl'

    Old omapfb does not work on OMAP4, and never will. Change the omapfb
    build dependency so that old omapfb depends on OMAP1/2/3, fixing the
    build for plain OMAP4 builds.

    Reported-by: Russell King
    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     

28 Oct, 2010

1 commit

23 Oct, 2010

1 commit

05 Jul, 2010

1 commit

15 Jun, 2010

2 commits

  • bc092a303   OMAP: OMAPFB: fix rfbi.c compile error ... Browse Code »

    The code in rfbi.c tried to get the omapdss platform_device via a static
    member defined in dispc.c, leading to a compile error. The same
    platform_device is available through rfbi-struct.

    Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     
  • 256a80428   OMAPFB: LCDC: change update_mode to DISABLED when going suspend ... Browse Code »

    I was observing the following error messages on my OMAP1 based Amstrad Delta
    board when first changing from text to graphics mode or vice versa after the
    LCD display had been blanked:
    omapfb omapfb: timeout waiting for FRAME DONE
    with a followup error message while unblanking it back:
    omapfb omapfb: resetting (status 0xffffffb2,reset count 1)
    As a visible result, image pixels happened to be shifted by a few bits,
    giving wrong colors.

    Examining the code, I found that this problem occures when an OMAP1 internal
    LCD controller is disabled from omap_lcdc_suspend() and then a subsequent
    omap_lcdc_setup_plane() calls disable_controller() again. This potentially
    error provoking behaviour is triggered by the lcdc.update_mode flag being kept
    at OMAP_AUTO_UPDATE, regardless of the controller and panel being suspended.

    This patch tries to correct the problem by replacing both omap_lcdc_suspend()
    and omap_lcdc_resume() function bodies with single calls to
    omap_lcdc_set_update_mode() with a respective OMAP_UPDATE_DISABLE or
    OMAP_AUTO_UPDATE argument. As a result, exactly the same lower level
    operations are performed, with addition of changing the lcdc.update_mode flag
    to a value better suited for the controller state. This prevents any further
    calls to disable_controller() from omap_lcdc_setup_plane() while the display
    is suspended.

    Created against linux-2.6.34-rc7.
    Tested on Amstrad Delta.

    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Tomi Valkeinen

    Janusz Krzysztofik
     

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
     

08 Mar, 2010

1 commit

12 Feb, 2010

2 commits

  • e72103278   omapfb: lcd_ams_delta: add support for contrast control ... Browse Code »

    The patch extends the Amstrad Delta LCD panel driver with optional support for
    changing contrast using standard LCD class device API instead of setting it
    silently to a default value at panel enable. It also allows for lowering power
    consumption by turning off OMAP_PWL_CLK_ENABLE via lcd_ops.set_power callback.

    Created and tested against linux-omap for-next,
    commit 155a75d9725e66e5ec8a383822957dee52427057.

    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Tomi Valkeinen

    Janusz Krzysztofik
     
  • 3e9ff0440   omapfb: Fix 12-bit display (RGB444 color mode) handling ... Browse Code »

    Support for RGB444 (12-bit) pixel format has been introduced into omapfb/lcdc
    by Mark Underwood on 2006-05-26 (commit
    f74edb6668aad9fc8e81585861b18f996c78a574) in preparation for Amstrad Delta
    (E3) videophone LCD display support.

    Before the Amstrad Delta LCD patch by Jonathan McDowell was applied (on
    2006-08-04, commit 8d22fb2ea004cdb6379b54c1a8fd1546cfe40ed7), omapfb and lcdc
    code was changed substantially (commit
    e563dc81aa01bd8bbb01bc53975a15c398715f62 dated 2006-06-26) in a way that broke
    Mark's 12-bit display support. Than, a patch by Jonathan, that supposed to
    correct the problem, was introduced immediatelly (on 2006-08-04, commit
    e10a75b49e7a57ae17c28b705153c70eba15a8ef).

    As a result, the Amstrad Delta display was working correctly at boot time,
    with fbset reporting:

    geometry 480 320 480 320 16
    ...
    rgba 4/8,4/4,4/0,0/0

    However, after first framebuffer reinitialization, colors were no longer being
    displayed correctly and fbset was reporting:

    rgba 5/11,6/5,5/0,0/0

    The patch tries to correct the issue by setting plane->color_mode depending on
    panel->bpp, not var->bits_per_pixel.

    Created and tested on Amstrad Delta against linux-2.6.33-rc3.

    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Tomi Valkeinen

    Janusz Krzysztofik
     

09 Feb, 2010

1 commit

  • 3ad2f3fbb   tree-wide: Assorted spelling fixes ... Browse Code »

    In particular, several occurances of funny versions of 'success',
    'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
    'beginning', 'desirable', 'separate' and 'necessary' are fixed.

    Signed-off-by: Daniel Mack
    Cc: Joe Perches
    Cc: Junio C Hamano
    Signed-off-by: Jiri Kosina

    Daniel Mack
     

11 Jan, 2010

3 commits

17 Dec, 2009

1 commit

  • ebeb53e1e   mfd: twl: fix twl4030 rename for remaining driver, board files ... Browse Code »

    Recent drivers/mfd/twl4030* renames to twl broke compile for
    various boards as the series was missing a patch to change
    the board-*.c files.

    This patch renames include twl4030.h to include twl.h
    and also renames twl4030_i2c_ routines.

    Signed-off-by: Balaji T K
    Acked-by: Mark Brown
    Reviewed-by: Felipe Balbi
    Cc: Samuel Ortiz
    Signed-off-by: Tony Lindgren

    Balaji T K