Mathieu Olivari 0dfd582e02 watchdog: qcom: use timer devicetree binding ...

MSM watchdog configuration happens in the same register block as the
timer, so we'll use the same binding as the existing timer.

The qcom-wdt will now be probed when devicetree has an entry compatible
with "qcom,kpss-timer" or "qcom-scss-timer".

Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

2015-04-22 15:27:47 +02:00

..

accessibility

…

acpi

Merge tag 'acpica-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-04-17 15:01:29 -04:00

amba

ARM: 8334/1: amba: tegra-ahb: detect and correct bogus base address

2015-04-02 10:03:55 +01:00

android

…

ata

Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2015-04-16 13:53:32 -05:00

atm

…

auxdisplay

…

base

power: wakeup: remove use of seq_printf return value

2015-04-15 16:35:24 -07:00

bcma

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-04-17 15:50:54 -04:00

block

Merge branch 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-04-18 11:42:49 -04:00

bluetooth

Bluetooth: btusb: Use proper data structures for Intel vendor events

2015-04-09 10:42:18 +03:00

bus

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-04-17 15:50:54 -04:00

cdrom

…

char

Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-04-21 09:42:58 -07:00

clk

Merge tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2015-04-21 09:24:09 -07:00

clocksource

Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-04-20 10:19:03 -07:00

connector

…

cpufreq

intel_pstate: Knights Landing support

2015-04-11 02:13:29 +02:00

cpuidle

Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-04-20 10:19:03 -07:00

crypto

Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-04-20 10:19:03 -07:00

dca

…

devfreq

PM / devfreq: tegra: Register governor on module init

2015-03-31 13:17:15 +09:00

dio

…

dma

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-04-21 09:33:10 -07:00

dma-buf

…

edac

…

eisa

…

extcon

Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-04-21 09:42:58 -07:00

firewire

…

firmware

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-04-21 09:33:10 -07:00

fmc

…

gpio

Merge tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2015-04-18 08:22:10 -04:00

gpu

Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2015-04-20 15:16:25 -07:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-04-14 18:25:15 -07:00

hsi

HSI: cmt_speech: fix error return code

2015-04-05 14:45:27 +02:00

hv

Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case

2015-04-03 16:20:12 +02:00

hwmon

hwmon: (w83795) use find_closest_descending() in pwm_freq_to_reg()

2015-04-17 09:03:55 -04:00

hwspinlock

…

hwtracing/coresight

Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-04-21 09:42:58 -07:00

i2c

i2c: core: Export bus recovery functions

2015-04-15 21:02:07 +02:00

ide

ide: remove deprecated use of pci api

2015-04-17 15:32:07 -04:00

idle

Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-04-14 20:21:54 -07:00

iio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-04-14 09:50:27 -07:00

infiniband

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-04-17 16:31:08 -04:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-04-21 12:54:08 -07:00

iommu

Merge tag 'iommu-updates-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-04-20 10:50:05 -07:00

ipack

…

irqchip

Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-04-20 10:19:03 -07:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-04-15 09:00:47 -07:00

leds

Merge tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2015-04-18 08:22:10 -04:00

lguest

lguest: now needs PCI_DIRECT.

2015-04-01 10:29:05 -07:00

macintosh

Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next

2015-04-07 13:25:14 +10:00

mailbox

…

mcb

mcb: request_mem_region() returns NULL on error

2015-04-03 16:15:30 +02:00

md

Merge tag 'dm-4.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2015-04-18 08:14:18 -04:00

media

media: remove unused variable that causes a warning

2015-04-21 12:49:33 -07:00

memory

memory: jz4780-nemc: driver for the NEMC on JZ4780 SoCs

2015-03-26 23:51:36 +01:00

memstick

memstick: mspro_block: add missing curly braces

2015-04-17 09:04:09 -04:00

message

…

mfd

Merge tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-04-14 17:29:55 -07:00

misc

Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-04-21 09:42:58 -07:00

mmc

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-04-16 19:02:04 -04:00

mtd

Merge tag 'upstream-4.1-rc1' of git://git.infradead.org/linux-ubifs

2015-04-15 13:43:40 -07:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-04-21 22:37:27 -07:00

nfc

NFC: logging neatening

2015-04-07 12:05:12 +02:00

ntb

…

nubus

…

of

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2015-04-18 08:30:10 -04:00

oprofile

oprofile: reduce mmap_sem hold for mm->exe_file

2015-04-17 09:04:11 -04:00

parisc

parisc: Eliminate sg_virt_addr() and private scatterlist.h

2015-04-21 22:02:43 +02:00

parport

…

pci

Merge tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2015-04-16 14:01:03 -05:00

pcmcia

…

phy

Merge tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2015-04-13 17:07:21 -07:00

pinctrl

pinctrl: fix allmodconfig noise

2015-04-15 10:02:42 +02:00

platform

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-04-17 15:50:54 -04:00

pnp

Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-04-14 20:21:54 -07:00

power

power: twl4030_madc_battery: Add missing MODULE_ALIAS

2015-04-06 19:39:57 +02:00

powercap

powercap / RAPL: mark rapl_ids array as __initconst

2015-04-11 02:21:15 +02:00

pps

…

ps3

…

ptp

ptp: remove 32 bit get/set methods.

2015-03-31 12:01:19 -04:00

pwm

…

rapidio

…

ras

…

regulator

Merge tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-04-14 17:29:55 -07:00

remoteproc

…

reset

…

rpmsg

…

rtc

drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic

2015-04-17 09:04:12 -04:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2015-04-20 10:15:33 -07:00

sbus

drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value

2015-04-15 16:35:23 -07:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-04-20 15:25:19 -07:00

sfi

…

sh

…

sn

…

soc

…

spi

Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next

2015-04-11 23:09:31 +01:00

spmi

spmi: pmic_arb: remove ARM build time dependency

2015-04-03 16:15:30 +02:00

ssb

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-04-17 15:50:54 -04:00

staging

Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

2015-04-21 09:44:55 -03:00

target

iscsi target: fix oops when adding reject pdu

2015-04-10 12:33:55 -07:00

tc

…

thermal

drivers: thermal: st: remove several sparse warnings

2015-04-07 13:43:28 -07:00

thunderbolt

…

tty

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-04-21 09:33:10 -07:00

uio

Revert "uio: constify of_device_id array"

2015-04-03 16:04:21 +02:00

usb

Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

2015-04-21 09:44:55 -03:00

uwb

…

vfio

vfio-pci: Fix use after free

2015-04-08 08:11:51 -06:00

vhost

new helper: msg_data_left()

2015-04-11 15:53:35 -04:00

video

Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2015-04-20 15:16:25 -07:00

virt

…

virtio

…

vlynq

…

vme

…

w1

…

watchdog

watchdog: qcom: use timer devicetree binding

2015-04-22 15:27:47 +02:00

xen

Merge tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2015-04-16 14:01:03 -05:00

zorro

…

Kconfig

…

Makefile

coresight: moving to new "hwtracing" directory

2015-04-03 16:17:04 +02:00