Commit 200d963b authored May 13, 2014 by Linus Torvalds

arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Seems like we've had more fixes than usual this release cycle, but
  there's nothing in particular that we're doing differently.  Perhaps
  it's just one of those cycles where more people are finding more
  regressions (and/or that the latency of when people actually test
  what's been in the tree for a while is catching up so that we get the
  bug reports now).

  The bigger changes here are are for TI and Marvell platforms:
   * Timing changes for GPMC (generic localbus) on OMAP causing some
     largeish DTS deltas.
   * Fixes to window allocation on PCI for mvebu touching drivers/
     stuff.  Patches have acks from subsystem maintainers where needed.
   * A fix from Thomas for a botched DT conversion in drivers/edma.

  There's a handful of other fixes for the above platforms as well as
  sunxi, at91, i.MX.  I also included a MAINTAINER update for Broadcom,
  and a trivial move of a binding doc.

  I know you said you'd be offline this week, but I might as well post
  it for when you return.  :)"

I'm not quite offline yet.  Doing a few pulls in the last hour before my
internet goes away..

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  MAINTAINERS: update Broadcom ARM tree location and add an SoC family
  ARM: dts: i.MX53: Fix ipu register space size
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes
  ARM: sunxi: Enable GMAC in sunxi_defconfig
  ARM: common: edma: Fix xbar mapping
  ARM: sun7i: Fix i2c4 base address
  ARM: Kirkwood: T5325: Fix double probe of Codec
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
  ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree
  ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
  ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
  ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
  ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
  ARM: dts: am437x-gp-evm: Do not reset gpio5
  ARM: dts: omap3-igep0020: use SMSC9221 timings
  PCI: mvebu: split PCIe BARs into multiple MBus windows when needed
  ...

parents 7e338c99 3b27dcec

Documentation/devicetree/bindings/clock/at91-clock.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ Required properties for PMC node:
		- interrupt-controller : tell that the PMC is an interrupt controller.
		- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
		and reflect the bit position in the PMC_ER/DR/SR registers.
		You can use the dt macros defined in dt-bindings/clk/at91.h.
		You can use the dt macros defined in dt-bindings/clock/at91.h.
		0 (AT91_PMC_MOSCS) -> main oscillator ready
		1 (AT91_PMC_LOCKA) -> PLL A ready
		2 (AT91_PMC_LOCKB) -> PLL B ready

Documentation/devicetree/bindings/dma/ti-edma.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,6 @@ edma: edma@49000000 {
		dma-channels = <64>;
		ti,edma-regions = <4>;
		ti,edma-slots = <256>;
		ti,edma-xbar-event-map = <1 12
		ti,edma-xbar-event-map = /bits/ 16 <1 12
		2 13>;
		};

MAINTAINERS

+3 −2

Original line number	Diff line number	Diff line
		@@ -1893,14 +1893,15 @@ L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/broadcom/bnx2x/

		BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
		BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
		M: Christian Daudt <bcm@fixthebug.org>
		M: Matt Porter <mporter@linaro.org>
		L: bcm-kernel-feedback-list@broadcom.com
		T: git git://git.github.com/broadcom/bcm11351
		T: git git://github.com/broadcom/mach-bcm
		S: Maintained
		F: arch/arm/mach-bcm/
		F: arch/arm/boot/dts/bcm113*
		F: arch/arm/boot/dts/bcm216*
		F: arch/arm/boot/dts/bcm281*
		F: arch/arm/configs/bcm_defconfig
		F: drivers/mmc/host/sdhci_bcm_kona.c

arch/arm/boot/dts/am33xx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@
		compatible = "ti,edma3";
		ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
		reg = <0x49000000 0x10000>,
		<0x44e10f90 0x10>;
		<0x44e10f90 0x40>;
		interrupts = <12 13 14>;
		#dma-cells = <1>;
		dma-channels = <64>;

arch/arm/boot/dts/am3517.dtsi

+16 −0

Original line number	Diff line number	Diff line
		@@ -62,5 +62,21 @@
		};
		};

		&iva {
		status = "disabled";
		};

		&mailbox {
		status = "disabled";
		};

		&mmu_isp {
		status = "disabled";
		};

		&smartreflex_mpu_iva {
		status = "disabled";
		};

		/include/ "am35xx-clocks.dtsi"
		/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

Admin message