Doug / smarc-fsl-linux-kernel

10 Jul, 2012

1 commit

  • 3169663ac   ARM: sa11x0/pxa: convert OS timer registers to IOMEM ... Browse Code »

    Make the OS timer registers have IOMEM like properities so they can
    be passed to readl_relaxed/writel_relaxed() et.al. rather than being
    straight volatile dereferences. Add linux/io.h includes where
    required.

    linux/io.h includes added to arch/arm/mach-sa1100/cpu-sa1100.c,
    arch/arm/mach-sa1100/jornada720_ssp.c, arch/arm/mach-sa1100/leds-lart.c
    drivers/input/touchscreen/jornada720_ts.c, drivers/pcmcia/sa1100_shannon.c
    from Arnd.

    This fixes these warnings:

    arch/arm/mach-sa1100/time.c: In function 'sa1100_timer_init':
    arch/arm/mach-sa1100/time.c:104: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type
    arch/arm/mach-pxa/time.c: In function 'pxa_timer_init':
    arch/arm/mach-pxa/time.c:126: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Russell King

    Russell King
     

30 Mar, 2012

1 commit

  • 820d41cf0   Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull "ARM: cleanups of io includes" from Olof Johansson:
    "Rob Herring has done a sweeping change cleaning up all of the
    mach/io.h includes, moving some of the oft-repeated macros to a common
    location and removing a bunch of boiler plate. This is another step
    closer to a common zImage for multiple platforms."

    Fix up various fairly trivial conflicts ( removal vs changes
    around it, tegra localtimer.o is *still* gone, yadda-yadda).

    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: tegra: Include assembler.h in sleep.S to fix build break
    ARM: pxa: use common IOMEM definition
    ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
    ARM: __io abuse cleanup
    ARM: create a common IOMEM definition
    ARM: iop13xx: fix missing declaration of iop13xx_init_early
    ARM: fix ioremap/iounmap for !CONFIG_MMU
    ARM: kill off __mem_pci
    ARM: remove bunch of now unused mach/io.h files
    ARM: make mach/io.h include optional
    ARM: clps711x: remove unneeded include of mach/io.h
    ARM: dove: add explicit include of dove.h to addr-map.c
    ARM: at91: add explicit include of hardware.h to uncompressor
    ARM: ep93xx: clean-up mach/io.h
    ARM: tegra: clean-up mach/io.h
    ARM: orion5x: clean-up mach/io.h
    ARM: davinci: remove unneeded mach/io.h include
    [media] davinci: remove includes of mach/io.h
    ARM: OMAP: Remove remaining includes for mach/io.h
    ARM: msm: clean-up mach/io.h
    ...

    Linus Torvalds
     

28 Mar, 2012

1 commit

  • 27c766aaa   watchdog: Use pr_<fmt> and pr_<level> ... Browse Code »

    Use the current logging styles.

    Make sure all output has a prefix.
    Add missing newlines.
    Remove now unnecessary PFX, NAME, and miscellaneous other #defines.
    Coalesce formats.

    Signed-off-by: Joe Perches
    Signed-off-by: Wim Van Sebroeck

    Joe Perches
     

26 Mar, 2012

1 commit

  • 23019a733   ARM: pxa: use common IOMEM definition ... Browse Code »

    pxa was missed in the moving of IOMEM to a common definition, so lots of
    IOMEM redefined warnings were introduced. So remove pxa IOMEM definition
    and fix all the fallout.

    Reported-by: Paul Gortmaker
    Signed-off-by: Rob Herring
    Cc: Eric Miao
    Cc: Russell King
    Cc: Haojian Zhuang
    Cc: Alessandro Zummo
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Cc: rtc-linux@googlegroups.com
    Cc: alsa-devel@alsa-project.org

    Rob Herring
     

10 Jul, 2009

1 commit

  • a6f052e39   [WATCHDOG] SA1100 watchdog maximum timeout ... Browse Code »

    This patch replaces the hardcoded 255 seconds limit for a real limit based on
    oscr_freq.

    Also, the 'firmware_version' field is changed to '1' to allow the user
    space application to easily detect that this driver supports a higher
    maximum timeout.

    Signed-off-by: Raphael Assenat
    Signed-off-by: Wim Van Sebroeck

    Raphael Assenat
     

29 Mar, 2009

1 commit

25 Mar, 2009

1 commit

09 Mar, 2009

1 commit

  • 5bf3df3f0   [ARM] pxa: separate definitions from pxa-regs.h and remove it finally ... Browse Code »

    The remaining registers are separated into:

    -
    -
    -

    and then we can remove pxa-regs.h completely. Instead of #include this
    file, let's:

    1. include the specific with care (if that's absolutely
    necessary)

    2. define the registers in the driver, make cleanly defined API to expose
    the register access to external with sufficient reason

    Signed-off-by: Eric Miao

    Eric Miao
     

30 Dec, 2008

1 commit

29 Dec, 2008

1 commit

30 Nov, 2008

1 commit

29 Oct, 2008

1 commit

09 Aug, 2008

1 commit

  • 097d9eb53   Merge Linus' latest into master ... Browse Code »

    Conflicts:

    drivers/watchdog/at91rm9200_wdt.c
    drivers/watchdog/davinci_wdt.c
    drivers/watchdog/ep93xx_wdt.c
    drivers/watchdog/ixp2000_wdt.c
    drivers/watchdog/ixp4xx_wdt.c
    drivers/watchdog/ks8695_wdt.c
    drivers/watchdog/omap_wdt.c
    drivers/watchdog/pnx4008_wdt.c
    drivers/watchdog/sa1100_wdt.c
    drivers/watchdog/wdt285.c

    Russell King
     

07 Aug, 2008

3 commits

06 Aug, 2008

1 commit

  • 0c06090c9   [WATCHDOG] Coding style - Indentation - part 2 ... Browse Code »

    This brings the watchdog drivers into line with coding style.
    This patch takes cares of the indentation as described in chapter 1.
    Main changes:
    * Re-structure the ioctl switch call for all drivers as follows:
    switch (cmd) {
    case WDIOC_GETSUPPORT:
    case WDIOC_GETSTATUS:
    case WDIOC_GETBOOTSTATUS:
    case WDIOC_GETTEMP:
    case WDIOC_SETOPTIONS:
    case WDIOC_KEEPALIVE:
    case WDIOC_SETTIMEOUT:
    case WDIOC_GETTIMEOUT:
    case WDIOC_GETTIMELEFT:
    default:
    }

    This to make the migration from the drivers to the uniform watchdog
    device driver easier in the future.

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     

05 Aug, 2008

1 commit

21 Jun, 2008

1 commit

20 Oct, 2007

1 commit

  • 1977f0327   remove asm/bitops.h includes ... Browse Code »

    remove asm/bitops.h includes

    including asm/bitops directly may cause compile errors. don't include it
    and include linux/bitops instead. next patch will deny including asm header
    directly.

    Cc: Adrian Bunk
    Signed-off-by: Jiri Slaby
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     

18 Oct, 2007

1 commit