Doug / smarc-fsl-linux-kernel

12 Aug, 2010

1 commit

  • 636d17427   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
    ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
    ARM: 6322/1: imx/pca100: Fix name of spi platform data
    ARM: 6321/1: fix syntax error in main Kconfig file
    ARM: 6297/1: move U300 timer to dynamic clock lookup
    ARM: 6296/1: clock U300 intcon and timer properly
    ARM: 6295/1: fix U300 apb_pclk split
    ARM: 6306/1: fix inverted MMC card detect in U300
    ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
    ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
    ARM: 6292/1: coresight: add ETM management registers
    ARM: 6288/1: ftrace: document mcount formats
    ARM: 6287/1: ftrace: clean up mcount assembly indentation
    ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
    ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
    ARM: 6280/1: imx: Fix build failure when including without
    ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
    ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
    ARM: S5PV210: Override FIMC driver name on Aquila board
    ARM: S5PC100: enable FIMC on SMDKC100
    ...

    Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
    different subsystem 'setname' calls, and trivial port types in
    include/linux/serial_core.h

    Linus Torvalds
     

11 Aug, 2010

3 commits

  • daf695fca   arm: samsung: remove pixclock from several boards ... Browse Code »

    Since "s3c-fb: Automatically calculate pixel clock when none is given",
    there's no need for manually calculating the pixel clock anymore so remove
    these lines and add the correct refresh rate where appropriately.

    Signed-off-by: Maurus Cuelenaere
    Cc: Pawel Osciak
    Cc: Marek Szyprowski
    Cc: Kyungmin Park
    Cc: InKi Dae
    Cc: Ben Dooks
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Maurus Cuelenaere
     
  • eb42b0441   s3c-fb: add device name initialization ... Browse Code »

    Add framebuffer device name initialization calls for S3C2443, S3C64xx and
    S5P machines.

    Signed-off-by: Pawel Osciak
    Signed-off-by: Kyungmin Park
    Cc: InKi Dae
    Cc: Ben Dooks
    Cc: Marek Szyprowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pawel Osciak
     
  • 50a5503a9   s3c-fb: initial move to unifying the header files ... Browse Code »

    Remove the various header files that configure this driver and use the
    platform device name to select the correct configuration at probe time.

    Currently this does not remove the header files, only updates the driver
    and the relevant platform files.

    Signed-off-by: Ben Dooks
    Signed-off-by: Pawel Osciak
    Cc: InKi Dae
    Cc: KyungMin Park
    Cc: Marek Szyprowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     

09 Aug, 2010

1 commit

06 Aug, 2010

5 commits

05 Aug, 2010

11 commits

26 May, 2010

2 commits

  • 459f2a320   ARM: S5PC100: Fixup cross tree merge problems ... Browse Code »

    The commit 45c79433c02b8fe7b8a1cbf60548a9798d0502ed got things building
    but then commit 17d2f877ae8b68b09bf88a9949ee64fbbda5ee10 and others
    where merged in from a seperate tree and this has resulted from a build
    failure due to the redefinition of IRQ_EINT().

    Fix this by merging a new commit.

    Signed-off-by: Ben Dooks

    Ben Dooks
     
  • 5fae40583   ARM: S5P: Fix the platform external interrupt issues. ... Browse Code »

    This patch does the following:

    1. Corrects the common platform code for external interrupts for using the
    VIC mask/unmask bits also.
    2. Moves the common defines related to external interrupt for plat-s5p
    to common files.
    3. Based on the new common defines, corresponding changes are made in the
    affected platforms (S5P6440, S5P6442 and S5PC100).

    Signed-off-by: Pannaga Bhushan
    Signed-off-by: Kukjin Kim
    Signed-off-by: Ben Dooks

    Pannaga Bhushan
     

23 May, 2010

3 commits

  • 45c79433c   ARM: S5PC100: Fixup merge problems ... Browse Code »

    Between problems with Kconfig and merging commits from several
    different sources, it seems the s5pc100 build's move from plat-s5pc11
    has had a few problems.

    Since I do not have the trees to rebuild this quickly, the easiest
    thing is to simply fix the errors found once the s5pc100_defconfig
    actually builds.

    Signed-off-by: Ben Dooks

    Ben Dooks
     
  • c5e2caca6   ARM: S5PC100: DMA: Add platform devices for PL330 DMACs ... Browse Code »

    Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for
    Memory->Memory data transfer while the other two meant for data
    transfer with peripherals.
    Define and add latter two PL330 DMACs as platform devices on the
    S5PC100 platform.

    Signed-off-by: Jassi Brar
    Signed-off-by: Ben Dooks

    Jassi Brar
     
  • b69a596af   ARM: S5PC100: Fix definition of IRQ_EINT() ... Browse Code »

    Somewhere during the latest platform cleanups the IRQ_EINT definition
    got broken, so fix it by replacing it in

    Signed-off-by: Ben Dooks

    Ben Dooks
     

20 May, 2010

13 commits

19 May, 2010

1 commit