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

Commit 25918f98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A mixed bag of fixes, some for merge window fallout (tegra, MXS), and
  a short series of fixes for marvell platforms that didn't make it in
  before 3.5."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mxs: fix compile error caused by prom_update_property change
  ARM: dt: tegra trimslice: enable USB2 port
  ARM: dt: tegra trimslice: add vbus-gpio property
  ARM: vt8500: Add maintainer for VT8500 architecture
  ARM: Kirkwood: Replace mrvl with marvell
  ARM: Orion: fix driver probe error handling with respect to clk
  ARM: Dove: Fixup ge00 initialisation
  ARM: Kirkwood: Fix PHY disable clk problems
  ARM: Kirkwood: Ensure runit clock always ticks.
  ARM: versatile: Don't use platform clock for Integrator & VE
  ARM: tegra: harmony: add regulator supply name and its input supply
parents aa0b3b2b fa7c865a

Documentation/devicetree/bindings/mtd/orion-nand.txt

+2 −2
Original line number Diff line number Diff line 
NAND support for Marvell Orion SoC platforms



Required properties:

- compatible : "mrvl,orion-nand".

- compatible : "marvell,orion-nand".

- reg : Base physical address of the NAND and length of memory mapped

	region
@@ -24,7 +24,7 @@ nand@f4000000 { 
	ale = <1>;

	bank-width = <1>;

	chip-delay = <25>;

	compatible = "mrvl,orion-nand";

	compatible = "marvell,orion-nand";

	reg = <0xf4000000 0x400>;



	partition@0 {

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,17 @@ S: Maintained 
F:	arch/arm/mach-pxa/vpac270.c

F:	arch/arm/mach-pxa/include/mach/vpac270.h



ARM/VT8500 ARM ARCHITECTURE

M:	Tony Prisk <linux@prisktech.co.nz>

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

S:	Maintained

F:	arch/arm/mach-vt8500/

F:	drivers/video/vt8500lcdfb.*

F:	drivers/video/wm8505fb*

F:	drivers/video/wmt_ge_rops.*

F:	drivers/tty/serial/vt8500_serial.c

F:	drivers/rtc/rtc-vt8500-c



ARM/ZIPIT Z2 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

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

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ config ARCH_INTEGRATOR 
	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H
@@ -336,7 +335,6 @@ config ARCH_VEXPRESS 
	select ICST

	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_CLCD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

arch/arm/boot/dts/kirkwood-dns320.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "D-Link DNS-320 NAS (Rev A1)";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

arch/arm/boot/dts/kirkwood-dns325.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "D-Link DNS-325 NAS (Rev A1)";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";