Eric Lee / smarc-ti-linux-kernel

13 Oct, 2008

1 commit

  • 94a9f8ad3   Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] orion5x_wdt.c: add spinlocking
    [WATCHDOG] Orion: add hardware watchdog support
    [WATCHDOG] omap_wdt.c: cleanup a bit omap_wdt.c
    [WATCHDOG] omap_wdt.c: another ioremap() fix
    [WATCHDOG] omap_wdt.c: sync linux-omap changes
    [WATCHDOG] Add AT91SAM9X watchdog
    [WATCHDOG] Add driver for winbond w83697ug/uf watchdog feature
    [WATCHDOG] add watchdog driver IT8716 IT8726 IT8712J/K

    Linus Torvalds
     

12 Oct, 2008

2 commits

  • 56c5d900d   Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Browse Code »

    Conflicts:

    sound/core/memalloc.c

    David S. Miller
     
  • 7cc4e87f9   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: (236 commits)
    [ARM] 5300/1: fixup spitz reset during boot
    [ARM] 5295/1: make ZONE_DMA optional
    [ARM] 5239/1: Palm Zire 72 power management support
    [ARM] 5298/1: Drop desc_handle_irq()
    [ARM] 5297/1: [KS8695] Fix two compile-time warnings
    [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
    [ARM] pxa: allow multi-machine PCMCIA builds
    [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
    [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
    [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
    [ARM] pxa/zylonite: add support for USB OHCI
    [ARM] ohci-pxa27x: use ioremap() and offset for register access
    [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
    [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
    [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
    [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
    [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
    [ARM] pxa: simplify DMA register definitions
    [ARM] pxa: make additional DCSR bits valid for PXA3xx
    [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
    ...

    Fixed up conflicts in
    arch/arm/mach-versatile/core.c
    sound/soc/pxa/pxa2xx-ac97.c
    sound/soc/pxa/pxa2xx-i2s.c
    manually.

    Linus Torvalds
     

10 Oct, 2008

9 commits

23 Sep, 2008

3 commits

  • 7275fc8c3   [WATCHDOG] unlocked_ioctl changes ... Browse Code »

    Fix some drivers so that they use the unlocked_ioctl call.

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • edf86c9b9   [WATCHDOG] wdt285: fix sparse warnings ... Browse Code »

    The wdt285.c watchdog driver is producing a number of
    sparse errors due to missing __user attributes to calls
    to put_user and copy_to_user, as well as in the prototype
    of watchdog_write.

    wdt285.c:144:21: warning: incorrect type in argument 1 (different address spaces)
    wdt285.c:144:21: expected void [noderef] *to
    wdt285.c:144:21: got void *
    wdt285.c:150:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:150:9: expected int const [noderef] *register __p
    wdt285.c:150:9: got int *
    wdt285.c:159:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:159:9: expected int const [noderef] *register __p
    wdt285.c:159:9: got int *
    wdt285.c:174:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:174:9: expected int const [noderef] *register __p
    wdt285.c:174:9: got int *
    wdt285.c:183:12: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
    wdt285.c:183:12: expected int ( *write )( ... )
    wdt285.c:183:12: got int ( static [toplevel] * )( ... )

    Signed-off-by: Ben Dooks
    Signed-off-by: Wim Van Sebroeck
    Signed-off-by: Andrew Morton

    Ben Dooks
     
  • 7f605ac00   [WATCHDOG] ibmasr: remove unnecessary spin_unlock() ... Browse Code »

    __asr_toggle() is always called with asr_lock held.
    But there is unnecessary spin_unlock() call in __asr_toggle().

    Signed-off-by: Akinobu Mita
    Signed-off-by: Wim Van Sebroeck
    Acked-by: Andrey Panin
    Signed-off-by: Andrew Morton

    Akinobu Mita
     

17 Sep, 2008

1 commit

01 Sep, 2008

1 commit

31 Aug, 2008

1 commit

30 Aug, 2008

3 commits

27 Aug, 2008

10 commits

17 Aug, 2008

1 commit

  • 9c0d2a20f   Merge master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * master.kernel.org:/home/rmk/linux-2.6-arm: (38 commits)
    [ARM] 5191/1: ARM: remove CVS keywords
    [ARM] pxafb: fix the warning of incorrect lccr when lcd_conn is specified
    [ARM] pxafb: add flag to specify output format on LDD pins when base is RGBT16
    [ARM] pxafb: fix the incorrect configuration of GPIO77 as ACBIAS for TFT LCD
    [ARM] 5198/1: PalmTX: PCMCIA fixes
    [ARM] Fix a pile of broken watchdog drivers
    [ARM] update mach-types
    [ARM] 5196/1: fix inline asm constraints for preload
    [ARM] 5194/1: update .gitignore
    [ARM] add proc-macros.S include to proc-arm940 and proc-arm946
    [ARM] 5192/1: ARM TLB: add v7wbi_{possible,always}_flags to {possible,always}_tlb_flags
    [ARM] 5193/1: Wire up missing syscalls
    [ARM] traps: don't call undef hook functions with spinlock held
    [ARM] 5183/2: Provide Poodle LoCoMo GPIO names
    [ARM] dma-mapping: provide sync_range APIs
    [ARM] dma-mapping: improve type-safeness of DMA translations
    [ARM] Kirkwood: instantiate the orion_spi driver in the platform code
    [ARM] prevent crashing when too much RAM installed
    [ARM] Kirkwood: Instantiate mv_xor driver
    [ARM] Orion: Instantiate mv_xor driver for 5182
    ...

    Linus Torvalds
     

16 Aug, 2008

1 commit

  • 8b5942c39   [ARM] Fix a pile of broken watchdog drivers ... Browse Code »

    These patches from Adrian fix:
    - ixp4xx_wdt: 20d35f3e50ea7e573f9568b9fce4e98523aaee5d
    CC drivers/watchdog/ixp4xx_wdt.o
    ixp4xx_wdt.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__'
    ixp4xx_wdt.c: In function 'wdt_enable':
    ixp4xx_wdt.c:41: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c:41: error: (Each undeclared identifier is reported only
    ixp4xx_wdt.c:41: error: for each function it appears in.)
    ixp4xx_wdt.c: In function 'wdt_disable':
    ixp4xx_wdt.c:52: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c: In function 'ixp4xx_wdt_init':
    ixp4xx_wdt.c:186: error: 'wdt_lock' undeclared (first use in this
    make[3]: *** [drivers/watchdog/ixp4xx_wdt.o] Error 1

    - at91rm9200_wdt: 2760600da2a13d5a2a335ba012d0f3ad5df4c098
    CC drivers/watchdog/at91rm9200_wdt.o
    at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a
    make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1

    - wdt285: d0e58eed05f9baf77c4f75e794ae245f6dae240a
    CC [M] drivers/watchdog/wdt285.o
    wdt285.c: In function 'footbridge_watchdog_init':
    wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function)
    wdt285.c:211: error: (Each undeclared identifier is reported only once
    wdt285.c:211: error: for each function it appears in.)
    wdt285.c:212: error: expected ')' before string constant
    make[3]: *** [drivers/watchdog/wdt285.o] Error 1

    And this patch from rmk:
    - s3c2410_wdt: 41dc8b72e37c514f7332cbc3f3dd864910c2a1fa
    CC drivers/watchdog/s3c2410_wdt.o
    s3c2410_wdt.c: In function `s3c2410wdt_start':
    s3c2410_wdt.c:161: warning: `return' with a value, in function returning void

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Russell King

    Adrian Bunk
     

13 Aug, 2008

1 commit

  • bdd873540   ALi M7101 PMU also available on Sun Netra's too ... Browse Code »

    My Sun Netra T1 AC200 has one of these... bit harsh not letting me use it
    and all :)

    ==========
    alex@woodchuck:~$ lspci -nn
    00:01.0 PCI bridge [0604]: Sun Microsystems Computer Corp. Simba Advanced PCI Bridge [108e:5000] (rev 13)
    00:01.1 PCI bridge [0604]: Sun Microsystems Computer Corp. Simba Advanced PCI Bridge [108e:5000] (rev 13)
    01:03.0 Non-VGA unclassified device [0000]: ALi Corporation M7101 Power Management Controller [PMU] [10b9:7101]
    01:05.1 Ethernet controller [0200]: Sun Microsystems Computer Corp. RIO GEM [108e:1101] (rev 01)
    01:05.3 USB Controller [0c03]: Sun Microsystems Computer Corp. RIO USB [108e:1103] (rev 01)
    01:07.0 ISA bridge [0601]: ALi Corporation M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] [10b9:1533]
    01:0c.0 Bridge [0680]: Sun Microsystems Computer Corp. RIO EBUS [108e:1100] (rev 01)
    01:0c.1 Ethernet controller [0200]: Sun Microsystems Computer Corp. RIO GEM [108e:1101] (rev 01)
    01:0c.3 USB Controller [0c03]: Sun Microsystems Computer Corp. RIO USB [108e:1103] (rev 01)
    01:0d.0 IDE interface [0101]: ALi Corporation M5229 IDE [10b9:5229] (rev c3)
    02:08.0 SCSI storage controller [0100]: LSI Logic / Symbios Logic 53C896/897 [1000:000b] (rev 07)
    02:08.1 SCSI storage controller [0100]: LSI Logic / Symbios Logic 53C896/897 [1000:000b] (rev 07)
    ==========

    Signed-off-by: Alexander Clouter
    Cc: Wim Van Sebroeck
    Cc: "David S. Miller"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Clouter
     

11 Aug, 2008

6 commits

  • 36cbaa877   [WATCHDOG] pcwd.c - fix open_allowed type. ... Browse Code »

    Fix following warnings:
    drivers/watchdog/pcwd.c: In function 'pcwd_open':
    drivers/watchdog/pcwd.c:703: warning: passing argument 2 of 'test_and_set_bit' from incompatible pointer type
    drivers/watchdog/pcwd.c: In function 'pcwd_close':
    drivers/watchdog/pcwd.c:723: warning: passing argument 2 of 'clear_bit' from incompatible pointer type

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • 9229376e9   [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation ... Browse Code »

    This patch fixes the following compile error caused by
    commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d
    ([WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl):

    ...
    CC drivers/watchdog/ixp4xx_wdt.o
    ixp4xx_wdt.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__'
    ixp4xx_wdt.c: In function 'wdt_enable':
    ixp4xx_wdt.c:41: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c:41: error: (Each undeclared identifier is reported only
    ixp4xx_wdt.c:41: error: for each function it appears in.)
    ixp4xx_wdt.c: In function 'wdt_disable':
    ixp4xx_wdt.c:52: error: 'wdt_lock' undeclared (first use in this
    ixp4xx_wdt.c: In function 'ixp4xx_wdt_init':
    ixp4xx_wdt.c:186: error: 'wdt_lock' undeclared (first use in this
    make[3]: *** [drivers/watchdog/ixp4xx_wdt.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Wim Van Sebroeck

    Adrian Bunk
     
  • 3f11df21a   [WATCHDOG] fix watchdog/wdt285.c compilation ... Browse Code »

    This patch fixes the following compile error caused by
    commit d0e58eed05f9baf77c4f75e794ae245f6dae240a
    ([WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up ...):

    ...
    CC [M] drivers/watchdog/wdt285.o
    wdt285.c: In function 'footbridge_watchdog_init':
    wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function)
    wdt285.c:211: error: (Each undeclared identifier is reported only once
    wdt285.c:211: error: for each function it appears in.)
    wdt285.c:212: error: expected ')' before string constant
    make[3]: *** [drivers/watchdog/wdt285.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Wim Van Sebroeck

    Adrian Bunk
     
  • 3c4fafd65   [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation ... Browse Code »

    This patch fixes the following compile error:

    ...
    CC drivers/watchdog/at91rm9200_wdt.o
    at91rm9200_wdt.c:188: error: 'at91_wdt_ioctl' undeclared here (not in a
    make[3]: *** [drivers/watchdog/at91rm9200_wdt.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Wim Van Sebroeck

    Adrian Bunk
     
  • 58cf41984   [WATCHDOG] fix watchdog/shwdt.c compilation ... Browse Code »

    This patch fixes the following compile errors caused by
    commit 70b814ec1a484279a51bf9f7193551b996627247
    ([WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_io):

    ...
    CC drivers/watchdog/shwdt.o
    shwdt.c:64: error: 'WTCSR_CKS_4096' undeclared here (not in a function)
    shwdt.c: In function 'sh_wdt_start':
    shwdt.c:92: error: 'wdt_lock' undeclared (first use in this function)
    shwdt.c:92: error: (Each undeclared identifier is reported only once
    shwdt.c:92: error: for each function it appears in.)
    shwdt.c:97: error: implicit declaration of function 'sh_wdt_read_csr'
    shwdt.c:98: error: 'WTCSR_WT' undeclared (first use in this function)
    shwdt.c:99: error: implicit declaration of function 'sh_wdt_write_csr'
    shwdt.c:101: error: implicit declaration of function 'sh_wdt_write_cnt'
    shwdt.c:112: error: 'WTCSR_TME' undeclared (first use in this function)
    shwdt.c:113: error: 'WTCSR_RSTS' undeclared (first use in this function)
    shwdt.c: In function 'sh_wdt_stop':
    shwdt.c:142: error: 'wdt_lock' undeclared (first use in this function)
    shwdt.c:147: error: 'WTCSR_TME' undeclared (first use in this function)
    shwdt.c: In function 'sh_wdt_keepalive':
    shwdt.c:160: error: 'wdt_lock' undeclared (first use in this function)
    shwdt.c: In function 'sh_wdt_set_heartbeat':
    shwdt.c:176: error: 'wdt_lock' undeclared (first use in this function)
    shwdt.c: In function 'sh_wdt_ping':
    shwdt.c:192: error: 'wdt_lock' undeclared (first use in this function)
    shwdt.c:197: error: 'WTCSR_IOVF' undeclared (first use in this function)
    shwdt.c: At top level:
    shwdt.c:417: error: conflicting type qualifiers for 'sh_wdt_info'
    shwdt.c:71: error: previous declaration of 'sh_wdt_info' was here
    make[3]: *** [drivers/watchdog/shwdt.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Wim Van Sebroeck

    Adrian Bunk
     
  • f8494e061   [WATCHDOG] fix watchdog/txx9wdt.c compilation ... Browse Code »

    This patch fixes the following compile error caused by
    commit 8dc244f7deac4c0e95ce0ffd26f494bb6e1534c0
    ([WATCHDOG 48/57] txx9: Fix locking, switch to unlocked_ioctl):

    ...
    CC drivers/watchdog/txx9wdt.o
    txx9wdt.c:48: warning: type defaults to 'int' in declaration of
    txx9wdt.c:48: warning: parameter names (without types) in function
    txx9wdt.c: In function 'txx9wdt_ping':
    txx9wdt.c:52: error: 'txx9_lock' undeclared (first use in this function)
    txx9wdt.c:52: error: (Each undeclared identifier is reported only once
    txx9wdt.c:52: error: for each function it appears in.)
    txx9wdt.c: In function 'txx9wdt_start':
    txx9wdt.c:59: error: 'txx9_lock' undeclared (first use in this function)
    txx9wdt.c: In function 'txx9wdt_stop':
    txx9wdt.c:71: error: 'txx9_lock' undeclared (first use in this function)
    make[3]: *** [drivers/watchdog/txx9wdt.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Wim Van Sebroeck

    Adrian Bunk