23 Mar, 2011

8 commits

  • In systems with multiple framebuffer devices, one of the devices might be
    blanked while another is unblanked. In order for the backlight blanking
    logic to know whether to turn off the backlight for a particular
    framebuffer's blanking notification, it needs to be able to check if a
    given framebuffer device corresponds to the backlight.

    This plumbs the check_fb hook from core backlight through the
    pwm_backlight helper to allow platform code to plug in a check_fb hook.

    Signed-off-by: Robert Morell
    Cc: Richard Purdie
    Cc: Arun Murthy
    Cc: Linus Walleij
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robert Morell
     
  • The following symbols are needlessly defined global: jornada_bl_init,
    jornada_bl_exit, jornada_lcd_init, jornada_lcd_exit.

    Make them static.

    Signed-off-by: Axel Lin
    Acked-by: Kristoffer Ericson
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • apple_bl uses ACPI interfaces (data & code), so it should depend on ACPI.

    drivers/video/backlight/apple_bl.c:142: warning: 'struct acpi_device' declared inside parameter list
    drivers/video/backlight/apple_bl.c:142: warning: its scope is only this definition or declaration, which is probably not what you want
    drivers/video/backlight/apple_bl.c:201: warning: 'struct acpi_device' declared inside parameter list
    drivers/video/backlight/apple_bl.c:215: error: variable 'apple_bl_driver' has initializer but incomplete type
    drivers/video/backlight/apple_bl.c:216: error: unknown field 'name' specified in initializer
    ...

    Signed-off-by: Randy Dunlap
    Acked-by: Matthew Garrett
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • It works on hardware other than Macbook Pros, and it works on GPUs other
    than Nvidia. It should even work on iMacs, so change the name to match
    reality more precisely and include an alias so existing users don't get
    confused.

    Signed-off-by: Matthew Garrett
    Acked-by: Richard Purdie
    Cc: Mourad De Clerck
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matthew Garrett
     
  • The SMI-based backlight control functionality may fail to work if the
    system is running under EFI rather than BIOS. Check that the hardware
    responds as expected, and exit if it doesn't.

    Signed-off-by: Matthew Garrett
    Acked-by: Richard Purdie
    Cc: Mourad De Clerck
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matthew Garrett
     
  • This driver only has to deal with two different classes of hardware, but
    right now it needs new DMI entries for every new machine. It turns out
    that there's an ACPI device that uniquely identifies Apples with backlights,
    so this patch reworks the driver into an ACPI one, identifies the hardware
    by checking the PCI vendor of the root bridge and strips out all the DMI
    code. It also changes the config text to clarify that it works on devices
    other than Macbook Pros and GPUs other than nvidia.

    Signed-off-by: Matthew Garrett
    Acked-by: Richard Purdie
    Cc: Mourad De Clerck
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matthew Garrett
     
  • There may be multiple ways of controlling the backlight on a given
    machine. Allow drivers to expose the type of interface they are
    providing, making it possible for userspace to make appropriate policy
    decisions.

    Signed-off-by: Matthew Garrett
    Cc: Richard Purdie
    Cc: Chris Wilson
    Cc: David Airlie
    Cc: Alex Deucher
    Cc: Ben Skeggs
    Cc: Zhang Rui
    Cc: Len Brown
    Cc: Jesse Barnes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matthew Garrett
     
  • Add a ld9040 amoled panel driver.

    Signed-off-by: Donghwa Lee
    Signed-off-by: Kyungmin Park
    Signed-off-by: Inki Dae
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Donghwa Lee
     

22 Mar, 2011

1 commit

  • Remove incorrect Matrox G200eV support that was previously added by
    commit e3a1938805d2e81b27d3d348788644f3bad004f2

    A serious issue with the incorrect G200eV support that reproduces on the
    Matrox G200eV equipped IBM x3650 M2 is the total lack of text (login
    banner, login prompt, etc) on the console when X is not running and
    total lack of text on all of the virtual consoles after X is started.

    Any concerns that the incorrect code (upstream since October 2008) has
    been successfully used on non-IBM G200eV equipped system(s) appear to be
    unwarranted. In addition to the serious/non-intermittent nature of
    issues that have been spotted on IBM systems, complete removal of the
    incorrect code is clearly supported by the following Matrox (Yannick
    Heneault) provided input:
    "It impossible that this patch should have work on a system.
    The patch only declare the G200eV as a regular G200 which is
    not case. Many registers are different, including at least the
    PLL programming sequence. If the G200eV is programmed like a
    regular G200, it will not display anything."

    v1 - Initial patch that removed the incorrect code for _all_
    G200eV equipped systems.
    v2 - Darrick Wong provided patch that blacklisted the incorrect
    code on G200eV equipped IBM systems leaving it enabled on
    all G200eV equipped non-IBM systems.
    v3 - Same code changes included with v1 plus additional
    justification for complete removal of the incorrect code.

    Signed-off-by: Gary Hade
    Cc: Darrick J. Wong
    Cc: Krzysztof Helt
    Cc: Petr Vandrovec
    Cc: Andrew Morton
    Cc: Linus Torvalds
    Cc: Yannick Heneault
    Cc: Christian Toutant
    Signed-off-by: Linus Torvalds

    Gary Hade
     

21 Mar, 2011

1 commit

  • * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
    video: change to new flag variable
    scsi: change to new flag variable
    rtc: change to new flag variable
    rapidio: change to new flag variable
    pps: change to new flag variable
    net: change to new flag variable
    misc: change to new flag variable
    message: change to new flag variable
    memstick: change to new flag variable
    isdn: change to new flag variable
    ieee802154: change to new flag variable
    ide: change to new flag variable
    hwmon: change to new flag variable
    dma: change to new flag variable
    char: change to new flag variable
    fs: change to new flag variable
    xtensa: change to new flag variable
    um: change to new flag variables
    s390: change to new flag variable
    mips: change to new flag variable
    ...

    Fix up trivial conflict in drivers/hwmon/Makefile

    Linus Torvalds
     

18 Mar, 2011

5 commits

  • * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
    msm: scm: Check for interruption immediately
    msm: scm: Fix improper register assignment
    msm: scm: Mark inline asm as volatile
    msm: iommu: Enable HTW L2 redirection on MSM8960
    msm: iommu: Don't read from write-only registers
    msm: iommu: Remove dependency on IDR
    msm: iommu: Use ASID tagging instead of VMID tagging
    msm: iommu: Rework clock logic and add IOMMU bus clock control
    msm: iommu: Clock control for the IOMMU driver
    msm: mdp: Set the correct pack pattern for XRGB/ARGB
    msm_fb: Fix framebuffer console
    msm: mdp: Add support for RGBX 8888 image format.
    video: msmfb: Put the partial update magic value into the fix_screen struct.
    msm: clock: Migrate to clkdev
    msm: clock: Remove references to clk_ops_pcom
    msm: headsmp.S: Fix section mismatch
    msm: Use explicit GPLv2 licenses
    msm: iommu: Enable IOMMU support for MSM8960
    msm: iommu: Generalize platform data for multiple targets
    msm: iommu: Create a Kconfig item for the IOMMU driver
    ...

    Linus Torvalds
     
  • * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
    davinci: DM644x EVM: register MUSB device earlier
    davinci: add spi devices on tnetv107x evm
    davinci: add ssp config for tnetv107x evm board
    davinci: add tnetv107x ssp platform device
    spi: add ti-ssp spi master driver
    mfd: add driver for sequencer serial port
    ARM: EXYNOS4: Implement Clock gating for System MMU
    ARM: EXYNOS4: Enhancement of System MMU driver
    ARM: EXYNOS4: Add support for gpio interrupts
    ARM: S5P: Add function to register gpio interrupt bank data
    ARM: S5P: Cleanup S5P gpio interrupt code
    ARM: EXYNOS4: Add missing GPYx banks
    ARM: S3C64XX: Fix section mismatch from cpufreq init
    ARM: EXYNOS4: Add keypad device to the SMDKV310
    ARM: EXYNOS4: Update clocks for keypad
    ARM: EXYNOS4: Update keypad base address
    ARM: EXYNOS4: Add keypad device helpers
    ARM: EXYNOS4: Add support for SATA on ARMLEX4210
    plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
    mach-u300: define a dummy filter function for coh901318
    ...

    Fix up various conflicts in
    - arch/arm/mach-exynos4/cpufreq.c
    - arch/arm/mach-mxs/gpio.c
    - drivers/net/Kconfig
    - drivers/tty/serial/Kconfig
    - drivers/tty/serial/Makefile
    - drivers/usb/gadget/fsl_mxc_udc.c
    - drivers/video/Kconfig

    Linus Torvalds
     
  • * 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6647/1: add Versatile Express defconfig
    ARM: 6644/1: mach-ux500: update the U8500 defconfig

    * 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6764/1: pl011: factor out FIFO to TTY code
    ARM: 6763/1: pl011: add optional RX DMA to PL011 v2
    ARM: 6758/1: amba: support pm ops
    ARM: amba: make amba_driver id_table const
    ARM: amba: make internal ID table handling const
    ARM: amba: make probe() functions take const id tables
    ARM: 6662/1: amba: make amba_bustype non-static
    ARM: mmci: add dmaengine-based DMA support
    ARM: mmci: no need for separate host->data_xfered
    ARM: mmci: avoid unnecessary switch to data available PIO interrupts
    ARM: mmci: no need to call flush_dcache_page() with sg_miter API
    ARM: mmci: avoid reporting too many completed bytes on fifo overrun
    ALSA: AACI: make fifo variables more explanitory
    ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period
    ALSA: AACI: use snd_pcm_lib_period_bytes()
    ALSA: AACI: clean up AACI announcement printk
    ALSA: AACI: fix channel mask selection
    ALSA: AACI: fix number of channels for record
    ALSA: AACI: fix multiple IRQ claiming

    * 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm:
    VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()
    VIDEO: cyberpro: remove useless function extreg pointers
    VIDEO: cyberpro: update handling of device structures
    VIDEO: cyberpro: add support for video capture I2C
    VIDEO: cyberpro: make 'reg_b0_lock' always present
    VIDEO: cyberpro: add I2C support
    VIDEO: cyberpro: select lowest multipler/divisor for PLL

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits)
    unicore32: rewrite arch-specific tlb.h to use asm-generic version
    unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
    unicore32: replace unicore32-specific iomap functions with generic lib implementation
    unicore32 machine related: add frame buffer driver for pkunity-v3 soc
    unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
    unicore32 io: redefine __REG(x) and re-use readl/writel funcs
    unicore32 i8042 upgrade and bugfix: adjust resource request region type
    unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call
    unicore32 i8042: adjust io funcs of i8042-unicore32io.h
    unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
    unicore32: modify function names and parameters for irq_chips
    unicore32: remove unused lines in arch/unicore32/include/asm/irq.h
    unicore32 time.c: change calculate method for clock_event_device
    unicore32: ADD MAINTAINER for unicore32 architecture
    unicore32 machine related files: ps2 driver
    unicore32 machine related files: pci bus handling
    unicore32 machine related files: hardware registers
    unicore32 machine related files: core files
    unicore32 additional architecture files: boot process
    unicore32 additional architecture files: low-level lib: misc
    ...

    Acked-by: Arnd Bergmann

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
    fbdev: sh_mobile_lcdc: Add YUV framebuffer support
    viafb: split pll configs up
    viafb: remove duplicated clock storage
    viafb: always return the best possible clock
    viafb: remove duplicated clock information
    fbdev: sh_mobile_lcdcfb: add backlight support
    viafb: factor lcd scaling parameters out
    viafb: strip some structures
    viafb: remove unused data_mode and device_type
    viafb: kill lcd_panel_id
    video via: make local variables static
    video via: fix iomem access
    video/via: drop deprecated (and unused) i2c_adapter.id

    Linus Torvalds
     

17 Mar, 2011

6 commits

  • Replace EXTRA_CFLAGS with ccflags-y.

    Signed-off-by: matt mooney
    Acked-by: WANG Cong
    Signed-off-by: Michal Marek

    matt mooney
     
  • Russell King
     
  • * rmk/for-linus: (1557 commits)
    ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
    ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
    ARM: 6747/1: P2V: Thumb2 support
    ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
    ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
    ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
    ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
    ARM: 6776/1: mach-ux500: activate fix for errata 753970
    ARM: 6794/1: SPEAr: Append UL to device address macros.
    ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
    ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
    ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
    ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
    ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
    ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
    ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
    ARM: 6681/1: SPEAr: add debugfs support to clk API
    ARM: 6703/1: SPEAr: update clk API support
    ARM: 6679/1: SPEAr: make clk API functions more generic
    ARM: 6737/1: SPEAr: formalized timer support
    ...

    Conflicts:
    arch/arm/mach-msm/board-msm7x27.c
    arch/arm/mach-msm/board-msm7x30.c
    arch/arm/mach-msm/board-qsd8x50.c
    arch/arm/mach-msm/board-sapphire.c
    arch/arm/mach-msm/include/mach/memory.h

    David Brown
     
  • * 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6629/2: aaec2000: remove support for mach-aaec2000
    ARM: lh7a40x: remove unmaintained platform support

    Fix up trivial conflicts in
    - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
    - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)

    Linus Torvalds
     
  • change from original version -- by advice of Paul Mundt
    1. remove videomemorysize definitions
    2. remove unifb_enable and unifb_setup
    3. use dev_warn instead of printk in fb driver
    4. remove judgement for FB_ACCEL_PUV3_UNIGFX
    5. adjust clk_get and clk_set_rate calls
    6. add resources definitions
    7. remove unifb_option
    8. adjust register for platform_device
    9. adjust unifb_ops position and unifb_regs assignment position

    Signed-off-by: Guan Xuetao
    Acked-by: Arnd Bergmann

    GuanXuetao
     
  • * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
    tty: serial: altera_jtaguart: Add device tree support
    tty: serial: altera_uart: Add devicetree support
    dt: eliminate of_platform_driver shim code
    dt: Eliminate of_platform_{,un}register_driver
    dt/serial: Eliminate users of of_platform_{,un}register_driver
    dt/usb: Eliminate users of of_platform_{,un}register_driver
    dt/video: Eliminate users of of_platform_{,un}register_driver
    dt/net: Eliminate users of of_platform_{,un}register_driver
    dt/sound: Eliminate users of of_platform_{,un}register_driver
    dt/spi: Eliminate users of of_platform_{,un}register_driver
    dt: uartlite: merge platform and of_platform driver bindings
    dt: xilinx_hwicap: merge platform and of_platform driver bindings
    ipmi: convert OF driver to platform driver
    leds/leds-gpio: merge platform_driver with of_platform_driver
    dt/sparc: Eliminate users of of_platform_{,un}register_driver
    dt/powerpc: Eliminate users of of_platform_{,un}register_driver
    dt/powerpc: move of_bus_type infrastructure to ibmebus
    drivercore/dt: add a match table pointer to struct device
    dt: Typo fix.
    altera_ps2: Add devicetree support
    ...

    Linus Torvalds
     

16 Mar, 2011

2 commits

  • Paul Mundt
     
  • Supports YCbCr420sp, YCbCr422sp, and YCbCr44sp, formats
    (bpp = 12, 16, and 24) respectively.

    When double-buffering both Y planes appear before the C planes (Y-Y-C-C),
    as opposed to Y-C-Y-C.

    Set .nonstd in struct sh_mobile_lcdc_chan_cfg to enable YUV mode, and use
    .bpp to distiguish between the 3 modes.
    The value of .nonstd is copied to bits 16-31 of LDDFR in the LCDC and
    should be set accordingly.
    .nonstd must be set to 0 for RGB mode.

    Due to the encoding of YUV data, the framebuffer will clear to green
    instead of black.

    In YUV 420 mode, panning is only possible in 2 line increments.
    Additionally in YUV 420 mode the vertical resolution of the framebuffer
    must be an even number.

    Signed-off-by: Damian Hobson-Garcia
    Signed-off-by: Paul Mundt

    Damian Hobson-Garcia
     

13 Mar, 2011

2 commits


12 Mar, 2011

4 commits

  • This patch splits the pll configs up on pll versions. This allows
    easy adding of other known good pll values. Additionally it made it
    possible to remove invalid configurations resulting in better
    behaviour for such cases. The resulting clocks are no longer stored
    resulting in some computing overhead on each mode change.

    Signed-off-by: Florian Tobias Schandinat

    Florian Tobias Schandinat
     
  • The clocks can be easily recalculated by the timing and refresh value.
    This brings us one step closer to removing VIAs modetable and use
    generic ones and being easier extensible.

    Signed-off-by: Florian Tobias Schandinat

    Florian Tobias Schandinat
     
  • Before this patch only clocks that perfectly match were used and if
    none existed this was not handled properly. This patch changes this
    to always use the closest clock supported. This should behave like
    before for clocks that have a perfect match but be much saner for
    clocks which are slightly off.

    Signed-off-by: Florian Tobias Schandinat

    Florian Tobias Schandinat
     
  • This patch removes the direct lookup table for resolution+refresh and
    pixclock by calculating this information from the mode table. Removes a
    lot of dupllication and error potential by just doing a little more
    calculations on each mode change.

    Signed-off-by: Florian Tobias Schandinat

    Florian Tobias Schandinat
     

11 Mar, 2011

1 commit


10 Mar, 2011

7 commits


09 Mar, 2011

2 commits


08 Mar, 2011

1 commit

  • changes since v2:

    - use v3 and v4 for specifying the ip version instead of i.MX23/28.
    This is a better namespace when future versions are added.
    - rename mach/fb.h to mach/mxsfb.h

    changes since v1:
    - Add a LCDC_ prefix to the register names.
    - use set/clear registers where appropriate
    - protect call to mxsfb_disable_controller() in mxsfb_remove()
    with a (host->enabled) as suggested by Lothar Wassmann

    Signed-off-by: Sascha Hauer
    Acked-by: Shawn Guo
    Cc: Paul Mundt
    Cc: linux-fbdev@vger.kernel.org

    Sascha Hauer