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

Commit dd1a1756 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd',... 

Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next
parents e2c22d95 cbff5634 9f4c7448 e87c621d b82a2272 b3eb76d1 5b5c1399 4c071c7b

MAINTAINERS

+6 −3
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ F: arch/arm/boot/dts/sama*.dts 
F:	arch/arm/boot/dts/sama*.dtsi



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <rob.herring@calxeda.com>

M:	Rob Herring <robh@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-highbank/
@@ -1368,6 +1368,9 @@ T: git git://git.xilinx.com/linux-xlnx.git 
S:	Supported

F:	arch/arm/mach-zynq/

F:	drivers/cpuidle/cpuidle-zynq.c

N:	zynq

N:	xilinx

F:	drivers/clocksource/cadence_ttc_timer.c



ARM SMMU DRIVER

M:	Will Deacon <will.deacon@arm.com>
@@ -6256,7 +6259,7 @@ F: drivers/i2c/busses/i2c-ocores.c 


OPEN FIRMWARE AND FLATTENED DEVICE TREE

M:	Grant Likely <grant.likely@linaro.org>

M:	Rob Herring <rob.herring@calxeda.com>

M:	Rob Herring <robh+dt@kernel.org>

L:	devicetree@vger.kernel.org

W:	http://fdt.secretlab.ca

T:	git git://git.secretlab.ca/git/linux-2.6.git
@@ -6268,7 +6271,7 @@ K: of_get_property 
K:	of_match_table



OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS

M:	Rob Herring <rob.herring@calxeda.com>

M:	Rob Herring <robh+dt@kernel.org>

M:	Pawel Moll <pawel.moll@arm.com>

M:	Mark Rutland <mark.rutland@arm.com>

M:	Ian Campbell <ijc+devicetree@hellion.org.uk>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 13

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/powerpc/boot/dts/mpc5125twr.dts

+5 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
		compatible = "fsl,mpc5121-immr";

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		ranges = <0x0 0x80000000 0x400000>;

		reg = <0x80000000 0x400000>;

		bus-frequency = <66000000>;	// 66 MHz ips bus
@@ -189,6 +188,10 @@ 
			reg = <0xA000 0x1000>;

		};



		// disable USB1 port

		// TODO:

		// correct pinmux config and fix USB3320 ulpi dependency

		// before re-enabling it

		usb@3000 {

			compatible = "fsl,mpc5121-usb2-dr";

			reg = <0x3000 0x400>;
@@ -197,6 +200,7 @@ 
			interrupts = <43 0x8>;

			dr_mode = "host";

			phy_type = "ulpi";

			status = "disabled";

		};



		// 5125 PSCs are not 52xx or 5121 PSC compatible

arch/powerpc/include/asm/exception-64s.h

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ do_kvm_##n: \ 
	subi	r1,r1,INT_FRAME_SIZE;	/* alloc frame on kernel stack	*/ \

	beq-	1f;							   \

	ld	r1,PACAKSAVE(r13);	/* kernel stack to use		*/ \

1:	cmpdi	cr1,r1,0;		/* check if r1 is in userspace	*/ \

1:	cmpdi	cr1,r1,-INT_FRAME_SIZE;	/* check if r1 is in userspace	*/ \

	blt+	cr1,3f;			/* abort if it is		*/ \

	li	r1,(n);			/* will be reloaded later	*/ \

	sth	r1,PACA_TRAP_SAVE(r13);					   \

arch/powerpc/include/asm/unaligned.h

+6 −1
Original line number Diff line number Diff line
@@ -4,13 +4,18 @@ 
#ifdef __KERNEL__



/*

 * The PowerPC can do unaligned accesses itself in big endian mode.

 * The PowerPC can do unaligned accesses itself based on its endian mode.

 */

#include <linux/unaligned/access_ok.h>

#include <linux/unaligned/generic.h>



#ifdef __LITTLE_ENDIAN__

#define get_unaligned	__get_unaligned_le

#define put_unaligned	__put_unaligned_le

#else

#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be

#endif



#endif	/* __KERNEL__ */

#endif	/* _ASM_POWERPC_UNALIGNED_H */