openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Second Round of Renesas ARM Based SoC r7s72100 CCF Updates for v3.16 

r7s72100 (RZ/A1H) SoC based Genmai board
 * Remove non-multiplatform support from genmai-reference
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdrjHAAoJENfPZGlqN0++oPUP/0VM8qVNwLMSa0iDxxyno3V0
 OaiivXbMjMuZ7OjySK8T5uC2B4j76q0FX/zP4QS7b3ivdSTA/7LUkL4wd3lGebqX
 x+JphEOrIisEJnhjgHU3B3SPqAJ5zBFReH1uyYELVEBowP45GyTWai84+c4NIwQ8
 WMEfOs2dvSwJRSvyZeABczO1UdyksPlIDjqrCHylwjPZhTJNO/JaFFvTi5KgSBlj
 pBXPHv7oEFKcuno98jwxJAlP/jC6uoBRvdlwR7/64HUfePhylQSwHOIEcrDDvBR3
 ukDQ0mx8Y5Pk2Uv1YyRWnGx1/mUzjYItAE2dQFG3r6rIfPRcj1pKBM1oNYBPNiyP
 qvLmmIQ2Hy3d+4qDHPeaPejmZOkXyw1ZnG5FC1QJ3hUvpSe5iRLojfV9s+6mqa6v
 j06NwNk9D5CwqCTWbtiNrZU09wJusAyyAQSajqoGcbRXkEAfOxLwfZ3wS1LT+NZT
 rNHqb5bwkEz/adSpZ4QlZ5qWO8eWQ75sIZxMAneJ0rEY/3xEuqEDFdwHc+6I0Auu
 x57nZs0hBBSR4RuzF9vdoUny8tNg4qyznj5he8t6fcCtCaJKXyaZn+K/C34zuw+0
 RGcvH047dxzmbsjNMKfyqd04/GeBV5pNTqQ5RF+Ui6Xl6tHqnXYI0/CqRSkFQj37
 3v/kotj6ZSkk3w9x/+Ho
 =kWk7
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-21 22:05:52 -07:00
parent 1af809f65a a5176e0d9d
commit 05e4681794
7 changed files with 31 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/Makefile
View File

@ -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 \

59
arch/arm/boot/dts/r7s72100-genmai-reference.dts
View File

@ -1,59 +0,0 @@
/*
* 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";
};

30
arch/arm/boot/dts/r7s72100-genmai.dts
View File

@ -1,7 +1,8 @@
/*
* 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 @@ lbsc {
#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";
};

11
arch/arm/mach-shmobile/Kconfig
View File

@ -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

1
arch/arm/mach-shmobile/Makefile
View File

@ -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

1
arch/arm/mach-shmobile/Makefile.boot
View File

@ -7,7 +7,6 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000
loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000
loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000

8
arch/arm/mach-shmobile/board-genmai-reference.c
View File

@ -26,7 +26,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#ifdef CONFIG_COMMON_CLK
/*
* This is a really crude hack to provide clkdev support to platform
* devices until they get moved to DT.
@ -34,21 +33,16 @@
static const struct clk_name clk_names[] = {
{ "mtu2", "fck", "sh-mtu2" },
};
#endif
static void __init genmai_add_standard_devices(void)
{
#ifdef CONFIG_COMMON_CLK
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
#else
r7s72100_clock_init();
#endif
r7s72100_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
static const char * const genmai_boards_compat_dt[] __initconst = {
"renesas,genmai-reference",
"renesas,genmai",
NULL,
};