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

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

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

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

From Simon Horman:
Third round of Renesas ARM based SoC cleanups for v3.12

* Remove global GPIO_NR definition from sh73a0 SoC
* Remove unnecessary nfsroot settings from bootargs of
  kzm9d and armadillo800eva
* Rename irq initialisation functions of r8a7779 SoC
  to make them consistent with other SoCs
* Simplify irq initialisation of r8a7740 SoC
* Add missing __initdata annotations to bockw board, and
  r8a7790 and r8a7779 SoCs
* Refactor time initialisation and remove shmobile_init_time.
  - This affects the following boards: kzm9g, marzen, ape6evm,
    armadillo800eva and bockw
  - This affects the following SoCs: r8a7790, r8a7779, r7a7740, r7a73a4
* Cleanup device registration code of r8a7778 SoC

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

: (45 commits)
  ARM: shmobile: sh73a0: Remove global GPIO_NR definition
  ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
  ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
  ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
  ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
  ARM: shmobile: bockw: add missing __initdata
  ARM: shmobile: r8a7790: add missing __initdata
  ARM: shmobile: r8a7779: add missing __initdata
  ARM: shmobile: Remove unused shmobile_init_time()
  ARM: shmobile: Use clocksource_of_init() on r8a7790
  ARM: shmobile: Use default ->init_time() on KZM9G DT ref
  ARM: shmobile: Use default ->init_time() on Marzen DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM
  ARM: shmobile: Use default ->init_time() on Armadillo DT ref
  ARM: shmobile: Use default ->init_time() on Bockw DT ref
  ARM: shmobile: Use default ->init_time() on Bockw
  ARM: shmobile: Use default ->init_time() on r8a7779
  ARM: shmobile: Use default ->init_time() on r8a7778
  ARM: shmobile: Use default ->init_time() on r8a7740
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f0a108b7 282b583f

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-kzm9d-reference.dts

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



	chosen {

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

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

	};



	reg_1p8v: regulator@0 {

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

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



	chosen {

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

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

	};

};

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";

	};

};