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

Commit 1f8b7665 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 handful of fixes for 3.11 are still trickling in.  These are:
   - A couple of fixes for older OMAP platforms
   - Another few fixes for at91 (lateish due to European summer
     vacations)
   - A late-found problem with USB on Tegra, fix is to keep VBUS
     regulator on at all times
   - One fix for Exynos 5440 dealing with CPU detection
   - One MAINTAINERS update"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: always enable USB VBUS regulators
  ARM: davinci: nand: specify ecc strength
  ARM: OMAP: rx51: change musb mode to OTG
  ARM: OMAP2: fix musb usage for n8x0
  MAINTAINERS: Update email address for Benoit Cousson
  ARM: at91/DT: fix at91sam9n12ek memory node
  ARM: at91: add missing uart clocks DT entries
  ARM: SAMSUNG: fix to support for missing cpu specific map_io
  ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C
parents 8351fcfe 30ca2226

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5884,7 +5884,7 @@ F: drivers/i2c/busses/i2c-omap.c 
F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	devicetree@vger.kernel.org
@@ -5964,14 +5964,14 @@ S: Maintained 
F:	drivers/char/hw_random/omap-rng.c



OMAP HWMOD SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c

arch/arm/boot/dts/at91sam9n12ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
	compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";



	chosen {

		bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

	};



	memory {

		reg = <0x20000000 0x10000000>;

		reg = <0x20000000 0x8000000>;

	};



	clocks {

arch/arm/boot/dts/at91sam9x5ek.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -94,8 +94,9 @@ 


		usb0: ohci@00600000 {

			status = "okay";

			num-ports = <2>;

			atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW

			num-ports = <3>;

			atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */

					   &pioD 19 GPIO_ACTIVE_LOW

					   &pioD 20 GPIO_ACTIVE_LOW

					  >;

		};

arch/arm/boot/dts/tegra20-seaboard.dts

+2 −0
Original line number Diff line number Diff line
@@ -830,6 +830,8 @@ 
			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 24 0>; /* PD0 */

			regulator-always-on;

			regulator-boot-on;

		};

	};

arch/arm/boot/dts/tegra20-trimslice.dts

+2 −0
Original line number Diff line number Diff line
@@ -412,6 +412,8 @@ 
			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 170 0>; /* PV2 */

			regulator-always-on;

			regulator-boot-on;

		};

	};