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

Commit 6973ee7e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

parents 13efdbec 54a246ff

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -685,6 +685,18 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support

M:	Lennert Buytenhek <buytenh@marvell.com>

M:	Nicolas Pitre <nico@marvell.com>

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

T:	git git://git.marvell.com/orion

S:	Maintained

F:	arch/arm/mach-loki/

F:	arch/arm/mach-kirkwood/

F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/



ARM/MIOA701 MACHINE SUPPORT

M:	Robert Jarzmik <robert.jarzmik@free.fr>

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

arch/arm/mach-kirkwood/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ config MACH_TS219 
	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-119 and TS-219 Turbo NAS devices.



config MACH_OPENRD_BASE

	bool "Marvell OpenRD Base Board"

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell OpenRD Base Board.



endmenu



endif

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o 
obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o

obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o

obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o

obj-$(CONFIG_MACH_OPENRD_BASE)		+= openrd_base-setup.o



obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

arch/arm/mach-kirkwood/common.c

+4 −1
Original line number Diff line number Diff line
@@ -838,7 +838,8 @@ int __init kirkwood_find_tclk(void) 
	u32 dev, rev;



	kirkwood_pcie_id(&dev, &rev);

	if (dev == MV88F6281_DEV_ID && rev == MV88F6281_REV_A0)

	if (dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 ||

					rev == MV88F6281_REV_A1))

		return 200000000;



	return 166666667;
@@ -872,6 +873,8 @@ static char * __init kirkwood_id(void) 
			return "MV88F6281-Z0";

		else if (rev == MV88F6281_REV_A0)

			return "MV88F6281-A0";

		else if (rev == MV88F6281_REV_A1)

			return "MV88F6281-A1";

		else

			return "MV88F6281-Rev-Unsupported";

	} else if (dev == MV88F6192_DEV_ID) {

arch/arm/mach-kirkwood/include/mach/kirkwood.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#define MV88F6281_DEV_ID	0x6281

#define MV88F6281_REV_Z0	0

#define MV88F6281_REV_A0	2

#define MV88F6281_REV_A1	3



#define MV88F6192_DEV_ID	0x6192

#define MV88F6192_REV_Z0	0