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

Commit 3b833068 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-64138f0a' into msm-4.14"

parents f6f85699 164b053d

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>,

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 4

SUBLEVEL = 5

EXTRAVERSION =

NAME = Petit Gorille

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ config STATIC_KEYS_SELFTEST 
config OPTPROBES

	def_bool y

	depends on KPROBES && HAVE_OPTPROBES

	depends on !PREEMPT

	select TASKS_RCU if PREEMPT



config KPROBES_ON_FTRACE

	def_bool y

arch/m68k/mm/mcfmmu.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void __init cf_bootmem_alloc(void) 
	max_pfn = max_low_pfn = PFN_DOWN(_ramend);

	high_memory = (void *)_ramend;



	m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;

	m68k_virt_to_node_shift = fls(_ramend - 1) - 6;

	module_fixup(NULL, __start_fixup, __stop_fixup);



	/* setup bootmem data */

arch/mips/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ generic-y += qrwlock.h 
generic-y += qspinlock.h

generic-y += sections.h

generic-y += segment.h

generic-y += serial.h

generic-y += trace_clock.h

generic-y += unaligned.h

generic-y += user.h