Commit 05e46817 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-r7s72100-ccf2-for-v3.16' of... 

Merge tag 'renesas-r7s72100-ccf2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Second Round of Renesas ARM Based SoC r7s72100 CCF Updates for v3.16"
from Simon Horman:

r7s72100 (RZ/A1H) SoC based Genmai board
* Remove non-multiplatform support from genmai-reference

* tag 'renesas-r7s72100-ccf2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Remove Genmai reference DTS
  ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
  ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
  ARM: shmobile: genmai-reference: Remove legacy clock support
  ARM: shmobile: Remove non-multiplatform Genmai reference support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1af809f6 a5176e0d

arch/arm/boot/dts/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ 
	s3c6410-smdk6410.dtb

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

	r7s72100-genmai.dtb \

	r7s72100-genmai-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \
@@ -314,7 +313,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ 
	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

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

	r7s72100-genmai-reference.dtb \

	r7s72100-genmai.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb

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

arch/arm/boot/dts/r7s72100-genmai-reference.dts

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the Genmai board

 *

 * Copyright (C) 2013-14 Renesas Solutions Corp.

 * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>

 *

 * 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 "r7s72100.dtsi"



/ {

	model = "Genmai";

	compatible = "renesas,genmai-reference", "renesas,r7s72100";



	aliases {

		serial2 = &scif2;

	};



	chosen {

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

	};



	memory {

		device_type = "memory";

		reg = <0x08000000 0x08000000>;

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};

};



&extal_clk {

	clock-frequency = <13330000>;

};



&usb_x1_clk {

	clock-frequency = <48000000>;

};



&i2c2 {

	status = "okay";

	clock-frequency = <400000>;



	eeprom@50 {

		compatible = "renesas,24c128";

		reg = <0x50>;

		pagesize = <64>;

	};

};



&scif2 {

	status = "okay";

};

arch/arm/boot/dts/r7s72100-genmai.dts

+29 −1
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the Genmai board

 *

 * Copyright (C) 2013 Renesas Solutions Corp.

 * Copyright (C) 2013-14 Renesas Solutions Corp.

 * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>

 *

 * 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
@@ -15,6 +16,10 @@ 
	model = "Genmai";

	compatible = "renesas,genmai", "renesas,r7s72100";



	aliases {

		serial2 = &scif2;

	};



	chosen {

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

	};
@@ -29,3 +34,26 @@ 
		#size-cells = <1>;

	};

};



&extal_clk {

	clock-frequency = <13330000>;

};



&usb_x1_clk {

	clock-frequency = <48000000>;

};



&i2c2 {

	status = "okay";

	clock-frequency = <400000>;



	eeprom@50 {

		compatible = "renesas,24c128";

		reg = <0x50>;

		pagesize = <64>;

	};

};



&scif2 {

	status = "okay";

};

arch/arm/mach-shmobile/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -240,17 +240,6 @@ config MACH_GENMAI 
	depends on ARCH_R7S72100

	select USE_OF



config MACH_GENMAI_REFERENCE

	bool "Genmai board - Reference Device Tree Implementation"

	depends on ARCH_R7S72100

	select USE_OF

	---help---

	   Use reference implementation of Genmai board support

	   which makes use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers



config MACH_MARZEN

	bool "MARZEN board"

	depends on ARCH_R8A7779

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o 
obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o

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

obj-$(CONFIG_MACH_GENMAI)	+= board-genmai.o

obj-$(CONFIG_MACH_GENMAI_REFERENCE)	+= board-genmai-reference.o

obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o

obj-$(CONFIG_MACH_LAGER)	+= board-lager.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE