Commit 758b6712 authored May 27, 2014 by Linus Torvalds

arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A slightly larger set of fixes than we'd like at this point in the
  release.  Hopefully our very last batch before 3.15:

  OMAP:
   - Fix boot regression with CPU_IDLE enabled
   - Fixes for audio playback on OMAP5
   - Clock rate setting fix for OMAP3
   - Misc idle/PM fixes
  Exynos:
   - Removal of a couple of power domains to work around issues with
     access when they are powered down
   - Enabling missing highspeed-i2c driver to make MMC regulators work
   - Secondary CPU spin-up fix for 4212
   - Remove MDMA1 engine to avoid conflicts on secure mode platforms
   - A few other DT fixes
  Marvell:
   - PCI-e fixes for clocks and resource allocation

  plus a few other smaller fixes, add a MAINTAINERS entry for reset
  drivers, etc"

* tag 'fixes-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  MAINTAINERS: Add reset controller framework entry
  ARM: trusted_foundations: fix compile error on non-SMP
  ARM: at91: sam9260: fix compilation issues
  ARM: mvebu: fix definitions of PCIe interfaces on Armada 38x
  ARM: imx: fix error handling in ipu device registration
  ARM: OMAP4: Fix the boot regression with CPU_IDLE enabled
  ARM: dts: Keep LDO4 always ON for exynos5250-arndale board
  ARM: dts: Fix SPI interrupt numbers for exynos5420
  ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board
  ARM: OMAP2+: Fix DMA hang after off-idle
  ARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards
  ARM: dts: Remove g2d_pd node for exynos5420
  ARM: dts: Remove mau_pd node for exynos5420
  ARM: exynos_defconfig: enable HS-I2C to fix for mmc partition mount
  ARM: dts: disable MDMA1 node for exynos5420
  ARM: EXYNOS: fix the secondary CPU boot of exynos4212
  ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM
  ARM: mvebu: mvebu-soc-id: keep clock enabled if PCIe unit is enabled
  ARM: mvebu: mvebu-soc-id: add missing clk_put() call
  ARM: at91/dt: sam9260: correct external trigger value
  ...

parents 51d56652 1b0fe6be

MAINTAINERS

+8 −0

Original line number	Diff line number	Diff line
		@@ -7405,6 +7405,14 @@ F: drivers/rpmsg/
		F: Documentation/rpmsg.txt
		F: include/linux/rpmsg.h

		RESET CONTROLLER FRAMEWORK
		M: Philipp Zabel <p.zabel@pengutronix.de>
		S: Maintained
		F: drivers/reset/
		F: Documentation/devicetree/bindings/reset/
		F: include/linux/reset.h
		F: include/linux/reset-controller.h

		RFKILL
		M: Johannes Berg <johannes@sipsolutions.net>
		L: linux-wireless@vger.kernel.org

arch/arm/boot/dts/armada-380.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		pcie@3,0 {
		device_type = "pci";
		assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
		reg = <0x1000 0 0 0 0>;
		reg = <0x1800 0 0 0 0>;
		#address-cells = <3>;
		#size-cells = <2>;
		#interrupt-cells = <1>;

arch/arm/boot/dts/armada-385.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@
		pcie@3,0 {
		device_type = "pci";
		assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
		reg = <0x1000 0 0 0 0>;
		reg = <0x1800 0 0 0 0>;
		#address-cells = <3>;
		#size-cells = <2>;
		#interrupt-cells = <1>;
		@@ -131,7 +131,7 @@
		pcie@4,0 {
		device_type = "pci";
		assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
		reg = <0x1000 0 0 0 0>;
		reg = <0x2000 0 0 0 0>;
		#address-cells = <3>;
		#size-cells = <2>;
		#interrupt-cells = <1>;

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -641,7 +641,7 @@
		trigger@3 {
		reg = <3>;
		trigger-name = "external";
		trigger-value = <0x13>;
		trigger-value = <0xd>;
		trigger-external;
		};
		};

arch/arm/boot/dts/exynos4412-trats2.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@
		status = "okay";

		ak8975@0c {
		compatible = "ak,ak8975";
		compatible = "asahi-kasei,ak8975";
		reg = <0x0c>;
		gpios = <&gpj0 7 0>;
		};