Commit 4e0f3fcf authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'dt2' into cleanup3-base 

Conflicts:
	arch/arm/mach-shmobile/Makefile.boot
parents 98724b7e 8b3e32c1

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -186,12 +186,16 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	emev2-kzm9d-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7740-armadillo800eva-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7779-marzen-reference.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

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

	socfpga_vt.dtb

arch/arm/boot/dts/emev2.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ 
		      <0xe0020000 0x0100>;

	};



	pmu {

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

		interrupts = <0 120 4>,

			     <0 121 4>;

	};



	sti@e0180000 {

		compatible = "renesas,em-sti";

		reg = <0xe0180000 0x54>;

arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts

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

 * Device Tree Source for the APE6EVM 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/ "r8a73a4.dtsi"



/ {

	model = "APE6EVM";

	compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";



	chosen {

		bootargs = "console=ttySC0,115200 ignore_loglevel rw";

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x40000000>;

	};



	lbsc {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0 0x80000000>;

	};

};



&i2c5 {

	vdd_dvfs: max8973@1b {

		compatible = "maxim,max8973";

		reg = <0x1b>;



		regulator-min-microvolt = <935000>;

		regulator-max-microvolt = <1200000>;

		regulator-boot-on;

		regulator-always-on;

	};

};



&cpu0 {

	cpu0-supply = <&vdd_dvfs>;

	operating-points = <

		/* kHz  uV */

		1950000 1115000

		1462500  995000

	>;

	voltage-tolerance = <1>; /* 1% */

};



&pfc {

	pinctrl-0 = <&scifa0_pins>;

	pinctrl-names = "default";



	scifa0_pins: scifa0 {

		renesas,groups = "scifa0_data";

		renesas,function = "scifa0";

	};

};

arch/arm/boot/dts/r8a73a4-ape6evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
	compatible = "renesas,ape6evm", "renesas,r8a73a4";



	chosen {

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

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

	};



	memory@40000000 {

arch/arm/boot/dts/r8a7740.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ 
		      <0xc2000000 0x1000>;

	};



	pmu {

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

		interrupts = <0 83 4>;

	};



	/* irqpin0: IRQ0 - IRQ7 */

	irqpin0: irqpin@e6900000 {

		compatible = "renesas,intc-irqpin";
@@ -139,4 +144,11 @@ 
			      0 72 0x4

			      0 73 0x4>;

	};



	tpu: pwm@e6600000 {

		compatible = "renesas,tpu-r8a7740", "renesas,tpu";

		reg = <0xe6600000 0x100>;

		status = "disabled";

		#pwm-cells = <3>;

	};

};