Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81445e63 authored by David Howells's avatar David Howells
Browse files

Merge remote-tracking branch 'tip/timers/core' into afs-next 



These AFS patches need the timer_reduce() patch from timers/core.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parents ede372dc b24591e2

Documentation/devicetree/bindings/timer/renesas,cmt.txt

+12 −12
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ Required Properties: 
		(CMT1 on sh73a0 and r8a7740)

		This is a fallback for the above renesas,cmt-48-* entries.



    - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4.

    - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4.

    - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790.

    - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790.

    - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791.

    - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791.

    - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793.

    - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794.

    - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4.

    - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4.

    - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790.

    - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790.

    - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791.

    - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791.

    - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793.

    - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.



    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.

    - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.
@@ -46,7 +46,7 @@ Required Properties: 
Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes



	cmt0: timer@ffca0000 {

		compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0";

		compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";

		reg = <0 0xffca0000 0 0x1004>;

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

			     <0 142 IRQ_TYPE_LEVEL_HIGH>;
@@ -55,7 +55,7 @@ Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes 
	};



	cmt1: timer@e6130000 {

		compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1";

		compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3450,7 +3450,8 @@ M: Thomas Gleixner <tglx@linutronix.de> 
L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

F:	drivers/clocksource

F:	drivers/clocksource/

F:	Documentation/devicetree/bindings/timer/



CMPC ACPI DRIVER

M:	Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>

arch/arm/mach-footbridge/dc21285.c

+8 −18
Original line number Diff line number Diff line
@@ -136,19 +136,14 @@ struct pci_ops dc21285_ops = { 
static struct timer_list serr_timer;

static struct timer_list perr_timer;



static void dc21285_enable_error(unsigned long __data)

static void dc21285_enable_error(struct timer_list *timer)

{

	switch (__data) {

	case IRQ_PCI_SERR:

		del_timer(&serr_timer);

		break;

	del_timer(timer);



	case IRQ_PCI_PERR:

		del_timer(&perr_timer);

		break;

	}



	enable_irq(__data);

	if (timer == &serr_timer)

		enable_irq(IRQ_PCI_SERR);

	else if (timer == &perr_timer)

		enable_irq(IRQ_PCI_PERR);

}



/*
@@ -323,13 +318,8 @@ void __init dc21285_preinit(void) 
		*CSR_PCICMD = (*CSR_PCICMD & 0xffff) | PCICMD_ERROR_BITS;

	}



	init_timer(&serr_timer);

	init_timer(&perr_timer);



	serr_timer.data = IRQ_PCI_SERR;

	serr_timer.function = dc21285_enable_error;

	perr_timer.data = IRQ_PCI_PERR;

	perr_timer.function = dc21285_enable_error;

	timer_setup(&serr_timer, dc21285_enable_error, 0);

	timer_setup(&perr_timer, dc21285_enable_error, 0);



	/*

	 * We don't care if these fail.

arch/arm/mach-ixp4xx/dsmg600-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int power_button_countdown; 
#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */



static void dsmg600_power_handler(unsigned long data);

static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler, 0, 0);

static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler);



static void dsmg600_power_handler(unsigned long data)

{

arch/arm/mach-ixp4xx/nas100d-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int power_button_countdown; 
#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */



static void nas100d_power_handler(unsigned long data);

static DEFINE_TIMER(nas100d_power_timer, nas100d_power_handler, 0, 0);

static DEFINE_TIMER(nas100d_power_timer, nas100d_power_handler);



static void nas100d_power_handler(unsigned long data)

{