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

Commit 695e6044 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'renesas-soc2-for-v3.13' of... 

Merge tag 'renesas-soc2-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Second Round of Renesas ARM based SoC updates for v3.13

* SMP support for r8a7791 SoC
* r8a7779_init_irq_extpin() for DT for r8a7779 and r8a7778 SoCs
* Add HPB-DMAC to r8a7779 and r8a7778 SoCs
* Add r7s72100 SoC
* Make use of ARCH timer workaround on r8a7791 SoC
* Add IRQC platform device support to r8a7791 SoC
* Add I2C clocks and aliases for the DT mode for r8a7790 SoC
* Add MAC platform device to r8a73a4 SoC

* tag 'renesas-soc2-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7791 SMP support
  ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT
  ARM: shmobile: r8a7778: split r8a7778_init_irq_extpin() for DT
  ARM: shmobile: r7s72100 SCIF support
  ARM: shmobile: Initial r7s72100 SoC support
  ARM: shmobile: r8a7791 Arch timer workaround
  ARM: shmobile: r8a7791 IRQC platform device support
  ARM: shmobile: Introduce r8a7791_add_standard_devices()
  ARM: shmobile: Break out R-Car Gen2 setup code
  ARM: shmobile: r8a73a4: add a clock alias for the DMAC in DT mode
  ARM: shmobile: r8a7790: add I2C clocks and aliases for the DT mode
  ARM: shmobile: r8a7779: add HPB-DMAC support
  ARM: shmobile: r8a7778: add HPB-DMAC support
  ARM: shmobile: r8a73a4: add a DMAC platform device and clock for it
  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

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents eea4fba5 687c27b0

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.

arch/arm/boot/dts/r7s72100.dtsi

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the r7s72100 SoC

 *

 * Copyright (C) 2013 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/ {

	compatible = "renesas,r7s72100";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

	};



	gic: interrupt-controller@e8201000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <0>;

		interrupt-controller;

		reg = <0xe8201000 0x1000>,

			<0xe8202000 0x1000>;

	};

};

arch/arm/boot/dts/r8a73a4.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
	};



	sdhi0: sdhi@ee100000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee100000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 165 4>;
@@ -202,7 +202,7 @@ 
	};



	sdhi1: sdhi@ee120000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee120000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 166 4>;
@@ -211,7 +211,7 @@ 
	};



	sdhi2: sdhi@ee140000 {

		compatible = "renesas,r8a73a4-sdhi";

		compatible = "renesas,sdhi-r8a73a4";

		reg = <0 0xee140000 0 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 167 4>;

arch/arm/boot/dts/r8a7778.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -96,6 +96,5 @@ 
	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7778";

		reg = <0xfffc000 0x118>;

		#gpio-range-cells = <3>;

	};

};

arch/arm/boot/dts/r8a7779.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ 
	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7779";

		reg = <0xfffc0000 0x23c>;

		#gpio-range-cells = <3>;

	};



	thermal@ffc48000 {