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

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

Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of... 

Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform

Merge "Renesas ARM Based SoC r8a73a4 CCF and Multiplatform Updates for
v4.1" from Simon Horman:

* Add CCF and them multiplatform support to r8a73a4 SoC and its
  ape6evm board.
* Then remove legacy r8a73a4 SoC and ape6evm board code.

----------------------------------------------------------------
Geert Uytterhoeven (6):
      ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
      ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
      ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug
      ARM: shmobile: ape6evm dts: Drop console= bootargs parameter
      PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding
      ARM: shmobile: r8a73a4 dtsi: Add PM domain support

Laurent Pinchart (1):
      ARM: shmobile: r8a73a4: Remove legacy code

Simon Horman (1):
      ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform

Ulrich Hecht (5):
      ARM: shmobile: r8a73a4: Add CPG register bits header
      ARM: shmobile: r8a73a4: Common clock framework DT description
      ARM: shmobile: ape6evm: Disable legacy clock initialization
      ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
      ARM: shmobile: ape6evm-reference: Remove board C code and DT file

 Documentation/devicetree/bindings/arm/shmobile.txt |   2 -
 .../bindings/power/renesas,sysc-rmobile.txt        |   1 +
 MAINTAINERS                                        |   1 -
 arch/arm/boot/dts/Makefile                         |   2 -
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    | 156 -----
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |  37 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 557 ++++++++++++++++-
 arch/arm/configs/ape6evm_defconfig                 | 109 ----
 arch/arm/mach-shmobile/Kconfig                     |  25 -
 arch/arm/mach-shmobile/Makefile                    |   3 -
 arch/arm/mach-shmobile/Makefile.boot               |   2 -
 arch/arm/mach-shmobile/board-ape6evm-reference.c   |  60 --
 arch/arm/mach-shmobile/board-ape6evm.c             | 306 ----------
 arch/arm/mach-shmobile/clock-r8a73a4.c             | 659 ---------------------
 arch/arm/mach-shmobile/r8a73a4.h                   |  17 -
 arch/arm/mach-shmobile/setup-r8a73a4.c             | 273 +--------
 include/dt-bindings/clock/r8a73a4-clock.h          |  62 ++
 17 files changed, 615 insertions(+), 1657 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
 delete mode 100644 arch/arm/configs/ape6evm_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c
 delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h
 create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h

* tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a73a4: Remove legacy code
  ARM: shmobile: r8a73a4 dtsi: Add PM domain support
  PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding
  ARM: shmobile: ape6evm dts: Drop console= bootargs parameter
  ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
  ARM: shmobile: ape6evm-reference: Remove board C code and DT file
  ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug
  ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
  ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
  ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
  ARM: shmobile: ape6evm: Disable legacy clock initialization
  ARM: shmobile: r8a73a4: Common clock framework DT description
  ARM: shmobile: r8a73a4: Add CPG register bits header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 369237ab 914d7d14

Documentation/devicetree/bindings/arm/shmobile.txt

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ Boards: 
    compatible = "renesas,alt", "renesas,r8a7794"

  - APE6-EVM

    compatible = "renesas,ape6evm", "renesas,r8a73a4"

  - APE6-EVM - Reference Device Tree Implementation

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

  - Atmark Techno Armadillo-800 EVA

    compatible = "renesas,armadillo800eva"

  - BOCK-W

Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
- compatible: Should be "renesas,sysc-<soctype>", "renesas,sysc-rmobile" as

	      fallback.

	      Examples with soctypes are:

		- "renesas,sysc-r8a73a4" (R-Mobile APE6)

		- "renesas,sysc-r8a7740" (R-Mobile A1)

		- "renesas,sysc-sh73a0" (SH-Mobile AG5)

- reg: Two address start and address range blocks for the device:

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,6 @@ F: arch/arm/boot/dts/emev2* 
F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/sh*

F:	arch/arm/configs/ape6evm_defconfig

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/kzm9g_defconfig

arch/arm/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -464,8 +464,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
	s5pv210-smdkv210.dtb \

	s5pv210-torbreck.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

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

deleted100644 → 0
+0 −156
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"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "APE6EVM";

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



	aliases {

		serial0 = &scifa0;

	};



	chosen {

		bootargs = "ignore_loglevel rw";

		stdout-path = &scifa0;

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x40000000>;

	};



	memory@200000000 {

		device_type = "memory";

		reg = <2 0x00000000 0 0x40000000>;

	};



	vcc_mmc0: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "MMC0 Vcc";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		regulator-always-on;

	};



	vcc_sdhi0: regulator@1 {

		compatible = "regulator-fixed";



		regulator-name = "SDHI0 Vcc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&pfc 76 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	/* Common 3.3V rail, used by several devices on APE6EVM */

	ape6evm_fixed_3v3: regulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	lbsc {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0 0x20000000>;

	};

};



&i2c5 {

	status = "okay";

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

};



&cmt1 {

	status = "okay";

};



&pfc {

	scifa0_pins: serial0 {

		renesas,groups = "scifa0_data";

		renesas,function = "scifa0";

	};



	mmc0_pins: mmc {

		renesas,groups = "mmc0_data8", "mmc0_ctrl";

		renesas,function = "mmc0";

	};



	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";

		renesas,function = "sdhi0";

	};



	sdhi1_pins: sd1 {

		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";

		renesas,function = "sdhi1";

	};

};



&mmcif0 {

	vmmc-supply = <&vcc_mmc0>;

	bus-width = <8>;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	status = "okay";

};



&scifa0 {

	pinctrl-0 = <&scifa0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	vmmc-supply = <&vcc_sdhi0>;

	bus-width = <4>;

	toshiba,mmc-wrprotect-disable;

	pinctrl-names = "default";

	pinctrl-0 = <&sdhi0_pins>;

	status = "okay";

};



&sdhi1 {

	vmmc-supply = <&ape6evm_fixed_3v3>;

	bus-width = <4>;

	broken-cd;

	toshiba,mmc-wrprotect-disable;

	pinctrl-names = "default";

	pinctrl-0 = <&sdhi1_pins>;

	status = "okay";

};