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

Commit fc5d4622 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-for-v3.12' of... 

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

From Simon Horman:
Renesas ARM based SoC updates for v3.12

* Setup arch timer based on MD pins on r8a7790 SoC
* Thermal driver support for r8a7790 SoC
* Make arch timer optional for r8a7790 and r8a73a4 SoCs
* CMT10 clock event for r8a7790 and r8a73a4 SoCs
* Increased clock coverage for r8a73a4 SoC
* MMCIF DMA definitions for r8a7740 SoC
* Disconnect SMP code from clocks on emev2 SoC

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

: (49 commits)
  ARM: shmobile: Setup r8a7790 arch timer based on MD pins
  ARM: shmobile: Introduce r8a7790_read_mode_pins()
  ARM: shmobile: r8a7740: add MMCIF DMA definitions
  ARM: shmobile: Disconnect EMEV2 SMP code from clocks
  ARM: shmobile: Make r8a73a4 Arch timer optional
  ARM: shmobile: Add r8a73a4 CMT10 clock event
  ARM: shmobile: Make r8a7790 Arch timer optional
  ARM: shmobile: Add r8a7790 CMT00 clock event
  ARM: shmobile: Sort r8a7790 MSTP entries
  ARM: shmobile: r8a73a4: add clocks for I2C controllers
  ARM: shmobile: r8a73a4: add Z2 clock support
  ARM: shmobile: r8a73a4: safeguard against wrong clk_set_rate() uses
  ARM: shmobile: r8a73a4: implement CPU clock scaling for CPUFreq
  ARM: shmobile: r8a73a4: wait for completion when kicking the clock
  ARM: shmobile: r8a7790: add thermal driver support
  ARM: shmobile: r8a7790: add clocks for thermal
  ARM: shmobile: Add SMSC ethernet chip to KZM9D DT reference
  ARM: shmobile: KZM9D DT reference implementation
  ARM: shmobile: r8a7790: add MMCIF and SDHI DT templates
  ARM: shmobile: r8a73a4: add MMCIF and SDHI DT templates
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1c0e1a3 81b9d535

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ 
	ccu9540.dtb

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

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

	emev2-kzm9d-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7740-armadillo800eva-reference.dtb \

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

0 → 100644
+57 −0
Original line number 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 nfsroot=,rsize=4096,wsize=4096";

	};



	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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
	};



	chosen {

		bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";

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

	};

};

arch/arm/boot/dts/emev2.dtsi

+59 −0
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 
	compatible = "renesas,emev2";

	interrupt-parent = <&gic>;



	aliases {

		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

		gpio3 = &gpio3;

		gpio4 = &gpio4;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -67,4 +75,55 @@ 
		reg = <0xe1050000 0x38>;

		interrupts = <0 11 0>;

	};



	gpio0: gpio@e0050000 {

		compatible = "renesas,em-gio";

		reg = <0xe0050000 0x2c>, <0xe0050040 0x20>;

		interrupts = <0 67 0>, <0 68 0>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

	gpio1: gpio@e0050080 {

		compatible = "renesas,em-gio";

		reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>;

		interrupts = <0 69 0>, <0 70 0>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

	gpio2: gpio@e0050100 {

		compatible = "renesas,em-gio";

		reg = <0xe0050100 0x2c>, <0xe0050140 0x20>;

		interrupts = <0 71 0>, <0 72 0>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

	gpio3: gpio@e0050180 {

		compatible = "renesas,em-gio";

		reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>;

		interrupts = <0 73 0>, <0 74 0>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <32>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

	gpio4: gpio@e0050200 {

		compatible = "renesas,em-gio";

		reg = <0xe0050200 0x2c>, <0xe0050240 0x20>;

		interrupts = <0 75 0>, <0 76 0>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpios = <31>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

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

+22 −0
Original line number Diff line number Diff line
@@ -50,3 +50,25 @@ 
		};

	};

};



&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% */

};