* [PATCH 1/8] ARM: shmobile: r8a7779: Rename DU device in clock lookups list
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 2/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The DU device will be called rcar-du-r8a7779. Rename the clock lookup
entry accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index bd6ad92..1f7080f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -200,7 +200,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */
- CLKDEV_DEV_ID("rcar-du.0", &mstp_clks[MSTP103]), /* DU */
+ CLKDEV_DEV_ID("rcar-du-r8a7779", &mstp_clks[MSTP103]), /* DU */
};
void __init r8a7779_clock_init(void)
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 2/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
2013-10-01 2:34 ` [PATCH 1/8] ARM: shmobile: r8a7779: Rename DU device in clock lookups list Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 3/8] ARM: shmobile: r8a7778: add SSI/SRU clock support Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index fc36d3d..d99b87b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -182,7 +182,7 @@ static struct clk div6_clks[DIV6_NR] = {
/* MSTP */
enum {
MSTP813,
- MSTP721, MSTP720,
+ MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
MSTP717, MSTP716,
MSTP522,
MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
@@ -193,6 +193,11 @@ enum {
static struct clk mstp_clks[MSTP_NR] = {
[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
+ [MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */
+ [MSTP725] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 25, 0), /* LVDS1 */
+ [MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */
+ [MSTP723] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 23, 0), /* DU1 */
+ [MSTP722] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 22, 0), /* DU2 */
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
@@ -251,6 +256,11 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),
/* MSTP */
+ CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]),
+ CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]),
+ CLKDEV_ICK_ID("du.0", "rcar-du-r8a7790", &mstp_clks[MSTP724]),
+ CLKDEV_ICK_ID("du.1", "rcar-du-r8a7790", &mstp_clks[MSTP723]),
+ CLKDEV_ICK_ID("du.2", "rcar-du-r8a7790", &mstp_clks[MSTP722]),
CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]),
CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]),
CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]),
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/8] ARM: shmobile: r8a7778: add SSI/SRU clock support
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
2013-10-01 2:34 ` [PATCH 1/8] ARM: shmobile: r8a7779: Rename DU device in clock lookups list Simon Horman
2013-10-01 2:34 ` [PATCH 2/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
` (5 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Add a platform clock for the r8a7778 SRU/SSI sound.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7778.c | 43 ++++++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index c4bf2d8..244a8de 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -69,6 +69,15 @@ static struct clk extal_clk = {
.mapping = &cpg_mapping,
};
+static struct clk audio_clk_a = {
+};
+
+static struct clk audio_clk_b = {
+};
+
+static struct clk audio_clk_c = {
+};
+
/*
* clock ratio of these clock will be updated
* on r8a7778_clock_init()
@@ -100,18 +109,23 @@ static struct clk *main_clks[] = {
&p_clk,
&g_clk,
&z_clk,
+ &audio_clk_a,
+ &audio_clk_b,
+ &audio_clk_c,
};
enum {
MSTP331,
MSTP323, MSTP322, MSTP321,
+ MSTP311, MSTP310,
+ MSTP309, MSTP308, MSTP307,
MSTP114,
MSTP110, MSTP109,
MSTP100,
MSTP030,
MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
- MSTP016, MSTP015,
- MSTP007,
+ MSTP016, MSTP015, MSTP012, MSTP011, MSTP010,
+ MSTP009, MSTP008, MSTP007,
MSTP_NR };
static struct clk mstp_clks[MSTP_NR] = {
@@ -119,6 +133,11 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP323] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 23, 0), /* SDHI0 */
[MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */
[MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */
+ [MSTP311] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 11, 0), /* SSI4 */
+ [MSTP310] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 10, 0), /* SSI5 */
+ [MSTP309] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 9, 0), /* SSI6 */
+ [MSTP308] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 8, 0), /* SSI7 */
+ [MSTP307] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 7, 0), /* SSI8 */
[MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */
[MSTP110] = SH_CLK_MSTP32(&s_clk, MSTPCR1, 10, 0), /* VIN0 */
[MSTP109] = SH_CLK_MSTP32(&s_clk, MSTPCR1, 9, 0), /* VIN1 */
@@ -135,11 +154,20 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP021] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 21, 0), /* SCIF5 */
[MSTP016] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 16, 0), /* TMU0 */
[MSTP015] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 15, 0), /* TMU1 */
+ [MSTP012] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 12, 0), /* SSI0 */
+ [MSTP011] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 11, 0), /* SSI1 */
+ [MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
+ [MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 9, 0), /* SSI3 */
+ [MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 8, 0), /* SRU */
[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 7, 0), /* HSPI */
};
static struct clk_lookup lookups[] = {
/* main */
+ CLKDEV_CON_ID("audio_clk_a", &audio_clk_a),
+ CLKDEV_CON_ID("audio_clk_b", &audio_clk_b),
+ CLKDEV_CON_ID("audio_clk_c", &audio_clk_c),
+ CLKDEV_CON_ID("audio_clk_internal", &s1_clk),
CLKDEV_CON_ID("shyway_clk", &s_clk),
CLKDEV_CON_ID("peripheral_clk", &p_clk),
@@ -168,6 +196,17 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
+ CLKDEV_DEV_ID("rcar_sound", &mstp_clks[MSTP008]), /* SRU */
+
+ CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP012]),
+ CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP011]),
+ CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP010]),
+ CLKDEV_ICK_ID("ssi.3", "rcar_sound", &mstp_clks[MSTP009]),
+ CLKDEV_ICK_ID("ssi.4", "rcar_sound", &mstp_clks[MSTP311]),
+ CLKDEV_ICK_ID("ssi.5", "rcar_sound", &mstp_clks[MSTP310]),
+ CLKDEV_ICK_ID("ssi.6", "rcar_sound", &mstp_clks[MSTP309]),
+ CLKDEV_ICK_ID("ssi.7", "rcar_sound", &mstp_clks[MSTP308]),
+ CLKDEV_ICK_ID("ssi.8", "rcar_sound", &mstp_clks[MSTP307]),
};
void __init r8a7778_clock_init(void)
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (2 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 3/8] ARM: shmobile: r8a7778: add SSI/SRU clock support Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2014-08-18 15:51 ` [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree Ulrich Hecht
` (5 more replies)
2013-10-01 2:34 ` [PATCH 5/8] ARM: shmobile: r8a7791 SCIF support Simon Horman
` (4 subsequent siblings)
8 siblings, 6 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Add initial support for the r8a7791 SoC including:
- Single Cortex-A15 CPU Core
- GIC
No static virtual mappings are used, all the components
make use of ioremap(). DT_MACHINE_START is still wrapped
in CONFIG_USE_OF to match other mach-shmobile code.
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
[damm@opensource.se: Forward ported to upstream, dropped not-yet-ready code]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 41 ++++++
arch/arm/mach-shmobile/Kconfig | 6 +
arch/arm/mach-shmobile/Makefile | 2 +
arch/arm/mach-shmobile/clock-r8a7791.c | 198 ++++++++++++++++++++++++++
arch/arm/mach-shmobile/include/mach/r8a7791.h | 6 +
arch/arm/mach-shmobile/setup-r8a7791.c | 38 +++++
6 files changed, 291 insertions(+)
create mode 100644 arch/arm/boot/dts/r8a7791.dtsi
create mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c
create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7791.h
create mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
new file mode 100644
index 0000000..bbed43b
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Device Tree Source for the r8a7791 SoC
+ *
+ * Copyright (C) 2013 Renesas Electronics Corporation
+ * 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.
+ */
+
+/ {
+ compatible = "renesas,r8a7791";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu0: cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a15";
+ reg = <0>;
+ clock-frequency = <1300000000>;
+ };
+ };
+
+ gic: interrupt-controller@f1001000 {
+ compatible = "arm,cortex-a15-gic";
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ reg = <0 0xf1001000 0 0x1000>,
+ <0 0xf1002000 0 0x1000>,
+ <0 0xf1004000 0 0x2000>,
+ <0 0xf1006000 0 0x2000>;
+ interrupts = <1 9 0xf04>;
+ };
+};
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 1f94c31..b452405 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -101,6 +101,12 @@ config ARCH_R8A7790
select SH_CLK_CPG
select RENESAS_IRQC
+config ARCH_R8A7791
+ bool "R-Car M2 (R8A77910)"
+ select ARM_GIC
+ select CPU_V7
+ select SH_CLK_CPG
+
config ARCH_EMEV2
bool "Emma Mobile EV2"
select ARCH_WANT_OPTIONAL_GPIOLIB
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 2705bfa..228193c 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
+obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
# Clock objects
@@ -27,6 +28,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o
obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o
obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o
+obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o
obj-$(CONFIG_ARCH_EMEV2) += clock-emev2.o
endif
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
new file mode 100644
index 0000000..9929feb
--- /dev/null
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -0,0 +1,198 @@
+/*
+ * r8a7791 clock framework support
+ *
+ * Copyright (C) 2013 Renesas Electronics Corporation
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/sh_clk.h>
+#include <linux/clkdev.h>
+#include <mach/clock.h>
+#include <mach/common.h>
+
+/*
+ * MD EXTAL PLL0 PLL1 PLL3
+ * 14 13 19 (MHz) *1 *1
+ *---------------------------------------------------
+ * 0 0 0 15 x 1 x172/2 x208/2 x106
+ * 0 0 1 15 x 1 x172/2 x208/2 x88
+ * 0 1 0 20 x 1 x130/2 x156/2 x80
+ * 0 1 1 20 x 1 x130/2 x156/2 x66
+ * 1 0 0 26 / 2 x200/2 x240/2 x122
+ * 1 0 1 26 / 2 x200/2 x240/2 x102
+ * 1 1 0 30 / 2 x172/2 x208/2 x106
+ * 1 1 1 30 / 2 x172/2 x208/2 x88
+ *
+ * *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2)
+ * see "p1 / 2" on R8A7791_CLOCK_ROOT() below
+ */
+
+#define MD(nr) (1 << nr)
+
+#define CPG_BASE 0xe6150000
+#define CPG_LEN 0x1000
+
+#define SMSTPCR1 0xE6150134
+#define SMSTPCR2 0xe6150138
+#define SMSTPCR3 0xE615013C
+#define SMSTPCR5 0xE6150144
+#define SMSTPCR7 0xe615014c
+#define SMSTPCR8 0xE6150990
+#define SMSTPCR9 0xE6150994
+#define SMSTPCR10 0xE6150998
+
+#define MODEMR 0xE6160060
+#define SDCKCR 0xE6150074
+#define SD2CKCR 0xE6150078
+#define SD3CKCR 0xE615007C
+#define MMC0CKCR 0xE6150240
+#define MMC1CKCR 0xE6150244
+#define SSPCKCR 0xE6150248
+#define SSPRSCKCR 0xE615024C
+
+static struct clk_mapping cpg_mapping = {
+ .phys = CPG_BASE,
+ .len = CPG_LEN,
+};
+
+static struct clk extal_clk = {
+ /* .rate will be updated on r8a7791_clock_init() */
+ .mapping = &cpg_mapping,
+};
+
+static struct sh_clk_ops followparent_clk_ops = {
+ .recalc = followparent_recalc,
+};
+
+static struct clk main_clk = {
+ /* .parent will be set r8a73a4_clock_init */
+ .ops = &followparent_clk_ops,
+};
+
+/*
+ * clock ratio of these clock will be updated
+ * on r8a7791_clock_init()
+ */
+SH_FIXED_RATIO_CLK_SET(pll1_clk, main_clk, 1, 1);
+SH_FIXED_RATIO_CLK_SET(pll3_clk, main_clk, 1, 1);
+
+/* fixed ratio clock */
+SH_FIXED_RATIO_CLK_SET(extal_div2_clk, extal_clk, 1, 2);
+SH_FIXED_RATIO_CLK_SET(cp_clk, extal_clk, 1, 2);
+
+SH_FIXED_RATIO_CLK_SET(pll1_div2_clk, pll1_clk, 1, 2);
+SH_FIXED_RATIO_CLK_SET(hp_clk, pll1_clk, 1, 12);
+SH_FIXED_RATIO_CLK_SET(p_clk, pll1_clk, 1, 24);
+
+SH_FIXED_RATIO_CLK_SET(mp_clk, pll1_div2_clk, 1, 15);
+
+static struct clk *main_clks[] = {
+ &extal_clk,
+ &extal_div2_clk,
+ &main_clk,
+ &pll1_clk,
+ &pll1_div2_clk,
+ &pll3_clk,
+ &hp_clk,
+ &p_clk,
+ &mp_clk,
+ &cp_clk,
+};
+
+/* MSTP */
+enum {
+ MSTP721, MSTP720,
+/* MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,*/
+ MSTP_NR
+};
+
+static struct clk mstp_clks[MSTP_NR] = {
+ [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
+ [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
+};
+
+static struct clk_lookup lookups[] = {
+
+ /* main clocks */
+ CLKDEV_CON_ID("extal", &extal_clk),
+ CLKDEV_CON_ID("extal_div2", &extal_div2_clk),
+ CLKDEV_CON_ID("main", &main_clk),
+ CLKDEV_CON_ID("pll1", &pll1_clk),
+ CLKDEV_CON_ID("pll1_div2", &pll1_div2_clk),
+ CLKDEV_CON_ID("pll3", &pll3_clk),
+ CLKDEV_CON_ID("hp", &hp_clk),
+ CLKDEV_CON_ID("p", &p_clk),
+ CLKDEV_CON_ID("mp", &mp_clk),
+ CLKDEV_CON_ID("cp", &cp_clk),
+ CLKDEV_CON_ID("peripheral_clk", &hp_clk),
+};
+
+#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
+ extal_clk.rate = e * 1000 * 1000; \
+ main_clk.parent = m; \
+ SH_CLK_SET_RATIO(&pll1_clk_ratio, p1 / 2, 1); \
+ if (mode & MD(19)) \
+ SH_CLK_SET_RATIO(&pll3_clk_ratio, p31, 1); \
+ else \
+ SH_CLK_SET_RATIO(&pll3_clk_ratio, p30, 1)
+
+
+void __init r8a7791_clock_init(void)
+{
+ void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
+ u32 mode;
+ int k, ret = 0;
+
+ BUG_ON(!modemr);
+ mode = ioread32(modemr);
+ iounmap(modemr);
+
+ switch (mode & (MD(14) | MD(13))) {
+ case 0:
+ R8A7791_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);
+ break;
+ case MD(13):
+ R8A7791_CLOCK_ROOT(20, &extal_clk, 130, 156, 80, 66);
+ break;
+ case MD(14):
+ R8A7791_CLOCK_ROOT(26, &extal_div2_clk, 200, 240, 122, 102);
+ break;
+ case MD(13) | MD(14):
+ R8A7791_CLOCK_ROOT(30, &extal_div2_clk, 172, 208, 106, 88);
+ break;
+ }
+
+ for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
+ ret = clk_register(main_clks[k]);
+
+ if (!ret)
+ ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
+
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+
+ if (!ret)
+ shmobile_clk_init();
+ else
+ goto epanic;
+
+ return;
+
+epanic:
+ panic("failed to setup r8a7791 clocks\n");
+}
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/include/mach/r8a7791.h
new file mode 100644
index 0000000..43b7206
--- /dev/null
+++ b/arch/arm/mach-shmobile/include/mach/r8a7791.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_R8A7791_H__
+#define __ASM_R8A7791_H__
+
+void r8a7791_clock_init(void);
+
+#endif /* __ASM_R8A7791_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
new file mode 100644
index 0000000..88dcce1
--- /dev/null
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -0,0 +1,38 @@
+/*
+ * r8a7791 processor support
+ *
+ * Copyright (C) 2013 Renesas Electronics Corporation
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+#include <mach/common.h>
+#include <mach/r8a7791.h>
+#include <asm/mach/arch.h>
+
+#ifdef CONFIG_USE_OF
+static const char *r8a7791_boards_compat_dt[] __initdata = {
+ "renesas,r8a7791",
+ NULL,
+};
+
+DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
+ .dt_compat = r8a7791_boards_compat_dt,
+MACHINE_END
+#endif /* CONFIG_USE_OF */
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
@ 2014-08-18 15:51 ` Ulrich Hecht
2014-08-18 23:39 ` Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Ulrich Hecht @ 2014-08-18 15:51 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
[uli: reduced to minimum, added cmt, enabled scif2]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/r8a7794-alt.dts | 47 +++
arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++++++++++++++++++++++++++
include/dt-bindings/clock/r8a7794-clock.h | 82 +++++
4 files changed, 662 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b8c5cd3..81c1df9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -375,7 +375,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
r8a7790-lager.dtb \
- r8a7779-marzen.dtb
+ r8a7779-marzen.dtb \
+ r8a7794-alt.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_sockit.dtb \
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
new file mode 100644
index 0000000..a05d3b1
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -0,0 +1,47 @@
+/*
+ * Device Tree Source for the Alt board
+ *
+ * Copyright (C) 2014 Renesas Electronics Corporation
+ *
+ * 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 "r8a7794.dtsi"
+
+/ {
+ model = "Alt";
+ compatible = "renesas,alt", "renesas,r8a7794";
+
+ aliases {
+ serial10 = &scif2;
+ };
+
+ chosen {
+ bootargs = "console=ttySC10,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+ };
+
+ memory@40000000 {
+ device_type = "memory";
+ reg = <0 0x40000000 0 0x40000000>;
+ };
+
+ lbsc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
+
+&extal_clk {
+ clock-frequency = <20000000>;
+};
+
+&cmt0 {
+ status = "ok";
+};
+
+&scif2 {
+ status = "ok";
+};
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
new file mode 100644
index 0000000..9000d24
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -0,0 +1,531 @@
+/*
+ * Device Tree Source for the r8a7794 SoC
+ *
+ * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright (C) 2014 Ulrich Hecht
+ *
+ * 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.
+ */
+
+#include <dt-bindings/clock/r8a7794-clock.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ compatible = "renesas,r8a7794";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu0: cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a7";
+ reg = <0>;
+ clock-frequency = <1000000000>;
+ };
+
+ cpu1: cpu@1 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a7";
+ reg = <1>;
+ clock-frequency = <1000000000>;
+ };
+ };
+
+ gic: interrupt-controller@f1001000 {
+ compatible = "arm,cortex-a15-gic";
+ #interrupt-cells = <3>;
+ #address-cells = <0>;
+ interrupt-controller;
+ reg = <0 0xf1001000 0 0x1000>,
+ <0 0xf1002000 0 0x1000>,
+ <0 0xf1004000 0 0x2000>,
+ <0 0xf1006000 0 0x2000>;
+ interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+ };
+
+ cmt0: timer@ffca0000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xffca0000 0 0x1004>;
+ interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
+ <0 143 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7794_CLK_CMT0>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0x60>;
+
+ status = "disabled";
+ };
+
+ cmt1: timer@e6130000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xe6130000 0 0x1004>;
+ interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
+ <0 121 IRQ_TYPE_LEVEL_HIGH>,
+ <0 122 IRQ_TYPE_LEVEL_HIGH>,
+ <0 123 IRQ_TYPE_LEVEL_HIGH>,
+ <0 124 IRQ_TYPE_LEVEL_HIGH>,
+ <0 125 IRQ_TYPE_LEVEL_HIGH>,
+ <0 126 IRQ_TYPE_LEVEL_HIGH>,
+ <0 127 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7794_CLK_CMT1>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0xff>;
+
+ status = "disabled";
+ };
+
+ irqc0: interrupt-controller@e61c0000 {
+ compatible = "renesas,irqc-r8a7794", "renesas,irqc";
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ reg = <0 0xe61c0000 0 0x200>;
+ interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+ <0 1 IRQ_TYPE_LEVEL_HIGH>,
+ <0 2 IRQ_TYPE_LEVEL_HIGH>,
+ <0 3 IRQ_TYPE_LEVEL_HIGH>,
+ <0 12 IRQ_TYPE_LEVEL_HIGH>,
+ <0 13 IRQ_TYPE_LEVEL_HIGH>,
+ <0 14 IRQ_TYPE_LEVEL_HIGH>,
+ <0 15 IRQ_TYPE_LEVEL_HIGH>,
+ <0 16 IRQ_TYPE_LEVEL_HIGH>,
+ <0 17 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ scifa0: serial@e6c40000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c40000 0 64>;
+ interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFA0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa1: serial@e6c50000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c50000 0 64>;
+ interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFA1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa2: serial@e6c60000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c60000 0 64>;
+ interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFA2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa3: serial@e6c70000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c70000 0 64>;
+ interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7794_CLK_SCIFA3>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa4: serial@e6c78000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c78000 0 64>;
+ interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7794_CLK_SCIFA4>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa5: serial@e6c80000 {
+ compatible = "renesas,scifa-r8a7794", "renesas,scifa";
+ reg = <0 0xe6c80000 0 64>;
+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7794_CLK_SCIFA5>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb0: serial@e6c20000 {
+ compatible = "renesas,scifb-r8a7794", "renesas,scifb";
+ reg = <0 0xe6c20000 0 64>;
+ interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFB0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb1: serial@e6c30000 {
+ compatible = "renesas,scifb-r8a7794", "renesas,scifb";
+ reg = <0 0xe6c30000 0 64>;
+ interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFB1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb2: serial@e6ce0000 {
+ compatible = "renesas,scifb-r8a7794", "renesas,scifb";
+ reg = <0 0xe6ce0000 0 64>;
+ interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7794_CLK_SCIFB2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif0: serial@e6e60000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6e60000 0 64>;
+ interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif1: serial@e6e68000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6e68000 0 64>;
+ interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif2: serial@e6e58000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6e58000 0 64>;
+ interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif3: serial@e6ea8000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6ea8000 0 64>;
+ interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF3>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif4: serial@e6ee0000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6ee0000 0 64>;
+ interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF4>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif5: serial@e6ee8000 {
+ compatible = "renesas,scif-r8a7794", "renesas,scif";
+ reg = <0 0xe6ee8000 0 64>;
+ interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_SCIF5>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif0: serial@e62c0000 {
+ compatible = "renesas,hscif-r8a7794", "renesas,hscif";
+ reg = <0 0xe62c0000 0 96>;
+ interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif1: serial@e62c8000 {
+ compatible = "renesas,hscif-r8a7794", "renesas,hscif";
+ reg = <0 0xe62c8000 0 96>;
+ interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif2: serial@e62d0000 {
+ compatible = "renesas,hscif-r8a7794", "renesas,hscif";
+ reg = <0 0xe62d0000 0 96>;
+ interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ clocks {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ /* External root clock */
+ extal_clk: extal_clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ /* This value must be overriden by the board. */
+ clock-frequency = <0>;
+ clock-output-names = "extal";
+ };
+
+ /* Special CPG clocks */
+ cpg_clocks: cpg_clocks@e6150000 {
+ compatible = "renesas,r8a7794-cpg-clocks",
+ "renesas,rcar-gen2-cpg-clocks";
+ reg = <0 0xe6150000 0 0x1000>;
+ clocks = <&extal_clk>;
+ #clock-cells = <1>;
+ clock-output-names = "main", "pll0", "pll1", "pll3",
+ "lb", "qspi", "sdh", "sd0", "z";
+ };
+
+ /* Fixed factor clocks */
+ pll1_div2_clk: pll1_div2_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <2>;
+ clock-mult = <1>;
+ clock-output-names = "pll1_div2";
+ };
+ zg_clk: zg_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <6>;
+ clock-mult = <1>;
+ clock-output-names = "zg";
+ };
+ zx_clk: zx_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <3>;
+ clock-mult = <1>;
+ clock-output-names = "zx";
+ };
+ zs_clk: zs_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <6>;
+ clock-mult = <1>;
+ clock-output-names = "zs";
+ };
+ hp_clk: hp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <12>;
+ clock-mult = <1>;
+ clock-output-names = "hp";
+ };
+ i_clk: i_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <2>;
+ clock-mult = <1>;
+ clock-output-names = "i";
+ };
+ b_clk: b_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <12>;
+ clock-mult = <1>;
+ clock-output-names = "b";
+ };
+ p_clk: p_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <24>;
+ clock-mult = <1>;
+ clock-output-names = "p";
+ };
+ cl_clk: cl_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <48>;
+ clock-mult = <1>;
+ clock-output-names = "cl";
+ };
+ m2_clk: m2_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <8>;
+ clock-mult = <1>;
+ clock-output-names = "m2";
+ };
+ imp_clk: imp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <4>;
+ clock-mult = <1>;
+ clock-output-names = "imp";
+ };
+ rclk_clk: rclk_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <(48 * 1024)>;
+ clock-mult = <1>;
+ clock-output-names = "rclk";
+ };
+ oscclk_clk: oscclk_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <(12 * 1024)>;
+ clock-mult = <1>;
+ clock-output-names = "oscclk";
+ };
+ zb3_clk: zb3_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
+ #clock-cells = <0>;
+ clock-div = <4>;
+ clock-mult = <1>;
+ clock-output-names = "zb3";
+ };
+ zb3d2_clk: zb3d2_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
+ #clock-cells = <0>;
+ clock-div = <8>;
+ clock-mult = <1>;
+ clock-output-names = "zb3d2";
+ };
+ ddr_clk: ddr_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
+ #clock-cells = <0>;
+ clock-div = <8>;
+ clock-mult = <1>;
+ clock-output-names = "ddr";
+ };
+ mp_clk: mp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&pll1_div2_clk>;
+ #clock-cells = <0>;
+ clock-div = <15>;
+ clock-mult = <1>;
+ clock-output-names = "mp";
+ };
+ cp_clk: cp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
+ #clock-cells = <0>;
+ clock-div = <48>;
+ clock-mult = <1>;
+ clock-output-names = "cp";
+ };
+
+ acp_clk: acp_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&extal_clk>;
+ #clock-cells = <0>;
+ clock-div = <2>;
+ clock-mult = <1>;
+ clock-output-names = "acp";
+ };
+
+ /* Gate clocks */
+ mstp0_clks: mstp0_clks@e6150130 {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
+ clocks = <&mp_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <R8A7794_CLK_MSIOF0>;
+ clock-output-names = "msiof0";
+ };
+ mstp1_clks: mstp1_clks@e6150134 {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
+ clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
+ <&cp_clk>,
+ <&zs_clk>, <&zs_clk>, <&zs_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
+ R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
+ >;
+ clock-output-names + "tmu1", "tmu3", "tmu2", "cmt0", "tmu0";
+ };
+ mstp2_clks: mstp2_clks@e6150138 {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
+ clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
+ <&mp_clk>, <&mp_clk>, <&mp_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_SCIFA2 R8A7794_CLK_SCIFA1 R8A7794_CLK_SCIFA0
+ R8A7794_CLK_MSIOF2 R8A7794_CLK_SCIFB0 R8A7794_CLK_SCIFB1
+ R8A7794_CLK_MSIOF1 R8A7794_CLK_SCIFB2
+ >;
+ clock-output-names + "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
+ "scifb1", "msiof1", "scifb2";
+ };
+ mstp3_clks: mstp3_clks@e615013c {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
+ clocks = <&rclk_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_CMT1
+ >;
+ clock-output-names + "cmt1";
+ };
+ mstp7_clks: mstp7_clks@e615014c {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
+ clocks = <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
+ <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5
+ R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0
+ R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1
+ R8A7794_CLK_SCIF0
+ >;
+ clock-output-names + "hscif2", "scif5", "scif4", "hscif1", "hscif0",
+ "scif3", "scif2", "scif1", "scif0";
+ };
+ mstp8_clks: mstp8_clks@e6150990 {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
+ clocks = <&p_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_ETHER
+ >;
+ clock-output-names + "ether";
+ };
+ mstp11_clks: mstp11_clks@e615099c {
+ compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
+ clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7794_CLK_SCIFA3 R8A7794_CLK_SCIFA4 R8A7794_CLK_SCIFA5
+ >;
+ clock-output-names = "scifa3", "scifa4", "scifa5";
+ };
+ };
+};
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
new file mode 100644
index 0000000..a1385eb
--- /dev/null
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright 2013 Ideas On Board SPRL
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A7794_H__
+#define __DT_BINDINGS_CLOCK_R8A7794_H__
+
+/* CPG */
+#define R8A7794_CLK_MAIN 0
+#define R8A7794_CLK_PLL0 1
+#define R8A7794_CLK_PLL1 2
+#define R8A7794_CLK_PLL3 3
+#define R8A7794_CLK_LB 4
+#define R8A7794_CLK_QSPI 5
+#define R8A7794_CLK_SDH 6
+#define R8A7794_CLK_SD0 7
+#define R8A7794_CLK_Z 8
+
+/* MSTP0 */
+#define R8A7794_CLK_MSIOF0 0
+
+/* MSTP1 */
+#define R8A7794_CLK_TMU1 11
+#define R8A7794_CLK_TMU3 21
+#define R8A7794_CLK_TMU2 22
+#define R8A7794_CLK_CMT0 24
+#define R8A7794_CLK_TMU0 25
+
+/* MSTP2 */
+#define R8A7794_CLK_SCIFA2 2
+#define R8A7794_CLK_SCIFA1 3
+#define R8A7794_CLK_SCIFA0 4
+#define R8A7794_CLK_MSIOF2 5
+#define R8A7794_CLK_SCIFB0 6
+#define R8A7794_CLK_SCIFB1 7
+#define R8A7794_CLK_MSIOF1 8
+#define R8A7794_CLK_SCIFB2 16
+
+/* MSTP3 */
+#define R8A7794_CLK_CMT1 29
+
+/* MSTP5 */
+#define R8A7794_CLK_DMA_HI 1
+#define R8A7794_CLK_DMA_LOW 2
+#define R8A7794_CLK_THERMAL 22
+#define R8A7794_CLK_PWM 23
+
+/* MSTP7 */
+#define R8A7794_CLK_HSCIF2 13
+#define R8A7794_CLK_SCIF5 14
+#define R8A7794_CLK_SCIF4 15
+#define R8A7794_CLK_HSCIF1 16
+#define R8A7794_CLK_HSCIF0 17
+#define R8A7794_CLK_SCIF3 18
+#define R8A7794_CLK_SCIF2 19
+#define R8A7794_CLK_SCIF1 20
+#define R8A7794_CLK_SCIF0 21
+
+/* MSTP8 */
+#define R8A7794_CLK_ETHER 13
+
+/* MSTP9 */
+#define R8A7794_CLK_GPIO6 5
+#define R8A7794_CLK_GPIO5 7
+#define R8A7794_CLK_GPIO4 8
+#define R8A7794_CLK_GPIO3 9
+#define R8A7794_CLK_GPIO2 10
+#define R8A7794_CLK_GPIO1 11
+#define R8A7794_CLK_GPIO0 12
+
+/* MSTP11 */
+#define R8A7794_CLK_SCIFA3 6
+#define R8A7794_CLK_SCIFA4 7
+#define R8A7794_CLK_SCIFA5 8
+
+#endif /* __DT_BINDINGS_CLOCK_R8A7794_H__ */
--
1.8.4.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
2014-08-18 15:51 ` [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree Ulrich Hecht
@ 2014-08-18 23:39 ` Simon Horman
2014-08-19 0:37 ` Magnus Damm
` (3 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2014-08-18 23:39 UTC (permalink / raw)
To: linux-sh
On Mon, Aug 18, 2014 at 05:51:43PM +0200, Ulrich Hecht wrote:
> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> [uli: reduced to minimum, added cmt, enabled scif2]
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
> arch/arm/boot/dts/Makefile | 3 +-
> arch/arm/boot/dts/r8a7794-alt.dts | 47 +++
> arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++++++++++++++++++++++++++
> include/dt-bindings/clock/r8a7794-clock.h | 82 +++++
> 4 files changed, 662 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
> create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
> create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index b8c5cd3..81c1df9 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -375,7 +375,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
> r8a7791-henninger.dtb \
> r8a7791-koelsch.dtb \
> r8a7790-lager.dtb \
> - r8a7779-marzen.dtb
> + r8a7779-marzen.dtb \
> + r8a7794-alt.dtb
> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
> socfpga_cyclone5_socdk.dtb \
> socfpga_cyclone5_sockit.dtb \
> diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
> new file mode 100644
> index 0000000..a05d3b1
> --- /dev/null
> +++ b/arch/arm/boot/dts/r8a7794-alt.dts
> @@ -0,0 +1,47 @@
> +/*
> + * Device Tree Source for the Alt board
> + *
> + * Copyright (C) 2014 Renesas Electronics Corporation
> + *
> + * 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 "r8a7794.dtsi"
> +
> +/ {
> + model = "Alt";
> + compatible = "renesas,alt", "renesas,r8a7794";
> +
> + aliases {
> + serial10 = &scif2;
> + };
Ulrich, Magnus, Larurent,
I'm wondering if this alias is necessary as there is no precedence
in mainline for the console being on serial port 10.
> +
> + chosen {
> + bootargs = "console=ttySC10,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
> + };
> +
> + memory@40000000 {
> + device_type = "memory";
> + reg = <0 0x40000000 0 0x40000000>;
> + };
> +
> + lbsc {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + };
> +};
> +
> +&extal_clk {
> + clock-frequency = <20000000>;
> +};
> +
> +&cmt0 {
> + status = "ok";
> +};
> +
> +&scif2 {
> + status = "ok";
> +};
> diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
> new file mode 100644
> index 0000000..9000d24
> --- /dev/null
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -0,0 +1,531 @@
> +/*
> + * Device Tree Source for the r8a7794 SoC
> + *
> + * Copyright (C) 2014 Renesas Electronics Corporation
> + * Copyright (C) 2014 Ulrich Hecht
> + *
> + * 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.
> + */
> +
> +#include <dt-bindings/clock/r8a7794-clock.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +
> +/ {
> + compatible = "renesas,r8a7794";
> + interrupt-parent = <&gic>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + cpus {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + cpu0: cpu@0 {
> + device_type = "cpu";
> + compatible = "arm,cortex-a7";
> + reg = <0>;
> + clock-frequency = <1000000000>;
> + };
> +
> + cpu1: cpu@1 {
> + device_type = "cpu";
> + compatible = "arm,cortex-a7";
> + reg = <1>;
> + clock-frequency = <1000000000>;
> + };
> + };
> +
> + gic: interrupt-controller@f1001000 {
> + compatible = "arm,cortex-a15-gic";
> + #interrupt-cells = <3>;
> + #address-cells = <0>;
> + interrupt-controller;
> + reg = <0 0xf1001000 0 0x1000>,
> + <0 0xf1002000 0 0x1000>,
> + <0 0xf1004000 0 0x2000>,
> + <0 0xf1006000 0 0x2000>;
> + interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
> + };
> +
> + cmt0: timer@ffca0000 {
> + compatible = "renesas,cmt-48-gen2";
> + reg = <0 0xffca0000 0 0x1004>;
> + interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
> + <0 143 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp1_clks R8A7794_CLK_CMT0>;
> + clock-names = "fck";
> +
> + renesas,channels-mask = <0x60>;
> +
> + status = "disabled";
> + };
> +
> + cmt1: timer@e6130000 {
> + compatible = "renesas,cmt-48-gen2";
> + reg = <0 0xe6130000 0 0x1004>;
> + interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
> + <0 121 IRQ_TYPE_LEVEL_HIGH>,
> + <0 122 IRQ_TYPE_LEVEL_HIGH>,
> + <0 123 IRQ_TYPE_LEVEL_HIGH>,
> + <0 124 IRQ_TYPE_LEVEL_HIGH>,
> + <0 125 IRQ_TYPE_LEVEL_HIGH>,
> + <0 126 IRQ_TYPE_LEVEL_HIGH>,
> + <0 127 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp3_clks R8A7794_CLK_CMT1>;
> + clock-names = "fck";
> +
> + renesas,channels-mask = <0xff>;
> +
> + status = "disabled";
> + };
> +
> + irqc0: interrupt-controller@e61c0000 {
> + compatible = "renesas,irqc-r8a7794", "renesas,irqc";
> + #interrupt-cells = <2>;
> + interrupt-controller;
> + reg = <0 0xe61c0000 0 0x200>;
> + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
> + <0 1 IRQ_TYPE_LEVEL_HIGH>,
> + <0 2 IRQ_TYPE_LEVEL_HIGH>,
> + <0 3 IRQ_TYPE_LEVEL_HIGH>,
> + <0 12 IRQ_TYPE_LEVEL_HIGH>,
> + <0 13 IRQ_TYPE_LEVEL_HIGH>,
> + <0 14 IRQ_TYPE_LEVEL_HIGH>,
> + <0 15 IRQ_TYPE_LEVEL_HIGH>,
> + <0 16 IRQ_TYPE_LEVEL_HIGH>,
> + <0 17 IRQ_TYPE_LEVEL_HIGH>;
> + };
> +
> + scifa0: serial@e6c40000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c40000 0 64>;
> + interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFA0>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifa1: serial@e6c50000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c50000 0 64>;
> + interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFA1>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifa2: serial@e6c60000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c60000 0 64>;
> + interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFA2>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifa3: serial@e6c70000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c70000 0 64>;
> + interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp11_clks R8A7794_CLK_SCIFA3>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifa4: serial@e6c78000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c78000 0 64>;
> + interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp11_clks R8A7794_CLK_SCIFA4>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifa5: serial@e6c80000 {
> + compatible = "renesas,scifa-r8a7794", "renesas,scifa";
> + reg = <0 0xe6c80000 0 64>;
> + interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp11_clks R8A7794_CLK_SCIFA5>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifb0: serial@e6c20000 {
> + compatible = "renesas,scifb-r8a7794", "renesas,scifb";
> + reg = <0 0xe6c20000 0 64>;
> + interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFB0>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifb1: serial@e6c30000 {
> + compatible = "renesas,scifb-r8a7794", "renesas,scifb";
> + reg = <0 0xe6c30000 0 64>;
> + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFB1>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scifb2: serial@e6ce0000 {
> + compatible = "renesas,scifb-r8a7794", "renesas,scifb";
> + reg = <0 0xe6ce0000 0 64>;
> + interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7794_CLK_SCIFB2>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif0: serial@e6e60000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6e60000 0 64>;
> + interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF0>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif1: serial@e6e68000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6e68000 0 64>;
> + interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF1>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif2: serial@e6e58000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6e58000 0 64>;
> + interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF2>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif3: serial@e6ea8000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6ea8000 0 64>;
> + interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF3>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif4: serial@e6ee0000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6ee0000 0 64>;
> + interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF4>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + scif5: serial@e6ee8000 {
> + compatible = "renesas,scif-r8a7794", "renesas,scif";
> + reg = <0 0xe6ee8000 0 64>;
> + interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_SCIF5>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + hscif0: serial@e62c0000 {
> + compatible = "renesas,hscif-r8a7794", "renesas,hscif";
> + reg = <0 0xe62c0000 0 96>;
> + interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + hscif1: serial@e62c8000 {
> + compatible = "renesas,hscif-r8a7794", "renesas,hscif";
> + reg = <0 0xe62c8000 0 96>;
> + interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + hscif2: serial@e62d0000 {
> + compatible = "renesas,hscif-r8a7794", "renesas,hscif";
> + reg = <0 0xe62d0000 0 96>;
> + interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>;
> + clock-names = "sci_ick";
> + status = "disabled";
> + };
> +
> + clocks {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> +
> + /* External root clock */
> + extal_clk: extal_clk {
> + compatible = "fixed-clock";
> + #clock-cells = <0>;
> + /* This value must be overriden by the board. */
> + clock-frequency = <0>;
> + clock-output-names = "extal";
> + };
> +
> + /* Special CPG clocks */
> + cpg_clocks: cpg_clocks@e6150000 {
> + compatible = "renesas,r8a7794-cpg-clocks",
> + "renesas,rcar-gen2-cpg-clocks";
> + reg = <0 0xe6150000 0 0x1000>;
> + clocks = <&extal_clk>;
> + #clock-cells = <1>;
> + clock-output-names = "main", "pll0", "pll1", "pll3",
> + "lb", "qspi", "sdh", "sd0", "z";
> + };
> +
> + /* Fixed factor clocks */
> + pll1_div2_clk: pll1_div2_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <2>;
> + clock-mult = <1>;
> + clock-output-names = "pll1_div2";
> + };
> + zg_clk: zg_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <6>;
> + clock-mult = <1>;
> + clock-output-names = "zg";
> + };
> + zx_clk: zx_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <3>;
> + clock-mult = <1>;
> + clock-output-names = "zx";
> + };
> + zs_clk: zs_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <6>;
> + clock-mult = <1>;
> + clock-output-names = "zs";
> + };
> + hp_clk: hp_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <12>;
> + clock-mult = <1>;
> + clock-output-names = "hp";
> + };
> + i_clk: i_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <2>;
> + clock-mult = <1>;
> + clock-output-names = "i";
> + };
> + b_clk: b_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <12>;
> + clock-mult = <1>;
> + clock-output-names = "b";
> + };
> + p_clk: p_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <24>;
> + clock-mult = <1>;
> + clock-output-names = "p";
> + };
> + cl_clk: cl_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <48>;
> + clock-mult = <1>;
> + clock-output-names = "cl";
> + };
> + m2_clk: m2_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <8>;
> + clock-mult = <1>;
> + clock-output-names = "m2";
> + };
> + imp_clk: imp_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <4>;
> + clock-mult = <1>;
> + clock-output-names = "imp";
> + };
> + rclk_clk: rclk_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <(48 * 1024)>;
> + clock-mult = <1>;
> + clock-output-names = "rclk";
> + };
> + oscclk_clk: oscclk_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <(12 * 1024)>;
> + clock-mult = <1>;
> + clock-output-names = "oscclk";
> + };
> + zb3_clk: zb3_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
> + #clock-cells = <0>;
> + clock-div = <4>;
> + clock-mult = <1>;
> + clock-output-names = "zb3";
> + };
> + zb3d2_clk: zb3d2_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
> + #clock-cells = <0>;
> + clock-div = <8>;
> + clock-mult = <1>;
> + clock-output-names = "zb3d2";
> + };
> + ddr_clk: ddr_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL3>;
> + #clock-cells = <0>;
> + clock-div = <8>;
> + clock-mult = <1>;
> + clock-output-names = "ddr";
> + };
> + mp_clk: mp_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&pll1_div2_clk>;
> + #clock-cells = <0>;
> + clock-div = <15>;
> + clock-mult = <1>;
> + clock-output-names = "mp";
> + };
> + cp_clk: cp_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&cpg_clocks R8A7794_CLK_PLL1>;
> + #clock-cells = <0>;
> + clock-div = <48>;
> + clock-mult = <1>;
> + clock-output-names = "cp";
> + };
> +
> + acp_clk: acp_clk {
> + compatible = "fixed-factor-clock";
> + clocks = <&extal_clk>;
> + #clock-cells = <0>;
> + clock-div = <2>;
> + clock-mult = <1>;
> + clock-output-names = "acp";
> + };
> +
> + /* Gate clocks */
> + mstp0_clks: mstp0_clks@e6150130 {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
> + clocks = <&mp_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <R8A7794_CLK_MSIOF0>;
> + clock-output-names = "msiof0";
> + };
> + mstp1_clks: mstp1_clks@e6150134 {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
> + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
> + <&cp_clk>,
> + <&zs_clk>, <&zs_clk>, <&zs_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
> + R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
> + >;
> + clock-output-names > + "tmu1", "tmu3", "tmu2", "cmt0", "tmu0";
> + };
> + mstp2_clks: mstp2_clks@e6150138 {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
> + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
> + <&mp_clk>, <&mp_clk>, <&mp_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_SCIFA2 R8A7794_CLK_SCIFA1 R8A7794_CLK_SCIFA0
> + R8A7794_CLK_MSIOF2 R8A7794_CLK_SCIFB0 R8A7794_CLK_SCIFB1
> + R8A7794_CLK_MSIOF1 R8A7794_CLK_SCIFB2
> + >;
> + clock-output-names > + "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
> + "scifb1", "msiof1", "scifb2";
> + };
> + mstp3_clks: mstp3_clks@e615013c {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
> + clocks = <&rclk_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_CMT1
> + >;
> + clock-output-names > + "cmt1";
> + };
> + mstp7_clks: mstp7_clks@e615014c {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
> + clocks = <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
> + <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5
> + R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0
> + R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1
> + R8A7794_CLK_SCIF0
> + >;
> + clock-output-names > + "hscif2", "scif5", "scif4", "hscif1", "hscif0",
> + "scif3", "scif2", "scif1", "scif0";
> + };
> + mstp8_clks: mstp8_clks@e6150990 {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
> + clocks = <&p_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_ETHER
> + >;
> + clock-output-names > + "ether";
> + };
> + mstp11_clks: mstp11_clks@e615099c {
> + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
> + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>;
> + #clock-cells = <1>;
> + renesas,clock-indices = <
> + R8A7794_CLK_SCIFA3 R8A7794_CLK_SCIFA4 R8A7794_CLK_SCIFA5
> + >;
> + clock-output-names = "scifa3", "scifa4", "scifa5";
> + };
> + };
> +};
> diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
> new file mode 100644
> index 0000000..a1385eb
> --- /dev/null
> +++ b/include/dt-bindings/clock/r8a7794-clock.h
> @@ -0,0 +1,82 @@
> +/*
> + * Copyright (C) 2014 Renesas Electronics Corporation
> + * Copyright 2013 Ideas On Board SPRL
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +
> +#ifndef __DT_BINDINGS_CLOCK_R8A7794_H__
> +#define __DT_BINDINGS_CLOCK_R8A7794_H__
> +
> +/* CPG */
> +#define R8A7794_CLK_MAIN 0
> +#define R8A7794_CLK_PLL0 1
> +#define R8A7794_CLK_PLL1 2
> +#define R8A7794_CLK_PLL3 3
> +#define R8A7794_CLK_LB 4
> +#define R8A7794_CLK_QSPI 5
> +#define R8A7794_CLK_SDH 6
> +#define R8A7794_CLK_SD0 7
> +#define R8A7794_CLK_Z 8
> +
> +/* MSTP0 */
> +#define R8A7794_CLK_MSIOF0 0
> +
> +/* MSTP1 */
> +#define R8A7794_CLK_TMU1 11
> +#define R8A7794_CLK_TMU3 21
> +#define R8A7794_CLK_TMU2 22
> +#define R8A7794_CLK_CMT0 24
> +#define R8A7794_CLK_TMU0 25
> +
> +/* MSTP2 */
> +#define R8A7794_CLK_SCIFA2 2
> +#define R8A7794_CLK_SCIFA1 3
> +#define R8A7794_CLK_SCIFA0 4
> +#define R8A7794_CLK_MSIOF2 5
> +#define R8A7794_CLK_SCIFB0 6
> +#define R8A7794_CLK_SCIFB1 7
> +#define R8A7794_CLK_MSIOF1 8
> +#define R8A7794_CLK_SCIFB2 16
> +
> +/* MSTP3 */
> +#define R8A7794_CLK_CMT1 29
> +
> +/* MSTP5 */
> +#define R8A7794_CLK_DMA_HI 1
> +#define R8A7794_CLK_DMA_LOW 2
> +#define R8A7794_CLK_THERMAL 22
> +#define R8A7794_CLK_PWM 23
> +
> +/* MSTP7 */
> +#define R8A7794_CLK_HSCIF2 13
> +#define R8A7794_CLK_SCIF5 14
> +#define R8A7794_CLK_SCIF4 15
> +#define R8A7794_CLK_HSCIF1 16
> +#define R8A7794_CLK_HSCIF0 17
> +#define R8A7794_CLK_SCIF3 18
> +#define R8A7794_CLK_SCIF2 19
> +#define R8A7794_CLK_SCIF1 20
> +#define R8A7794_CLK_SCIF0 21
> +
> +/* MSTP8 */
> +#define R8A7794_CLK_ETHER 13
> +
> +/* MSTP9 */
> +#define R8A7794_CLK_GPIO6 5
> +#define R8A7794_CLK_GPIO5 7
> +#define R8A7794_CLK_GPIO4 8
> +#define R8A7794_CLK_GPIO3 9
> +#define R8A7794_CLK_GPIO2 10
> +#define R8A7794_CLK_GPIO1 11
> +#define R8A7794_CLK_GPIO0 12
> +
> +/* MSTP11 */
> +#define R8A7794_CLK_SCIFA3 6
> +#define R8A7794_CLK_SCIFA4 7
> +#define R8A7794_CLK_SCIFA5 8
> +
> +#endif /* __DT_BINDINGS_CLOCK_R8A7794_H__ */
> --
> 1.8.4.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
2014-08-18 15:51 ` [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree Ulrich Hecht
2014-08-18 23:39 ` Simon Horman
@ 2014-08-19 0:37 ` Magnus Damm
2014-08-19 1:06 ` Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Magnus Damm @ 2014-08-19 0:37 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 19, 2014 at 8:39 AM, Simon Horman <horms@verge.net.au> wrote:
> On Mon, Aug 18, 2014 at 05:51:43PM +0200, Ulrich Hecht wrote:
>> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>> [uli: reduced to minimum, added cmt, enabled scif2]
>> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>> ---
>> arch/arm/boot/dts/Makefile | 3 +-
>> arch/arm/boot/dts/r8a7794-alt.dts | 47 +++
>> arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++++++++++++++++++++++++++
>> include/dt-bindings/clock/r8a7794-clock.h | 82 +++++
>> 4 files changed, 662 insertions(+), 1 deletion(-)
>> create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
>> create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
>> create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index b8c5cd3..81c1df9 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -375,7 +375,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
>> r8a7791-henninger.dtb \
>> r8a7791-koelsch.dtb \
>> r8a7790-lager.dtb \
>> - r8a7779-marzen.dtb
>> + r8a7779-marzen.dtb \
>> + r8a7794-alt.dtb
>> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
>> socfpga_cyclone5_socdk.dtb \
>> socfpga_cyclone5_sockit.dtb \
>> diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
>> new file mode 100644
>> index 0000000..a05d3b1
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/r8a7794-alt.dts
>> @@ -0,0 +1,47 @@
>> +/*
>> + * Device Tree Source for the Alt board
>> + *
>> + * Copyright (C) 2014 Renesas Electronics Corporation
>> + *
>> + * 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 "r8a7794.dtsi"
>> +
>> +/ {
>> + model = "Alt";
>> + compatible = "renesas,alt", "renesas,r8a7794";
>> +
>> + aliases {
>> + serial10 = &scif2;
>> + };
>
> Ulrich, Magnus, Larurent,
>
> I'm wondering if this alias is necessary as there is no precedence
> in mainline for the console being on serial port 10.
My take on this is that we should follow latest common upstream
convention, which I believe is using serial0 for the debug port.
Cheers,
/ magnsu
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
` (2 preceding siblings ...)
2014-08-19 0:37 ` Magnus Damm
@ 2014-08-19 1:06 ` Simon Horman
2014-08-19 1:16 ` Magnus Damm
2014-08-19 7:07 ` Geert Uytterhoeven
5 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2014-08-19 1:06 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 19, 2014 at 09:37:45AM +0900, Magnus Damm wrote:
> On Tue, Aug 19, 2014 at 8:39 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Mon, Aug 18, 2014 at 05:51:43PM +0200, Ulrich Hecht wrote:
> >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> >> [uli: reduced to minimum, added cmt, enabled scif2]
> >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> >> ---
> >> arch/arm/boot/dts/Makefile | 3 +-
> >> arch/arm/boot/dts/r8a7794-alt.dts | 47 +++
> >> arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++++++++++++++++++++++++++
> >> include/dt-bindings/clock/r8a7794-clock.h | 82 +++++
> >> 4 files changed, 662 insertions(+), 1 deletion(-)
> >> create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
> >> create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
> >> create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
> >>
> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> >> index b8c5cd3..81c1df9 100644
> >> --- a/arch/arm/boot/dts/Makefile
> >> +++ b/arch/arm/boot/dts/Makefile
> >> @@ -375,7 +375,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
> >> r8a7791-henninger.dtb \
> >> r8a7791-koelsch.dtb \
> >> r8a7790-lager.dtb \
> >> - r8a7779-marzen.dtb
> >> + r8a7779-marzen.dtb \
> >> + r8a7794-alt.dtb
> >> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
> >> socfpga_cyclone5_socdk.dtb \
> >> socfpga_cyclone5_sockit.dtb \
> >> diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
> >> new file mode 100644
> >> index 0000000..a05d3b1
> >> --- /dev/null
> >> +++ b/arch/arm/boot/dts/r8a7794-alt.dts
> >> @@ -0,0 +1,47 @@
> >> +/*
> >> + * Device Tree Source for the Alt board
> >> + *
> >> + * Copyright (C) 2014 Renesas Electronics Corporation
> >> + *
> >> + * 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 "r8a7794.dtsi"
> >> +
> >> +/ {
> >> + model = "Alt";
> >> + compatible = "renesas,alt", "renesas,r8a7794";
> >> +
> >> + aliases {
> >> + serial10 = &scif2;
> >> + };
> >
> > Ulrich, Magnus, Larurent,
> >
> > I'm wondering if this alias is necessary as there is no precedence
> > in mainline for the console being on serial port 10.
>
> My take on this is that we should follow latest common upstream
> convention, which I believe is using serial0 for the debug port.
If that is the convention then it is fine by me.
> Cheers,
>
> / magnsu
A new identity for you?
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
` (3 preceding siblings ...)
2014-08-19 1:06 ` Simon Horman
@ 2014-08-19 1:16 ` Magnus Damm
2014-08-19 7:07 ` Geert Uytterhoeven
5 siblings, 0 replies; 17+ messages in thread
From: Magnus Damm @ 2014-08-19 1:16 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 19, 2014 at 10:06 AM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Aug 19, 2014 at 09:37:45AM +0900, Magnus Damm wrote:
>> On Tue, Aug 19, 2014 at 8:39 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Mon, Aug 18, 2014 at 05:51:43PM +0200, Ulrich Hecht wrote:
>> >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>> >> [uli: reduced to minimum, added cmt, enabled scif2]
>> >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>> >> ---
>> >> arch/arm/boot/dts/Makefile | 3 +-
>> >> arch/arm/boot/dts/r8a7794-alt.dts | 47 +++
>> >> arch/arm/boot/dts/r8a7794.dtsi | 531 ++++++++++++++++++++++++++++++
>> >> include/dt-bindings/clock/r8a7794-clock.h | 82 +++++
>> >> 4 files changed, 662 insertions(+), 1 deletion(-)
>> >> create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
>> >> create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
>> >> create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
>> >>
>> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> >> index b8c5cd3..81c1df9 100644
>> >> --- a/arch/arm/boot/dts/Makefile
>> >> +++ b/arch/arm/boot/dts/Makefile
>> >> @@ -375,7 +375,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
>> >> r8a7791-henninger.dtb \
>> >> r8a7791-koelsch.dtb \
>> >> r8a7790-lager.dtb \
>> >> - r8a7779-marzen.dtb
>> >> + r8a7779-marzen.dtb \
>> >> + r8a7794-alt.dtb
>> >> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
>> >> socfpga_cyclone5_socdk.dtb \
>> >> socfpga_cyclone5_sockit.dtb \
>> >> diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
>> >> new file mode 100644
>> >> index 0000000..a05d3b1
>> >> --- /dev/null
>> >> +++ b/arch/arm/boot/dts/r8a7794-alt.dts
>> >> @@ -0,0 +1,47 @@
>> >> +/*
>> >> + * Device Tree Source for the Alt board
>> >> + *
>> >> + * Copyright (C) 2014 Renesas Electronics Corporation
>> >> + *
>> >> + * 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 "r8a7794.dtsi"
>> >> +
>> >> +/ {
>> >> + model = "Alt";
>> >> + compatible = "renesas,alt", "renesas,r8a7794";
>> >> +
>> >> + aliases {
>> >> + serial10 = &scif2;
>> >> + };
>> >
>> > Ulrich, Magnus, Larurent,
>> >
>> > I'm wondering if this alias is necessary as there is no precedence
>> > in mainline for the console being on serial port 10.
>>
>> My take on this is that we should follow latest common upstream
>> convention, which I believe is using serial0 for the debug port.
>
> If that is the convention then it is fine by me.
>
>> Cheers,
>>
>> / magnsu
>
> A new identity for you?
Yes, partially byte swapped. =)
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 4/8] ARM: shmobile: Initial r8a7794 and Alt device tree
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
` (4 preceding siblings ...)
2014-08-19 1:16 ` Magnus Damm
@ 2014-08-19 7:07 ` Geert Uytterhoeven
5 siblings, 0 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2014-08-19 7:07 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 19, 2014 at 2:37 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
>>> + aliases {
>>> + serial10 = &scif2;
>>> + };
>>
>> Ulrich, Magnus, Larurent,
>>
>> I'm wondering if this alias is necessary as there is no precedence
>> in mainline for the console being on serial port 10.
>
> My take on this is that we should follow latest common upstream
> convention, which I believe is using serial0 for the debug port.
iff "serial0" is the label of the debug port on the board...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/8] ARM: shmobile: r8a7791 SCIF support
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (3 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 4/8] ARM: shmobile: Initial r8a7791 SoC support Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 6/8] ARM: shmobile: r8a7791 CMT support Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Yoshikazu Fujikawa <yoshikazu.fujikawa.ue@renesas.com>
Add SCIF serial port support to the r8a7791 SoC by
adding platform devices for SCIFA0 -> SCIFA5 as well
as SCIFB0 -> SCIFB2 and SCIF0 -> SCIF5 together with
clock bindings. DT device description is excluded at
this point since such bindings are still under
development.
Signed-off-by: Yoshikazu Fujikawa <yoshikazu.fujikawa.ue@renesas.com>
Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
[damm@opensource.se: Forward ported to upstream, dropped holes in enum]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7791.c | 36 +++++++++++-
arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 +
arch/arm/mach-shmobile/setup-r8a7791.c | 82 +++++++++++++++++++++++++++
3 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
index 9929feb..df3122e 100644
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -48,6 +48,7 @@
#define CPG_BASE 0xe6150000
#define CPG_LEN 0x1000
+#define SMSTPCR0 0xE6150130
#define SMSTPCR1 0xE6150134
#define SMSTPCR2 0xe6150138
#define SMSTPCR3 0xE615013C
@@ -56,6 +57,7 @@
#define SMSTPCR8 0xE6150990
#define SMSTPCR9 0xE6150994
#define SMSTPCR10 0xE6150998
+#define SMSTPCR11 0xE615099C
#define MODEMR 0xE6160060
#define SDCKCR 0xE6150074
@@ -118,13 +120,28 @@ static struct clk *main_clks[] = {
/* MSTP */
enum {
MSTP721, MSTP720,
-/* MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,*/
+ MSTP719, MSTP718, MSTP715, MSTP714,
+ MSTP216, MSTP207, MSTP206,
+ MSTP204, MSTP203, MSTP202, MSTP1105, MSTP1106, MSTP1107,
MSTP_NR
};
static struct clk mstp_clks[MSTP_NR] = {
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
+ [MSTP719] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 19, 0), /* SCIF2 */
+ [MSTP718] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 18, 0), /* SCIF3 */
+ [MSTP715] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 15, 0), /* SCIF4 */
+ [MSTP714] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 14, 0), /* SCIF5 */
+ [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */
+ [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */
+ [MSTP206] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 6, 0), /* SCIFB0 */
+ [MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */
+ [MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */
+ [MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */
+ [MSTP1105] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 5, 0), /* SCIFA3 */
+ [MSTP1106] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 6, 0), /* SCIFA4 */
+ [MSTP1107] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 7, 0), /* SCIFA5 */
};
static struct clk_lookup lookups[] = {
@@ -141,6 +158,23 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("mp", &mp_clk),
CLKDEV_CON_ID("cp", &cp_clk),
CLKDEV_CON_ID("peripheral_clk", &hp_clk),
+
+ /* MSTP */
+ CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
+ CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */
+ CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]), /* SCIFB0 */
+ CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]), /* SCIFB1 */
+ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]), /* SCIFB2 */
+ CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]), /* SCIFA2 */
+ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]), /* SCIF0 */
+ CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]), /* SCIF1 */
+ CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP719]), /* SCIF2 */
+ CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP718]), /* SCIF3 */
+ CLKDEV_DEV_ID("sh-sci.10", &mstp_clks[MSTP715]), /* SCIF4 */
+ CLKDEV_DEV_ID("sh-sci.11", &mstp_clks[MSTP714]), /* SCIF5 */
+ CLKDEV_DEV_ID("sh-sci.12", &mstp_clks[MSTP1105]), /* SCIFA3 */
+ CLKDEV_DEV_ID("sh-sci.13", &mstp_clks[MSTP1106]), /* SCIFA4 */
+ CLKDEV_DEV_ID("sh-sci.14", &mstp_clks[MSTP1107]), /* SCIFA5 */
};
#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/include/mach/r8a7791.h
index 43b7206..d234b8c 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7791.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7791.h
@@ -1,6 +1,7 @@
#ifndef __ASM_R8A7791_H__
#define __ASM_R8A7791_H__
+void r8a7791_add_dt_devices(void);
void r8a7791_clock_init(void);
#endif /* __ASM_R8A7791_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 88dcce1..0de6aec 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -22,10 +22,92 @@
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
+#include <linux/serial_sci.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
+#define SCIF_COMMON(scif_type, baseaddr, irq) \
+ .type = scif_type, \
+ .mapbase = baseaddr, \
+ .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
+ .irqs = SCIx_IRQ_MUXED(irq)
+
+#define SCIFA_DATA(index, baseaddr, irq) \
+[index] = { \
+ SCIF_COMMON(PORT_SCIFA, baseaddr, irq), \
+ .scbrr_algo_id = SCBRR_ALGO_4, \
+ .scscr = SCSCR_RE | SCSCR_TE, \
+}
+
+#define SCIFB_DATA(index, baseaddr, irq) \
+[index] = { \
+ SCIF_COMMON(PORT_SCIFB, baseaddr, irq), \
+ .scbrr_algo_id = SCBRR_ALGO_4, \
+ .scscr = SCSCR_RE | SCSCR_TE, \
+}
+
+#define SCIF_DATA(index, baseaddr, irq) \
+[index] = { \
+ SCIF_COMMON(PORT_SCIF, baseaddr, irq), \
+ .scbrr_algo_id = SCBRR_ALGO_2, \
+ .scscr = SCSCR_RE | SCSCR_TE, \
+}
+
+#define HSCIF_DATA(index, baseaddr, irq) \
+[index] = { \
+ SCIF_COMMON(PORT_HSCIF, baseaddr, irq), \
+ .scbrr_algo_id = SCBRR_ALGO_6, \
+ .scscr = SCSCR_RE | SCSCR_TE, \
+}
+
+enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1,
+ SCIF2, SCIF3, SCIF4, SCIF5, SCIFA3, SCIFA4, SCIFA5 };
+
+static const struct plat_sci_port scif[] __initconst = {
+ SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
+ SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
+ SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */
+ SCIFB_DATA(SCIFB1, 0xe6c30000, gic_spi(149)), /* SCIFB1 */
+ SCIFB_DATA(SCIFB2, 0xe6ce0000, gic_spi(150)), /* SCIFB2 */
+ SCIFA_DATA(SCIFA2, 0xe6c60000, gic_spi(151)), /* SCIFA2 */
+ SCIF_DATA(SCIF0, 0xe6e60000, gic_spi(152)), /* SCIF0 */
+ SCIF_DATA(SCIF1, 0xe6e68000, gic_spi(153)), /* SCIF1 */
+ SCIF_DATA(SCIF2, 0xe6e58000, gic_spi(22)), /* SCIF2 */
+ SCIF_DATA(SCIF3, 0xe6ea8000, gic_spi(23)), /* SCIF3 */
+ SCIF_DATA(SCIF4, 0xe6ee0000, gic_spi(24)), /* SCIF4 */
+ SCIF_DATA(SCIF5, 0xe6ee8000, gic_spi(25)), /* SCIF5 */
+ SCIFA_DATA(SCIFA3, 0xe6c70000, gic_spi(29)), /* SCIFA3 */
+ SCIFA_DATA(SCIFA4, 0xe6c78000, gic_spi(30)), /* SCIFA4 */
+ SCIFA_DATA(SCIFA5, 0xe6c80000, gic_spi(31)), /* SCIFA5 */
+};
+
+static inline void r8a7791_register_scif(int idx)
+{
+ platform_device_register_data(&platform_bus, "sh-sci", idx, &scif[idx],
+ sizeof(struct plat_sci_port));
+}
+
+void __init r8a7791_add_dt_devices(void)
+{
+ r8a7791_register_scif(SCIFA0);
+ r8a7791_register_scif(SCIFA1);
+ r8a7791_register_scif(SCIFB0);
+ r8a7791_register_scif(SCIFB1);
+ r8a7791_register_scif(SCIFB2);
+ r8a7791_register_scif(SCIFA2);
+ r8a7791_register_scif(SCIF0);
+ r8a7791_register_scif(SCIF1);
+ r8a7791_register_scif(SCIF2);
+ r8a7791_register_scif(SCIF3);
+ r8a7791_register_scif(SCIF4);
+ r8a7791_register_scif(SCIF5);
+ r8a7791_register_scif(SCIFA3);
+ r8a7791_register_scif(SCIFA4);
+ r8a7791_register_scif(SCIFA5);
+}
+
#ifdef CONFIG_USE_OF
static const char *r8a7791_boards_compat_dt[] __initdata = {
"renesas,r8a7791",
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 6/8] ARM: shmobile: r8a7791 CMT support
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (4 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 5/8] ARM: shmobile: r8a7791 SCIF support Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 7/8] ARM: shmobile: r8a7778: add USBHS clock Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Add r8a7791 CMT support via channel 0 of CMT0. At this
point the CMT is used for clock event operation, but in
the future the arch timer will be the main timer and the
CMT will be used for deep sleep wake up only.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a7663b88280d00359715817620798e99d54d401c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7791.c | 7 ++++++-
arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 +
arch/arm/mach-shmobile/setup-r8a7791.c | 29 +++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
index df3122e..c9a26f1 100644
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -101,7 +101,7 @@ SH_FIXED_RATIO_CLK_SET(cp_clk, extal_clk, 1, 2);
SH_FIXED_RATIO_CLK_SET(pll1_div2_clk, pll1_clk, 1, 2);
SH_FIXED_RATIO_CLK_SET(hp_clk, pll1_clk, 1, 12);
SH_FIXED_RATIO_CLK_SET(p_clk, pll1_clk, 1, 24);
-
+SH_FIXED_RATIO_CLK_SET(rclk_clk, pll1_clk, 1, (48 * 1024));
SH_FIXED_RATIO_CLK_SET(mp_clk, pll1_div2_clk, 1, 15);
static struct clk *main_clks[] = {
@@ -113,6 +113,7 @@ static struct clk *main_clks[] = {
&pll3_clk,
&hp_clk,
&p_clk,
+ &rclk_clk,
&mp_clk,
&cp_clk,
};
@@ -123,6 +124,7 @@ enum {
MSTP719, MSTP718, MSTP715, MSTP714,
MSTP216, MSTP207, MSTP206,
MSTP204, MSTP203, MSTP202, MSTP1105, MSTP1106, MSTP1107,
+ MSTP124,
MSTP_NR
};
@@ -142,6 +144,7 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP1105] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 5, 0), /* SCIFA3 */
[MSTP1106] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 6, 0), /* SCIFA4 */
[MSTP1107] = SH_CLK_MSTP32(&mp_clk, SMSTPCR11, 7, 0), /* SCIFA5 */
+ [MSTP124] = SH_CLK_MSTP32(&rclk_clk, SMSTPCR1, 24, 0), /* CMT0 */
};
static struct clk_lookup lookups[] = {
@@ -155,6 +158,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("pll3", &pll3_clk),
CLKDEV_CON_ID("hp", &hp_clk),
CLKDEV_CON_ID("p", &p_clk),
+ CLKDEV_CON_ID("rclk", &rclk_clk),
CLKDEV_CON_ID("mp", &mp_clk),
CLKDEV_CON_ID("cp", &cp_clk),
CLKDEV_CON_ID("peripheral_clk", &hp_clk),
@@ -175,6 +179,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.12", &mstp_clks[MSTP1105]), /* SCIFA3 */
CLKDEV_DEV_ID("sh-sci.13", &mstp_clks[MSTP1106]), /* SCIFA4 */
CLKDEV_DEV_ID("sh-sci.14", &mstp_clks[MSTP1107]), /* SCIFA5 */
+ CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
};
#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/include/mach/r8a7791.h
index d234b8c..2e6d661 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7791.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7791.h
@@ -3,5 +3,6 @@
void r8a7791_add_dt_devices(void);
void r8a7791_clock_init(void);
+void r8a7791_init_early(void);
#endif /* __ASM_R8A7791_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 0de6aec..b56399d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -23,6 +23,7 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/serial_sci.h>
+#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7791.h>
@@ -89,6 +90,25 @@ static inline void r8a7791_register_scif(int idx)
sizeof(struct plat_sci_port));
}
+static const struct sh_timer_config cmt00_platform_data __initconst = {
+ .name = "CMT00",
+ .timer_bit = 0,
+ .clockevent_rating = 80,
+};
+
+static const struct resource cmt00_resources[] __initconst = {
+ DEFINE_RES_MEM(0xffca0510, 0x0c),
+ DEFINE_RES_MEM(0xffca0500, 0x04),
+ DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
+};
+
+#define r8a7791_register_cmt(idx) \
+ platform_device_register_resndata(&platform_bus, "sh_cmt", \
+ idx, cmt##idx##_resources, \
+ ARRAY_SIZE(cmt##idx##_resources), \
+ &cmt##idx##_platform_data, \
+ sizeof(struct sh_timer_config))
+
void __init r8a7791_add_dt_devices(void)
{
r8a7791_register_scif(SCIFA0);
@@ -106,6 +126,14 @@ void __init r8a7791_add_dt_devices(void)
r8a7791_register_scif(SCIFA3);
r8a7791_register_scif(SCIFA4);
r8a7791_register_scif(SCIFA5);
+ r8a7791_register_cmt(00);
+}
+
+void __init r8a7791_init_early(void)
+{
+#ifndef CONFIG_ARM_ARCH_TIMER
+ shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
+#endif
}
#ifdef CONFIG_USE_OF
@@ -115,6 +143,7 @@ static const char *r8a7791_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
+ .init_early = r8a7791_init_early,
.dt_compat = r8a7791_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 7/8] ARM: shmobile: r8a7778: add USBHS clock
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (5 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 6/8] ARM: shmobile: r8a7791 CMT support Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-01 2:34 ` [PATCH 8/8] ARM: shmobile: r8a7778: add usb phy power control function Simon Horman
2013-10-07 18:22 ` [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Olof Johansson
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch adds USBHS clock for renesas_usbhs driver
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7778.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 244a8de..fb6af83 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -181,6 +181,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("r8a7778-vin.1", &mstp_clks[MSTP109]), /* VIN1 */
CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */
+ CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP100]), /* USB FUNC */
CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */
CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 8/8] ARM: shmobile: r8a7778: add usb phy power control function
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (6 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 7/8] ARM: shmobile: r8a7778: add USBHS clock Simon Horman
@ 2013-10-01 2:34 ` Simon Horman
2013-10-07 18:22 ` [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Olof Johansson
8 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
USB phy initialisation function is needed from not only
USB Host but also USB Function too.
This patch adds usb phy common control function.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 ++
arch/arm/mach-shmobile/setup-r8a7778.c | 37 +++++++++++++++++++--------
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index adfcf51..ea1dca6 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -35,4 +35,6 @@ extern void r8a7778_clock_init(void);
extern void r8a7778_init_irq_extpin(int irlm);
extern void r8a7778_pinmux_init(void);
+extern int r8a7778_usb_phy_power(bool enable);
+
#endif /* __ASM_R8A7778_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 6a2657e..e484d14 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -95,29 +95,46 @@ static struct sh_timer_config sh_tmu1_platform_data __initdata = {
&sh_tmu##idx##_platform_data, \
sizeof(sh_tmu##idx##_platform_data))
-/* USB */
-static struct usb_phy *phy;
+int r8a7778_usb_phy_power(bool enable)
+{
+ static struct usb_phy *phy = NULL;
+ int ret = 0;
+
+ if (!phy)
+ phy = usb_get_phy(USB_PHY_TYPE_USB2);
+
+ if (IS_ERR(phy)) {
+ pr_err("kernel doesn't have usb phy driver\n");
+ return PTR_ERR(phy);
+ }
+
+ if (enable)
+ ret = usb_phy_init(phy);
+ else
+ usb_phy_shutdown(phy);
+ return ret;
+}
+
+/* USB */
static int usb_power_on(struct platform_device *pdev)
{
- if (IS_ERR(phy))
- return PTR_ERR(phy);
+ int ret = r8a7778_usb_phy_power(true);
+
+ if (ret)
+ return ret;
pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);
- usb_phy_init(phy);
-
return 0;
}
static void usb_power_off(struct platform_device *pdev)
{
- if (IS_ERR(phy))
+ if (r8a7778_usb_phy_power(false))
return;
- usb_phy_shutdown(phy);
-
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
}
@@ -353,8 +370,6 @@ void __init r8a7778_add_standard_devices(void)
void __init r8a7778_init_late(void)
{
- phy = usb_get_phy(USB_PHY_TYPE_USB2);
-
platform_device_register_full(&ehci_info);
platform_device_register_full(&ohci_info);
}
--
1.8.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13
2013-10-01 2:34 [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Simon Horman
` (7 preceding siblings ...)
2013-10-01 2:34 ` [PATCH 8/8] ARM: shmobile: r8a7778: add usb phy power control function Simon Horman
@ 2013-10-07 18:22 ` Olof Johansson
2013-10-08 5:21 ` Simon Horman
8 siblings, 1 reply; 17+ messages in thread
From: Olof Johansson @ 2013-10-07 18:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 01, 2013 at 11:34:09AM +0900, Simon Horman wrote:
> Hi Kevin, Olof and Arnd,
>
> please consider these Renesas ARM based SoC updates for v3.13.
>
> This pull-request is based on v3.12-rc1.
>
>
> The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:
>
> Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
Pulled. As discussed earlier, the new platforms for 3.13 should be
the last ones of the legacy kind; from here on out we should see
multi-platform enabled new platforms from day one (i.e. once CCF and
other pieces land).
-Olof
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13
2013-10-07 18:22 ` [GIT PULL 0/8] Renesas ARM based SoC updates for v3.13 Olof Johansson
@ 2013-10-08 5:21 ` Simon Horman
0 siblings, 0 replies; 17+ messages in thread
From: Simon Horman @ 2013-10-08 5:21 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 07, 2013 at 11:22:45AM -0700, Olof Johansson wrote:
> On Tue, Oct 01, 2013 at 11:34:09AM +0900, Simon Horman wrote:
> > Hi Kevin, Olof and Arnd,
> >
> > please consider these Renesas ARM based SoC updates for v3.13.
> >
> > This pull-request is based on v3.12-rc1.
> >
> >
> > The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:
> >
> > Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
>
> Pulled. As discussed earlier, the new platforms for 3.13 should be
> the last ones of the legacy kind; from here on out we should see
> multi-platform enabled new platforms from day one (i.e. once CCF and
> other pieces land).
Thanks.
We have one more new platform queued up for v3.13,
the r7s72100 SoC / Genmai board. I plan to send a pull requests
which includes code for that platform in the next day or so.
^ permalink raw reply [flat|nested] 17+ messages in thread