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

Commit 8ba1f188 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Simon Horman
Browse files

ARM: shmobile: ape6evm-reference: Remove board C code and DT file 



Now that the r8a73a4 generic multiplatform case has the same features as the
APE6EVM DT reference board code, we get rid of the latter.  DT reference
code in the future shall make use of the r8a73a4 multiplatform support code
with the generic SoC machine vector.

Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[geert: Update Documentation/devicetree/bindings/arm/shmobile.txt]
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent e4ba0a9b

Documentation/devicetree/bindings/arm/shmobile.txt

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,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

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
	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";

};

arch/arm/mach-shmobile/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -142,18 +142,6 @@ config MACH_APE6EVM 
	select SMSC_PHY if SMSC911X

	select USE_OF



config MACH_APE6EVM_REFERENCE

	bool "APE6EVM board - Reference Device Tree Implementation"

	depends on ARCH_R8A73A4

	select SMSC_PHY if SMSC911X

	select USE_OF

	---help---

	   Use reference implementation of APE6EVM board support

	   which makes a greater use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers



config MACH_MACKEREL

	bool "mackerel board"

	depends on ARCH_SH7372

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI 
obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o

else

obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o

obj-$(CONFIG_MACH_APE6EVM_REFERENCE)	+= board-ape6evm-reference.o

obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o

obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o

obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o