Commit 4fd03763 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'renesas/boards2' into next/boards 



From Simon Horman:
* renesas/boards2: (64 commits)
  ARM: shmobile: marzen: enable INTC IRQ
  ARM: shmobile: bockw: add SMSC support on reference
  ARM: shmobile: Use SMP on Koelsch
  ARM: shmobile: Remove KZM9D reference DTS
  ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
  ARM: shmobile: Remove non-multiplatform KZM9D reference support
  ARM: shmobile: Use KZM9D without reference for multiplatform
  ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
  ARM: shmobile: Use arch timer on Koelsch
  ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch
  ARM: shmobile: Genmai support
  ARM: shmobile: marzen: enable DMA for SDHI0
  ARM: shmobile: bockw: enable DMA for SDHI0
  ARM: shmobile: ape6evm: add DMA support to MMCIF
  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
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents d174ec22 7d4bde88

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+10 −7
Original line number Original line 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

described in mmc.txt, can be used. Additionally the following tmio_mmc-specific

optional bindings can be used.

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:

Optional properties:

- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
 
- 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/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
	ste-ccu9540.dtb

	ste-ccu9540.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	emev2-kzm9d-reference.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7778-bockw-reference.dtb \
@@ -211,7 +211,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \

	socfpga_vt.dtb

	socfpga_vt.dtb

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

arch/arm/boot/dts/emev2-kzm9d-reference.dts

deleted100644 → 0
+0 −57
Original line number Original line Diff line number Diff line 
/*

 * Device Tree Source for the KZM9D board

 *

 * 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.

 */

/dts-v1/;



/include/ "emev2.dtsi"



/ {

	model = "EMEV2 KZM9D Board";

	compatible = "renesas,kzm9d-reference", "renesas,emev2";



	memory {

		device_type = "memory";

		reg = <0x40000000 0x8000000>;

	};



	chosen {

		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";

	};



	reg_1p8v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

	};



	reg_3p3v: regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	lan9220@20000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 1>;	/* active high */

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

		vddvario-supply = <&reg_1p8v>;

		vdd33a-supply = <&reg_3p3v>;

	};

};

arch/arm/boot/dts/emev2-kzm9d.dts

+32 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Device Tree Source for the KZM9D board

 * Device Tree Source for the KZM9D board

 *

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 * Copyright (C) 2013 Renesas Solutions Corp.

 *

 *

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

 * 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

 * version 2.  This program is licensed "as is" without any warranty of any
@@ -23,4 +23,35 @@ 
	chosen {

	chosen {

		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";

		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";

	};

	};



	reg_1p8v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

	};



	reg_3p3v: regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	lan9220@20000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 1>;	/* active high */

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

		vddvario-supply = <&reg_1p8v>;

		vdd33a-supply = <&reg_3p3v>;

	};

};
 
};

arch/arm/boot/dts/r7s72100-genmai.dts

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

 * Device Tree Source for the Genmai board

 *

 * 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.

 */



/dts-v1/;

/include/ "r7s72100.dtsi"



/ {

	model = "Genmai";

	compatible = "renesas,genmai", "renesas,r7s72100";



	chosen {

		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

	};



	memory {

		device_type = "memory";

		reg = <0x08000000 0x08000000>;

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE