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

Commit e6e7fb1f 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:
 "We have a fairly large batch of fixes this time around, mostly just
  due to various platforms all having a fix or two more than usual.

  Worth pointing out are:

   - A fix for EDMA on Davinci/OMAP where channel allocation broke with
     the DT conversion.  Due to some miscommunication we didn't
     understand the impact of the breakage, so we were pushing back on
     it for 3.12, but it sounds like it's actually breaking quite a few
     people out there.

   - A bunch of fixes for Marvell platforms, some straggling fixes for
     merge window fallout and some fixes for a couple of the platforms
     (Netgear RN102 in particular).

   - A fix for a race between multi-cluster power management and cpu
     hotplug on Versatile Express.

  And a bunch of other smaller fixes that all add up.

  We'll be switching over into stricter regressions-only mode from here
  on out"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  ARM: multi_v7_defconfig: add SDHCI for i.MX
  bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
  ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102
  ARM: at91: sam9g45: shutdown ddr1 too when rebooting
  MAINTAINERS: ARM: SIRF: use kernel.org mail box
  MAINTAINERS: ARM: SIRF: add missed drivers into maintain list
  ARM: edma: Fix clearing of unused list for DT DMA resources
  ARM: vexpress: tc2: fix hotplug/idle/kexec race on cluster power down
  ARM: dts: sirf: fix interrupt and dma prop of VIP for prima2 and atlas6
  ARM: dts: sirf: fix the ranges of peri-iobrg of prima2
  ARM: dts: makefile: build atlas6-evb.dtb for ARCH_ATLAS6
  ARM: dts: sirf: fix fifosize, clks, dma channels for UART
  ARM: mvebu: Add DT entry for ReadyNAS 102 to use gpio-poweroff driver
  ARM: mvebu: fix ReadyNAS 102 Power button GPIO to make it active high
  ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
  ARM: shmobile: Remove #gpio-ranges-cells DT property
  gpio: rcar: Remove #gpio-range-cells DT property usage
  ARM: shmobile: armadillo: fixup ether pinctrl naming
  ARM: shmobile: Lager: add Micrel KSZ8041 PHY fixup
  ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format
  ...
parents 164a2c58 6a98b2ff

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+10 −7
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as 
described in mmc.txt, can be used. Additionally the following tmio_mmc-specific

optional bindings can be used.



Required properties:

- compatible:	"renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit

		"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC

		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC

		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC

		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC

		"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC

		"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC

		"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC



Optional properties:

- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
 


When used with Renesas SDHI hardware, the following compatibility strings

configure various model-specific properties:



"renesas,sh7372-sdhi":	(default) compatible with SH7372

"renesas,r8a7740-sdhi":	compatible with R8A7740: certain MMC/SD commands have to

			wait for the interface to become idle.

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -824,15 +824,21 @@ S: Maintained 
F:	arch/arm/mach-gemini/



ARM/CSR SIRFPRIMA2 MACHINE SUPPORT

M:	Barry Song <baohua.song@csr.com>

M:	Barry Song <baohua@kernel.org>

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git

S:	Maintained

F:	arch/arm/mach-prima2/

F:	drivers/clk/clk-prima2.c

F:	drivers/clocksource/timer-prima2.c

F:	drivers/clocksource/timer-marco.c

F:	drivers/dma/sirf-dma.c

F:	drivers/i2c/busses/i2c-sirf.c

F:	drivers/input/misc/sirfsoc-onkey.c

F:	drivers/irqchip/irq-sirfsoc.c

F:	drivers/mmc/host/sdhci-sirf.c

F:	drivers/pinctrl/sirf/

F:	drivers/rtc/rtc-sirfsoc.c

F:	drivers/spi/spi-sirf.c



ARM/EBSA110 MACHINE SUPPORT

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb 
dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb



dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb



dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \

	bcm28155-ap.dtb

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+32 −17
Original line number Diff line number Diff line
@@ -27,6 +27,25 @@ 
	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000

			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;



		pcie-controller {

			status = "okay";



			/* Connected to Marvell SATA controller */

			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			/* Connected to FL1009 USB 3.0 controller */

			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};



		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;
@@ -57,6 +76,11 @@ 
					marvell,pins = "mpp56";

					marvell,function = "gpio";

				};



				poweroff: poweroff {

					marvell,pins = "mpp8";

					marvell,function = "gpio";

				};

			};



			mdio {
@@ -89,22 +113,6 @@ 
					pwm_polarity = <0>;

				};

			};



			pcie-controller {

				status = "okay";



				/* Connected to Marvell SATA controller */

				pcie@1,0 {

					/* Port 0, Lane 0 */

					status = "okay";

				};



				/* Connected to FL1009 USB 3.0 controller */

				pcie@2,0 {

					/* Port 1, Lane 0 */

					status = "okay";

				};

			};

		};

	};
@@ -160,7 +168,7 @@ 
		button@1 {

			label = "Power Button";

			linux,code = <116>;     /* KEY_POWER */

			gpios = <&gpio1 30 1>;

			gpios = <&gpio1 30 0>;

		};



		button@2 {
@@ -176,4 +184,11 @@ 
		};

	};



	gpio_poweroff {

		compatible = "gpio-poweroff";

		pinctrl-0 = <&poweroff>;

		pinctrl-names = "default";

		gpios = <&gpio0 8 1>;

	};



};

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

+11 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 


			timer@20300 {

				compatible = "marvell,armada-xp-timer";

				clocks = <&coreclk 2>, <&refclk>;

				clock-names = "nbclk", "fixed";

			};



			coreclk: mvebu-sar@18230 {
@@ -169,4 +171,13 @@ 
			};

		};

	};



	clocks {

		/* 25 MHz reference crystal */

		refclk: oscillator {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <25000000>;

		};

	};

};