Merge branch 'master' into export-slabh (336f5899) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt

+54 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,15 @@ Required properties:
		- fsl,qe-num-snums: define how many serial number(SNUM) the QE can use for the
		threads.

		Optional properties:
		- fsl,firmware-phandle:
		Usage: required only if there is no fsl,qe-firmware child node
		Value type: <phandle>
		Definition: Points to a firmware node (see "QE Firmware Node" below)
		that contains the firmware that should be uploaded for this QE.
		The compatible property for the firmware node should say,
		"fsl,qe-firmware".

		Recommended properties
		- brg-frequency : the internal clock source frequency for baud-rate
		generators in Hz.
		@@ -59,3 +68,48 @@ Example:
		reg = <0 c000>;
		};
		};

		* QE Firmware Node

		This node defines a firmware binary that is embedded in the device tree, for
		the purpose of passing the firmware from bootloader to the kernel, or from
		the hypervisor to the guest.

		The firmware node itself contains the firmware binary contents, a compatible
		property, and any firmware-specific properties. The node should be placed
		inside a QE node that needs it. Doing so eliminates the need for a
		fsl,firmware-phandle property. Other QE nodes that need the same firmware
		should define an fsl,firmware-phandle property that points to the firmware node
		in the first QE node.

		The fsl,firmware property can be specified in the DTS (possibly using incbin)
		or can be inserted by the boot loader at boot time.

		Required properties:
		- compatible
		Usage: required
		Value type: <string>
		Definition: A standard property. Specify a string that indicates what
		kind of firmware it is. For QE, this should be "fsl,qe-firmware".

		- fsl,firmware
		Usage: required
		Value type: <prop-encoded-array>, encoded as an array of bytes
		Definition: A standard property. This property contains the firmware
		binary "blob".

		Example:
		qe1@e0080000 {
		compatible = "fsl,qe";
		qe_firmware:qe-firmware {
		compatible = "fsl,qe-firmware";
		fsl,firmware = [0x70 0xcd 0x00 0x00 0x01 0x46 0x45 ...];
		};
		...
		};

		qe2@e0090000 {
		compatible = "fsl,qe";
		fsl,firmware-phandle = <&qe_firmware>;
		...
		};

MAINTAINERS

+10 −0

Original line number	Diff line number	Diff line
		@@ -3270,6 +3270,16 @@ S: Maintained
		F: include/linux/kexec.h
		F: kernel/kexec.c

		KEYS/KEYRINGS:
		M: David Howells <dhowells@redhat.com>
		L: keyrings@linux-nfs.org
		S: Maintained
		F: Documentation/keys.txt
		F: include/linux/key.h
		F: include/linux/key-type.h
		F: include/keys/
		F: security/keys/

		KGDB
		M: Jason Wessel <jason.wessel@windriver.com>
		L: kgdb-bugreport@lists.sourceforge.net

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 34
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

arch/arm/include/asm/cacheflush.h

+1 −37

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <asm/glue.h>
		#include <asm/shmparam.h>
		#include <asm/cachetype.h>
		#include <asm/outercache.h>

		#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)

		@@ -219,12 +220,6 @@ struct cpu_cache_fns {
		void (dma_flush_range)(const void , const void *);
		};

		struct outer_cache_fns {
		void (*inv_range)(unsigned long, unsigned long);
		void (*clean_range)(unsigned long, unsigned long);
		void (*flush_range)(unsigned long, unsigned long);
		};

		/*
		* Select the calling method
		*/
		@@ -281,37 +276,6 @@ extern void dmac_flush_range(const void , const void );

		#endif

		#ifdef CONFIG_OUTER_CACHE

		extern struct outer_cache_fns outer_cache;

		static inline void outer_inv_range(unsigned long start, unsigned long end)
		{
		if (outer_cache.inv_range)
		outer_cache.inv_range(start, end);
		}
		static inline void outer_clean_range(unsigned long start, unsigned long end)
		{
		if (outer_cache.clean_range)
		outer_cache.clean_range(start, end);
		}
		static inline void outer_flush_range(unsigned long start, unsigned long end)
		{
		if (outer_cache.flush_range)
		outer_cache.flush_range(start, end);
		}

		#else

		static inline void outer_inv_range(unsigned long start, unsigned long end)
		{ }
		static inline void outer_clean_range(unsigned long start, unsigned long end)
		{ }
		static inline void outer_flush_range(unsigned long start, unsigned long end)
		{ }

		#endif

		/*
		* Copy user data from/to a page which is mapped into a different
		* processes address space. Really, we want to allow our "user

arch/arm/include/asm/clkdev.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#define __ASM_CLKDEV_H

		struct clk;
		struct device;

		struct clk_lookup {
		struct list_head node;