06 Jan, 2009

1 commit

  • * 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux:
    i2c-omap: fix type of irq handler function
    i2c-s3c2410: Change IRQ to be plain integer.
    i2c-s3c2410: Allow more than one i2c-s3c2410 adapter
    i2c-s3c2410: Remove default platform data.
    i2c-s3c2410: Use platform data for gpio configuration
    i2c-s3c2410: Fixup style problems from checkpatch.pl
    i2c-omap: Enable I2C wakeups for 34xx
    i2c-omap: reprogram OCP_SYSCONFIG register after reset
    i2c-omap: convert 'rev1' flag to generic 'rev' u8
    i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()
    i2c-omap: Clean-up i2c-omap
    i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
    i2c-omap: Mark init-only functions as __init
    i2c-omap: Add support for omap34xx
    i2c-omap: FIFO handling support and broken hw workaround for i2c-omap
    i2c-omap: Add high-speed support to omap-i2c
    i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr()
    i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg

    Fix up apparently-trivial conflict in drivers/i2c/busses/i2c-s3c2410.c

    Linus Torvalds
     

03 Jan, 2009

1 commit

  • …/git/tip/linux-2.6-tip

    * 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (66 commits)
    x86: export vector_used_by_percpu_irq
    x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and()
    sched: nominate preferred wakeup cpu, fix
    x86: fix lguest used_vectors breakage, -v2
    x86: fix warning in arch/x86/kernel/io_apic.c
    sched: fix warning in kernel/sched.c
    sched: move test_sd_parent() to an SMP section of sched.h
    sched: add SD_BALANCE_NEWIDLE at MC and CPU level for sched_mc>0
    sched: activate active load balancing in new idle cpus
    sched: bias task wakeups to preferred semi-idle packages
    sched: nominate preferred wakeup cpu
    sched: favour lower logical cpu number for sched_mc balance
    sched: framework for sched_mc/smt_power_savings=N
    sched: convert BALANCE_FOR_xx_POWER to inline functions
    x86: use possible_cpus=NUM to extend the possible cpus allowed
    x86: fix cpu_mask_to_apicid_and to include cpu_online_mask
    x86: update io_apic.c to the new cpumask code
    x86: Introduce topology_core_cpumask()/topology_thread_cpumask()
    x86: xen: use smp_call_function_many()
    x86: use work_on_cpu in x86/kernel/cpu/mcheck/mce_amd_64.c
    ...

    Fixed up trivial conflict in kernel/time/tick-sched.c manually

    Linus Torvalds
     

01 Jan, 2009

1 commit


31 Dec, 2008

1 commit

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
    [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
    [ARM] pxafb: cleanup of the timing checking code
    [ARM] pxafb: cleanup of the color format manipulation code
    [ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
    [ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
    [ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
    [ARM] pxafb: allow video memory size to be configurable
    [ARM] pxa: add document on the MFP design and how to use it
    [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
    [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
    [ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
    [ARM] pxa: Update eseries defconfig
    [ARM] 5352/1: add w90p910-plat config file
    [ARM] s3c: S3C options should depend on PLAT_S3C
    [ARM] mv78xx0: implement GPIO and GPIO interrupt support
    [ARM] Kirkwood: implement GPIO and GPIO interrupt support
    [ARM] Orion: share GPIO IRQ handling code
    [ARM] Orion: share GPIO handling code
    [ARM] s3c: define __io using the typesafe version
    [ARM] S3C64XX: Ensure CPU_V6 is selected
    ...

    Linus Torvalds
     

30 Dec, 2008

1 commit


29 Dec, 2008

8 commits

  • PXA27x and later processors support overlay1 and overlay2 on-top of the
    base framebuffer (although under-neath the base is also possible). They
    support palette and no-palette RGB formats, as well as YUV formats (only
    available on overlay2). These overlays have dedicated DMA channels and
    behave in a similar way as a framebuffer.

    This heavily simplified and re-structured work is based on the original
    pxafb_overlay.c (which is pending for mainline merge for a long time).

    The major problems with this pxafb_overlay.c are (if you are interested
    in the history):

    1. heavily redundant (the control logics for overlay1 and overlay2 are
    actually identical except for some small operations, which are now
    abstracted into a 'pxafb_layer_ops' structure)

    2. a lot of useless and un-tested code (two workarounds which are now
    fixed on mature silicons)

    3. cursorfb is actually useless, hardware cursor should not be used
    this way, and the code was actually un-tested for a long time.

    The code in this patch should be self-explanatory, I tried to add minimum
    comments. As said, this is basically simplified, there are several things
    still on the pending list:

    1. palette mode is un-supported and un-tested (although re-using the
    palette code of the base framebuffer is actually very easy now with
    previous clean-up patches)

    2. fb_pan_display for overlay(s) is un-supported

    3. the base framebuffer can actually be abstracted by 'pxafb_layer' as
    well, which will help further re-use of the code and keep a better
    and consistent structure. (This is the reason I named it 'pxafb_layer'
    instead of 'pxafb_overlay' or something alike)

    See Documentation/fb/pxafb.txt for additional usage information.

    Signed-off-by: Eric Miao
    Cc: Rodolfo Giometti
    Signed-off-by: Eric Miao

    Eric Miao
     
  • 1. introduce var_to_depth() to calculate the color depth including the
    transparency bit

    2. the conversion from 'fb_var_screeninfo' to LCCR3 BPP bits can be re-
    used by overlays (in OVLxC1), thus an individual pxafb_var_to_bpp()
    has been separated out.

    3. pxafb_setmode() should really set the color bitfields correctly at
    begining, introduce a pxafb_set_pixfmt() for this

    4. allow user apps to specify color formats within fb_var_screeninfo,
    and checking of this in pxafb_check_var() has been simplified as
    below:

    a) pxafb_var_to_bpp() should pass - which means a basically correct
    bits_per_pixel and color depth setting
    b) the RGBT bitfields are then forced into supported values by
    pxafb_set_pixfmt()

    Signed-off-by: Eric Miao
    Signed-off-by: Eric Miao

    Eric Miao
     
  • Add the palette format support for LCCR4_PAL_FOR_3, and fix the
    issue of LCCR4 being never assigned.

    Also remove the useless pxafb_set_truecolor().

    Signed-off-by: Eric Miao
    Signed-off-by: Eric Miao

    Eric Miao
     
  • dma branching is enabled by extending the current setup_frame_dma()
    function to allow a 2nd set of frame/palette dma descriptors to be
    used.

    As a result, pxafb_dma_buff.dma_desc[], pxafb_dma_buff.pal_desc[]
    and pxafb_info.fdadr[] are doubled.

    This allows maximum re-use of the current dma setup code, although
    the pxafb_info.fdadr[xx] for FBRx register values looks a bit odd.

    Signed-off-by: Eric Miao
    Signed-off-by: Eric Miao

    Eric Miao
     
  • The amount of video memory size is decided according to the following
    order:

    1. x x by default, which is the backward
    compatible way

    2. size specified in platform data

    3. size specified in module parameter 'options' string or specified in
    kernel boot command line (see updated Documentation/fb/pxafb.txt)

    And now since the memory is allocated from system memory, the pxafb_mmap
    can be removed and the default fb_mmap() should be working all right.

    Also, since we now have introduced the 'struct pxafb_dma_buff' for DMA
    descriptors and palettes, the allocation can be separated cleanly.

    NOTE: the LCD DMA actually supports chained transfer (i.e. page-based
    transfers), to simplify the logic and keep the performance (with less
    TLB misses when accessing from memory mapped user space), the memory
    is allocated by alloc_pages_*() to ensures it's physical contiguous.

    Signed-off-by: Eric Miao
    Signed-off-by: Eric Miao

    Eric Miao
     
  • As Nicolas and Russell pointed out, CLOCK_TICK_RATE is no more
    a constant on PXA when multiple processors and platforms are
    selected, change TIMER_FREQ in rtc-sa1100.c into a variable.

    Since the code to decide the clock tick rate is re-used from
    timer.c, introduce a common get_clock_tick_rate() for this.

    Signed-off-by: Eric Miao
    Acked-by: Nicolas Pitre

    Eric Miao
     
  • Signed-off-by: Eric Miao

    Eric Miao
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
    net: Allow dependancies of FDDI & Tokenring to be modular.
    igb: Fix build warning when DCA is disabled.
    net: Fix warning fallout from recent NAPI interface changes.
    gro: Fix potential use after free
    sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
    sfc: When disabling the NIC, close the device rather than unregistering it
    sfc: SFT9001: Add cable diagnostics
    sfc: Add support for multiple PHY self-tests
    sfc: Merge top-level functions for self-tests
    sfc: Clean up PHY mode management in loopback self-test
    sfc: Fix unreliable link detection in some loopback modes
    sfc: Generate unique names for per-NIC workqueues
    802.3ad: use standard ethhdr instead of ad_header
    802.3ad: generalize out mac address initializer
    802.3ad: initialize ports LACPDU from const initializer
    802.3ad: remove typedef around ad_system
    802.3ad: turn ports is_individual into a bool
    802.3ad: turn ports is_enabled into a bool
    802.3ad: make ntt bool
    ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
    ...

    Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
    to the conversion to %pI (in this networking merge) and the addition of
    doing IPv6 addresses (from the earlier merge of CIFS).

    Linus Torvalds
     

25 Dec, 2008

3 commits


24 Dec, 2008

2 commits


22 Dec, 2008

3 commits


21 Dec, 2008

6 commits


20 Dec, 2008

1 commit


19 Dec, 2008

11 commits


18 Dec, 2008

1 commit