* [PATCH 01/24] ARM: shmobile: r8a7779: Add clocks
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 02/24] ARM: shmobile: Sync Marzen DTS with Marzen reference DTS Simon Horman
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Declare all core and MSTP clocks currently used by r8a7779-based boards.
Based on work by Laurent Pinchart for the r8a7790 and r8a7791 SoCs.
Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 144 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 144 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index b517c8e..5a62970 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -11,6 +11,7 @@
/include/ "skeleton.dtsi"
+#include <dt-bindings/clock/r8a7779-clock.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ {
@@ -265,4 +266,147 @@
#size-cells = <0>;
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 at 0xe6150000 {
+ compatible = "renesas,r8a7779-cpg-clocks";
+ reg = <0 0xffc80000 0 0x30>;
+ clocks = <&extal_clk>;
+ #clock-cells = <1>;
+ clock-output-names = "plla", "z", "zs", "s",
+ "s1", "p", "b", "out";
+ };
+
+ /* Fixed factor clocks */
+ i_clk: i_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <2>;
+ clock-mult = <1>;
+ clock-output-names = "i";
+ };
+ s3_clk: s3_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <8>;
+ clock-mult = <1>;
+ clock-output-names = "s3";
+ };
+ s4_clk: s4_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <16>;
+ clock-mult = <1>;
+ clock-output-names = "s4";
+ };
+ g_clk: g_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <24>;
+ clock-mult = <1>;
+ clock-output-names = "g";
+ };
+
+ /* Gate clocks */
+ mstp0_clks: mstp0_clks {
+ compatible = "renesas,r8a7779-mstp-clocks",
+ "renesas,cpg-mstp-clocks";
+ reg = <0 0xffc80030 0 4>;
+ clocks = <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_S1>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7779_CLK_HSPI R8A7779_CLK_TMU2
+ R8A7779_CLK_TMU1 R8A7779_CLK_TMU0
+ R8A7779_CLK_HSCIF1 R8A7779_CLK_HSCIF0
+ R8A7779_CLK_SCIF5 R8A7779_CLK_SCIF4
+ R8A7779_CLK_SCIF3 R8A7779_CLK_SCIF2
+ R8A7779_CLK_SCIF1 R8A7779_CLK_SCIF0
+ R8A7779_CLK_I2C3 R8A7779_CLK_I2C2
+ R8A7779_CLK_I2C1 R8A7779_CLK_I2C0
+ >;
+ clock-output-names =
+ "hspi", "tmu2", "tmu1", "tmu0", "hscif1",
+ "hscif0", "scif5", "scif4", "scif3", "scif2",
+ "scif1", "scif0", "i2c3", "i2c2", "i2c1",
+ "i2c0";
+ };
+ mstp1_clks: mstp1_clks {
+ compatible = "renesas,r8a7779-mstp-clocks",
+ "renesas,cpg-mstp-clocks";
+ reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_S>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_P>,
+ <&cpg_clocks R8A7779_CLK_S>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7779_CLK_USB01 R8A7779_CLK_USB2
+ R8A7779_CLK_DU R8A7779_CLK_VIN2
+ R8A7779_CLK_VIN1 R8A7779_CLK_VIN0
+ R8A7779_CLK_ETHER R8A7779_CLK_SATA
+ R8A7779_CLK_PCIE R8A7779_CLK_VIN3
+ >;
+ clock-output-names =
+ "usb01", "usb2",
+ "du", "vin2",
+ "vin1", "vin0",
+ "ether", "sata",
+ "pcie", "vin3";
+ };
+ mstp3_clks: mstp3_clks {
+ compatible = "renesas,r8a7779-mstp-clocks",
+ "renesas,cpg-mstp-clocks";
+ reg = <0 0xffc8003c 0 4>;
+ clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
+ <&s4_clk>, <&s4_clk>;
+ #clock-cells = <1>;
+ renesas,clock-indices = <
+ R8A7779_CLK_SDHI3 R8A7779_CLK_SDHI2
+ R8A7779_CLK_SDHI1 R8A7779_CLK_SDHI0
+ R8A7779_CLK_MMC1 R8A7779_CLK_MMC0
+ >;
+ clock-output-names =
+ "sdhi3", "sdhi2", "sdhi1", "sdhi0",
+ "mmc1", "mmc0";
+ };
+ };
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 02/24] ARM: shmobile: Sync Marzen DTS with Marzen reference DTS
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
2014-06-23 2:26 ` [PATCH 01/24] ARM: shmobile: r8a7779: Add clocks Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 03/24] ARM: shmobile: marzen: Specify external clock frequency in DT Simon Horman
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Copy the device nodes from Marzen reference into the Marzen device tree
file. This will allow us to use a single DTS file regardless of kernel
configuration. In case of legacy C board code the device nodes may or
may not be used, but in the multiplatform case all the DT device nodes
will be used.
Based on a similar change for the Lager board by Laurent Pinchart.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 94 ++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index a7af2c2..ddf9b9e 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -11,6 +11,8 @@
/dts-v1/;
#include "r8a7779.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
/ {
model = "marzen";
@@ -24,4 +26,96 @@
device_type = "memory";
reg = <0x60000000 0x40000000>;
};
+
+ fixedregulator3v3: fixedregulator at 0 {
+ compatible = "regulator-fixed";
+ regulator-name = "fixed-3.3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ lan0 at 18000000 {
+ compatible = "smsc,lan9220", "smsc,lan9115";
+ reg = <0x18000000 0x100>;
+ pinctrl-0 = <&lan0_pins>;
+ pinctrl-names = "default";
+
+ phy-mode = "mii";
+ interrupt-parent = <&irqpin0>;
+ interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
+ smsc,irq-push-pull;
+ reg-io-width = <4>;
+ vddvario-supply = <&fixedregulator3v3>;
+ vdd33a-supply = <&fixedregulator3v3>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ led2 {
+ gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+ };
+ led3 {
+ gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+ };
+ led4 {
+ gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&irqpin0 {
+ status = "okay";
+};
+
+&pfc {
+ pinctrl-0 = <&scif2_pins &scif4_pins>;
+ pinctrl-names = "default";
+
+ lan0_pins: lan0 {
+ intc {
+ renesas,groups = "intc_irq1_b";
+ renesas,function = "intc";
+ };
+ lbsc {
+ renesas,groups = "lbsc_ex_cs0";
+ renesas,function = "lbsc";
+ };
+ };
+
+ scif2_pins: serial2 {
+ renesas,groups = "scif2_data_c";
+ renesas,function = "scif2";
+ };
+
+ scif4_pins: serial4 {
+ renesas,groups = "scif4_data";
+ renesas,function = "scif4";
+ };
+
+ sdhi0_pins: sd0 {
+ renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
+ renesas,function = "sdhi0";
+ };
+
+ hspi0_pins: hspi0 {
+ renesas,groups = "hspi0";
+ renesas,function = "hspi0";
+ };
+};
+
+&sdhi0 {
+ pinctrl-0 = <&sdhi0_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&fixedregulator3v3>;
+ bus-width = <4>;
+ status = "okay";
+};
+
+&hspi0 {
+ pinctrl-0 = <&hspi0_pins>;
+ pinctrl-names = "default";
+ status = "okay";
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/24] ARM: shmobile: marzen: Specify external clock frequency in DT
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
2014-06-23 2:26 ` [PATCH 01/24] ARM: shmobile: r8a7779: Add clocks Simon Horman
2014-06-23 2:26 ` [PATCH 02/24] ARM: shmobile: Sync Marzen DTS with Marzen reference DTS Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 04/24] ARM: shmobile: r8a7779: Reference clocks Simon Horman
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
The external crystal frequency is 31.25 on the Marzen board.
Specify it in the device tree.
Based on work for the Lager board by Laurent Pinchart.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index ddf9b9e..363f693 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -69,6 +69,10 @@
status = "okay";
};
+&extal_clk {
+ clock-frequency = <31250000>;
+};
+
&pfc {
pinctrl-0 = <&scif2_pins &scif4_pins>;
pinctrl-names = "default";
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 04/24] ARM: shmobile: r8a7779: Reference clocks
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (2 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 03/24] ARM: shmobile: marzen: Specify external clock frequency in DT Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 05/24] ARM: shmobile: r8a7779: Add helper to read mode pins Simon Horman
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Reference clocks using a "clocks" property in all nodes corresponding to
devices that require a clock.
Based on work by Laurent Pinchart for the r8a7790 and r8a7791 SoC.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 5a62970..bdaaadc 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -158,6 +158,7 @@
compatible = "renesas,i2c-r8a7779";
reg = <0xffc70000 0x1000>;
interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_I2C0>;
status = "disabled";
};
@@ -167,6 +168,7 @@
compatible = "renesas,i2c-r8a7779";
reg = <0xffc71000 0x1000>;
interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_I2C1>;
status = "disabled";
};
@@ -176,6 +178,7 @@
compatible = "renesas,i2c-r8a7779";
reg = <0xffc72000 0x1000>;
interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_I2C2>;
status = "disabled";
};
@@ -185,6 +188,7 @@
compatible = "renesas,i2c-r8a7779";
reg = <0xffc73000 0x1000>;
interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_I2C3>;
status = "disabled";
};
@@ -202,12 +206,14 @@
compatible = "renesas,rcar-sata";
reg = <0xfc600000 0x2000>;
interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7779_CLK_SATA>;
};
sdhi0: sd at ffe4c000 {
compatible = "renesas,sdhi-r8a7779";
reg = <0xffe4c000 0x100>;
interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7779_CLK_SDHI0>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled";
@@ -217,6 +223,7 @@
compatible = "renesas,sdhi-r8a7779";
reg = <0xffe4d000 0x100>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7779_CLK_SDHI1>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled";
@@ -226,6 +233,7 @@
compatible = "renesas,sdhi-r8a7779";
reg = <0xffe4e000 0x100>;
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7779_CLK_SDHI2>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled";
@@ -235,6 +243,7 @@
compatible = "renesas,sdhi-r8a7779";
reg = <0xffe4f000 0x100>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7779_CLK_SDHI3>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled";
@@ -246,6 +255,7 @@
interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
+ clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
status = "disabled";
};
@@ -255,6 +265,7 @@
interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
+ clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
status = "disabled";
};
@@ -264,6 +275,7 @@
interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
+ clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
status = "disabled";
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/24] ARM: shmobile: r8a7779: Add helper to read mode pins
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (3 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 04/24] ARM: shmobile: r8a7779: Reference clocks Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 06/24] ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c Simon Horman
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Add and use helper to read mode pins.
This will be re-used when moving marzen-reference to
the common clock framework.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 11 ++---------
arch/arm/mach-shmobile/include/mach/r8a7779.h | 1 +
arch/arm/mach-shmobile/setup-r8a7779.c | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index d81539a..5dd66a2 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -23,6 +23,7 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
+#include <mach/r8a7779.h>
#include "clock.h"
#include "common.h"
@@ -52,9 +53,6 @@
#define MSTPCR3 IOMEM(0xffc8003c)
#define MSTPSR1 IOMEM(0xffc80044)
-#define MODEMR 0xffcc0020
-
-
/* ioremap() through clock mapping mandatory to avoid
* collision with ARM coherent DMA virtual memory range.
*/
@@ -207,14 +205,9 @@ static struct clk_lookup lookups[] = {
void __init r8a7779_clock_init(void)
{
- void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
- u32 mode;
+ u32 mode = r8a7779_read_mode_pins();
int k, ret = 0;
- BUG_ON(!modemr);
- mode = ioread32(modemr);
- iounmap(modemr);
-
if (mode & MD(1)) {
plla_clk.rate = 1500000000;
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index def10a2..5ef0bad 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -20,6 +20,7 @@ extern void r8a7779_add_early_devices(void);
extern void r8a7779_add_standard_devices(void);
extern void r8a7779_add_standard_devices_dt(void);
extern void r8a7779_init_late(void);
+extern u32 r8a7779_read_mode_pins(void);
extern void r8a7779_clock_init(void);
extern void r8a7779_pinmux_init(void);
extern void r8a7779_pm_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 86ec4b6..25e1d0b 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -762,6 +762,24 @@ void __init r8a7779_add_standard_devices_dt(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
+#define MODEMR 0xffcc0020
+
+u32 __init r8a7779_read_mode_pins(void)
+{
+ static u32 mode;
+ static bool mode_valid;
+
+ if (!mode_valid) {
+ void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
+ BUG_ON(!modemr);
+ mode = ioread32(modemr);
+ iounmap(modemr);
+ mode_valid = true;
+ }
+
+ return mode;
+}
+
static const char *r8a7779_compat_dt[] __initdata = {
"renesas,r8a7779",
NULL,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/24] ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (4 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 05/24] ARM: shmobile: r8a7779: Add helper to read mode pins Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 07/24] ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code Simon Horman
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
r8a7779_earlytimer_init() calls r8a7779_clock_init() and
r8a7779_clock_init() is defined in clock-r8a7779.c.
If both CONFIG_COMMON_CLK and CONFIG_ARCH_R8A7779 are enabled,
as will be the case when marzen-reference moves to use
the common clock framework, then setup-r8a7779.c is compiled
but clock-r8a7779.c is not.
As r8a7779_earlytimer_init() is not used by marzen-reference
simply move it to clock-r8a7779.c.
[horms+renesas at verge.net.au: rebase]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 11 +++++++++++
arch/arm/mach-shmobile/setup-r8a7779.c | 10 ----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 5dd66a2..e690927 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -23,6 +23,7 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
+#include <linux/sh_timer.h>
#include <mach/r8a7779.h>
#include "clock.h"
#include "common.h"
@@ -261,3 +262,13 @@ void __init r8a7779_clock_init(void)
else
panic("failed to setup r8a7779 clocks\n");
}
+
+/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
+void __init __weak r8a7779_register_twd(void) { }
+
+void __init r8a7779_earlytimer_init(void)
+{
+ r8a7779_clock_init();
+ r8a7779_register_twd();
+ shmobile_earlytimer_init();
+}
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 25e1d0b..23122f6 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -674,16 +674,6 @@ void __init r8a7779_add_standard_devices(void)
r8a7779_register_hpb_dmae();
}
-/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
-void __init __weak r8a7779_register_twd(void) { }
-
-void __init r8a7779_earlytimer_init(void)
-{
- r8a7779_clock_init();
- r8a7779_register_twd();
- shmobile_earlytimer_init();
-}
-
void __init r8a7779_add_early_devices(void)
{
early_platform_add_devices(r8a7779_devices_dt,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/24] ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (5 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 06/24] ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 08/24] ARM: shmobile: r8a7779: Initial multiplatform support Simon Horman
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Move the clock initialisation and OF device population from
SoC to board code. This is in keeping with the pattern used by Lager.
And the clock portion is part of decoupling clock initialisation
from SoC code in preparation for moving to the common clock framework.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 3 +++
arch/arm/mach-shmobile/setup-r8a7779.c | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 94bd572..46ed17a 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <linux/of_platform.h>
#include <mach/r8a7779.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
@@ -27,7 +28,9 @@
static void __init marzen_init(void)
{
+ r8a7779_clock_init();
r8a7779_add_standard_devices_dt();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
}
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 23122f6..15f533b 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -744,12 +744,8 @@ void __init r8a7779_init_delay(void)
void __init r8a7779_add_standard_devices_dt(void)
{
- /* clocks are setup late during boot in the case of DT */
- r8a7779_clock_init();
-
platform_add_devices(r8a7779_devices_dt,
ARRAY_SIZE(r8a7779_devices_dt));
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
#define MODEMR 0xffcc0020
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 08/24] ARM: shmobile: r8a7779: Initial multiplatform support
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (6 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 07/24] ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 09/24] ARM: shmobile: marzen-reference: Initialize CPG device Simon Horman
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Add Marzen and r8a7779 to CONFIG_SHMOBILE_MULTI. At this
point CCF is not yet supported so you cannot run this code
yet. For CCF support to happen several different components
are needed, and this is one simple portion that moves us
forward. Other patches need to build on top of this one.
Marzen board support exists in 3 flavours:
1) SHMOBILE_MULTI, MACH_MARZEN - board-marzen-reference.c (CCF + DT)
2) SHMOBILE, MACH_MARZEN_REFERENCE - board-marzen-reference.c (DT)
3) SHMOBILE, MACH_MARZEN - board-marzen.c (legacy C code)
When CCF is done then 2) will be removed. When 1) includes same features
as 3) then 3) will be removed.
Based on work for the Koelsch and r8a7791 by Magnus Damm.
Cc: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/mach-shmobile/Kconfig | 10 ++++++++++
arch/arm/mach-shmobile/Makefile | 1 +
arch/arm/mach-shmobile/board-marzen-reference.c | 5 +++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5986ff6..f44df11 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -339,7 +339,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
- r8a7790-lager.dtb
+ r8a7790-lager.dtb \
+ r8a7779-marzen-reference.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_sockit.dtb \
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index dbd954e..d7f8285 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -25,6 +25,11 @@ config ARCH_R7S72100
bool "RZ/A1H (R7S72100)"
select SYS_SUPPORTS_SH_MTU2
+config ARCH_R8A7779
+ bool "R-Car H1 (R8A77790)"
+ select RENESAS_INTC_IRQPIN
+ select SYS_SUPPORTS_SH_TMU
+
config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
select RENESAS_IRQC
@@ -51,6 +56,11 @@ config MACH_LAGER
depends on ARCH_R8A7790
select MICREL_PHY if SH_ETH
+config MACH_MARZEN
+ bool "MARZEN board"
+ depends on ARCH_R8A7779
+ select REGULATOR_FIXED_VOLTAGE if REGULATOR
+
comment "Renesas ARM SoCs System Configuration"
endif
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 38d5fe8..2309906 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -59,6 +59,7 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI
obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o
obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o
obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
+obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
else
obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 46ed17a..d90843b 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <linux/clk-provider.h>
#include <linux/of_platform.h>
#include <mach/r8a7779.h>
#include <asm/irq.h>
@@ -28,7 +29,11 @@
static void __init marzen_init(void)
{
+#ifdef CONFIG_COMMON_CLK
+ of_clk_init(NULL);
+#else
r8a7779_clock_init();
+#endif
r8a7779_add_standard_devices_dt();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 09/24] ARM: shmobile: marzen-reference: Initialize CPG device
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (7 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 08/24] ARM: shmobile: r8a7779: Initial multiplatform support Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 10/24] ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and TMU Simon Horman
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
On multiplatform kernels clocks are handled by the CCF CPG driver. It
must be explicitly initialized by a call to r8a7779_clocks_init() with
the value of the boot mode pins.
Based on similar work for the Koelsch board by Laurent Pinchart.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index d90843b..f642819 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/clk-provider.h>
+#include <linux/clk/shmobile.h>
+#include <linux/clocksource.h>
#include <linux/of_platform.h>
#include <mach/r8a7779.h>
#include <asm/irq.h>
@@ -27,11 +28,17 @@
#include "common.h"
#include "irqs.h"
-static void __init marzen_init(void)
+static void __init marzen_init_timer(void)
{
#ifdef CONFIG_COMMON_CLK
- of_clk_init(NULL);
-#else
+ r8a7779_clocks_init(r8a7779_read_mode_pins());
+#endif
+ clocksource_of_init();
+}
+
+static void __init marzen_init(void)
+{
+#ifndef CONFIG_COMMON_CLK
r8a7779_clock_init();
#endif
r8a7779_add_standard_devices_dt();
@@ -48,6 +55,7 @@ DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
.init_early = r8a7779_init_delay,
+ .init_time = marzen_init_timer,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = marzen_init,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/24] ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and TMU
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (8 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 09/24] ARM: shmobile: marzen-reference: Initialize CPG device Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 11/24] ARM: shmobile: Remove non-multiplatform Marzen reference support Simon Horman
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Now that the common clock framework is supported, the clock lookup
entries in clock-r8a7779.c are not registered anymore. Devices must
instead reference their clocks in the device tree. However, SCIF and CMT
devices are still instantiated through platform code, and thus need a
clock lookup entry.
Retrieve the SCIF and CMT clock entries by name and register clkdevs for
the corresponding devices. This will be removed when the SCIF and CMT
devices will be instantiated from the device tree.
Based on work for the Koelsch board by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index f642819..3017040 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -25,6 +25,7 @@
#include <mach/r8a7779.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
+#include "clock.h"
#include "common.h"
#include "irqs.h"
@@ -36,9 +37,27 @@ static void __init marzen_init_timer(void)
clocksource_of_init();
}
+#ifdef CONFIG_COMMON_CLK
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] __initconst = {
+ { "scif0", NULL, "sh-sci.0" },
+ { "scif1", NULL, "sh-sci.1" },
+ { "scif2", NULL, "sh-sci.2" },
+ { "scif3", NULL, "sh-sci.3" },
+ { "scif4", NULL, "sh-sci.4" },
+ { "scif5", NULL, "sh-sci.5" },
+ { "tmu0", "fck", "sh-tmu.0" },
+};
+#endif
+
static void __init marzen_init(void)
{
-#ifndef CONFIG_COMMON_CLK
+#ifdef CONFIG_COMMON_CLK
+ shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
+#else
r8a7779_clock_init();
#endif
r8a7779_add_standard_devices_dt();
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 11/24] ARM: shmobile: Remove non-multiplatform Marzen reference support
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (9 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 10/24] ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and TMU Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 12/24] ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB Simon Horman
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Now that r8a7779 has CCF support remove the legacy Marzen reference
Kconfig bits CONFIG_MACH_MARZEN_REFERENCE for the non-multiplatform
case.
Starting from this commit Marzen board support is always enabled via
CONFIG_MACH_MARZEN, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-marzen.c and board-marzen-reference.c
The file board-marzen-reference.c can no longer be used together with
the legacy sh-clk clock framework, instead CCF is used.
Based on work for the Koelsch board by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/Makefile | 1 -
arch/arm/mach-shmobile/Kconfig | 13 -------------
arch/arm/mach-shmobile/Makefile | 1 -
arch/arm/mach-shmobile/Makefile.boot | 1 -
4 files changed, 16 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f44df11..e666d13 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -327,7 +327,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
r8a7778-bockw-reference.dtb \
r8a7740-armadillo800eva-reference.dtb \
r8a7779-marzen.dtb \
- r8a7779-marzen-reference.dtb \
r8a7791-koelsch.dtb \
r8a7790-lager.dtb \
sh73a0-kzm9g.dtb \
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index d7f8285..8a054dd 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -245,19 +245,6 @@ config MACH_MARZEN
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select USE_OF
-config MACH_MARZEN_REFERENCE
- bool "MARZEN board - Reference Device Tree Implementation"
- depends on ARCH_R8A7779
- select ARCH_REQUIRE_GPIOLIB
- select REGULATOR_FIXED_VOLTAGE if REGULATOR
- select USE_OF
- ---help---
- Use reference implementation of Marzen board support
- which makes use of device tree at the expense
- of not supporting a number of devices.
-
- This is intended to aid developers
-
config MACH_LAGER
bool "Lager board"
depends on ARCH_R8A7790
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 2309906..0d6a04c 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
-obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
obj-$(CONFIG_MACH_LAGER) += board-lager.o
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index 918fccf..ebf97d4 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -13,7 +13,6 @@ loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
-loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000
__ZRELADDR := $(sort $(loadaddr-y))
zreladdr-y += $(__ZRELADDR)
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 12/24] ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (10 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 11/24] ARM: shmobile: Remove non-multiplatform Marzen reference support Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 13/24] ARM: shmobile: Remove Marzen reference DTS Simon Horman
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Let the multiplatform Marzen support boot with the legacy DTS for
Marzen as well as the Marzen reference DTS.
Based on work for the Koelsch board by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/mach-shmobile/board-marzen-reference.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e666d13..4ebc4ca 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -339,7 +339,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
r8a7790-lager.dtb \
- r8a7779-marzen-reference.dtb
+ r8a7779-marzen.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_sockit.dtb \
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 3017040..46936ff 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -66,6 +66,7 @@ static void __init marzen_init(void)
}
static const char *marzen_boards_compat_dt[] __initdata = {
+ "renesas,marzen",
"renesas,marzen-reference",
NULL,
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 13/24] ARM: shmobile: Remove Marzen reference DTS
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (11 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 12/24] ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 14/24] ARM: shmobile: marzen-reference: Remove legacy clock support Simon Horman
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Now that the DTS file r8a7779-marzen.dts can be used with
board-marzen.c and board-marzen-reference.c, proceed with removing
r8a7779-marzen-reference.dts.
Based on work for the Koelsch board by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 121 -------------------------
1 file changed, 121 deletions(-)
delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
deleted file mode 100644
index b27c637..0000000
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Reference Device Tree Source for the Marzen board
- *
- * Copyright (C) 2013 Renesas Solutions Corp.
- * Copyright (C) 2013 Simon Horman
- *
- * 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 "r8a7779.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
- model = "marzen";
- compatible = "renesas,marzen-reference", "renesas,r8a7779";
-
- chosen {
- bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on rw";
- };
-
- memory {
- device_type = "memory";
- reg = <0x60000000 0x40000000>;
- };
-
- fixedregulator3v3: fixedregulator at 0 {
- compatible = "regulator-fixed";
- regulator-name = "fixed-3.3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- lan0 at 18000000 {
- compatible = "smsc,lan9220", "smsc,lan9115";
- reg = <0x18000000 0x100>;
- pinctrl-0 = <&lan0_pins>;
- pinctrl-names = "default";
-
- phy-mode = "mii";
- interrupt-parent = <&irqpin0>;
- interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
- smsc,irq-push-pull;
- reg-io-width = <4>;
- vddvario-supply = <&fixedregulator3v3>;
- vdd33a-supply = <&fixedregulator3v3>;
- };
-
- leds {
- compatible = "gpio-leds";
- led2 {
- gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
- };
- led3 {
- gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;
- };
- led4 {
- gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;
- };
- };
-};
-
-&irqpin0 {
- status = "okay";
-};
-
-&pfc {
- pinctrl-0 = <&scif2_pins &scif4_pins>;
- pinctrl-names = "default";
-
- lan0_pins: lan0 {
- intc {
- renesas,groups = "intc_irq1_b";
- renesas,function = "intc";
- };
- lbsc {
- renesas,groups = "lbsc_ex_cs0";
- renesas,function = "lbsc";
- };
- };
-
- scif2_pins: serial2 {
- renesas,groups = "scif2_data_c";
- renesas,function = "scif2";
- };
-
- scif4_pins: serial4 {
- renesas,groups = "scif4_data";
- renesas,function = "scif4";
- };
-
- sdhi0_pins: sd0 {
- renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
- renesas,function = "sdhi0";
- };
-
- hspi0_pins: hspi0 {
- renesas,groups = "hspi0";
- renesas,function = "hspi0";
- };
-};
-
-&sdhi0 {
- pinctrl-0 = <&sdhi0_pins>;
- pinctrl-names = "default";
-
- vmmc-supply = <&fixedregulator3v3>;
- bus-width = <4>;
- status = "okay";
-};
-
-&hspi0 {
- pinctrl-0 = <&hspi0_pins>;
- pinctrl-names = "default";
- status = "okay";
-};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 14/24] ARM: shmobile: marzen-reference: Remove legacy clock support
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (12 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 13/24] ARM: shmobile: Remove Marzen reference DTS Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 15/24] ARM: shmobile: r8a7779: Add Maximum CPU Frequency to DTS Simon Horman
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Marzen DT reference is now only built for multiplatform
which means that CCF comes with the package. Remove unused legacy
code ifdefs to clean up the code.
Based on similar work for the Koelsch board by Magnus Damm.
Cc: Magnus Damm <damm@opensource.se>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 46936ff..1b63686 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -31,13 +31,10 @@
static void __init marzen_init_timer(void)
{
-#ifdef CONFIG_COMMON_CLK
r8a7779_clocks_init(r8a7779_read_mode_pins());
-#endif
clocksource_of_init();
}
-#ifdef CONFIG_COMMON_CLK
/*
* This is a really crude hack to provide clkdev support to platform
* devices until they get moved to DT.
@@ -51,15 +48,10 @@ static const struct clk_name clk_names[] __initconst = {
{ "scif5", NULL, "sh-sci.5" },
{ "tmu0", "fck", "sh-tmu.0" },
};
-#endif
static void __init marzen_init(void)
{
-#ifdef CONFIG_COMMON_CLK
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-#else
- r8a7779_clock_init();
-#endif
r8a7779_add_standard_devices_dt();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 15/24] ARM: shmobile: r8a7779: Add Maximum CPU Frequency to DTS
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (13 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 14/24] ARM: shmobile: marzen-reference: Remove legacy clock support Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 16/24] ARM: shmobile: r8a7779: Use DT CPU Frequency in common case Simon Horman
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Add 1GHz to the r8a7779 DTS to describe the maximum CPU frequency.
Based on work by Magnus dam for the r8a7740 SoC.
Cc: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index bdaaadc..038c16a 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -26,21 +26,25 @@
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0>;
+ clock-frequency = <1000000000>;
};
cpu at 1 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <1>;
+ clock-frequency = <1000000000>;
};
cpu at 2 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <2>;
+ clock-frequency = <1000000000>;
};
cpu at 3 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <3>;
+ clock-frequency = <1000000000>;
};
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 16/24] ARM: shmobile: r8a7779: Use DT CPU Frequency in common case
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (14 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 15/24] ARM: shmobile: r8a7779: Add Maximum CPU Frequency to DTS Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 17/24] ARM: shmobile: marzen-reference: Use DT CPU Frequency Simon Horman
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Convert the common C-code-less r8a7779 DT board support
to use shmobile_init_delay() to be able to migrate away
from per-SoC delay setup functions.
Based on work by Magnus dam for the r8a7740 SoC.
Cc: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 15f533b..706832f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -773,7 +773,7 @@ static const char *r8a7779_compat_dt[] __initdata = {
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.map_io = r8a7779_map_io,
- .init_early = r8a7779_init_delay,
+ .init_early = shmobile_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = r8a7779_add_standard_devices_dt,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 17/24] ARM: shmobile: marzen-reference: Use DT CPU Frequency
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (15 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 16/24] ARM: shmobile: r8a7779: Use DT CPU Frequency in common case Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 18/24] ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay() Simon Horman
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Convert the Marzen DT reference board support to use shmobile_init_delay()
to be able to migrate away from per-SoC delay setup functions.
Based on work for the Armadillo800 EVA board by Magnus Damm.
Cc: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 1b63686..bb2df32 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -66,7 +66,7 @@ static const char *marzen_boards_compat_dt[] __initdata = {
DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
- .init_early = r8a7779_init_delay,
+ .init_early = shmobile_init_delay,
.init_time = marzen_init_timer,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 18/24] ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay()
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (16 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 17/24] ARM: shmobile: marzen-reference: Use DT CPU Frequency Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 19/24] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks Simon Horman
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Remove the now unused r8a7779_init_delay() function.
Based on work for the r8a7740 SoC by Magnus Damm.
Cc: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/r8a7779.h | 1 -
arch/arm/mach-shmobile/setup-r8a7779.c | 5 -----
2 files changed, 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index 5ef0bad..5415c71 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -10,7 +10,6 @@ enum {
HPBDMA_SLAVE_SDHI0_RX,
};
-extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq_extpin(int irlm);
extern void r8a7779_init_irq_extpin_dt(int irlm);
extern void r8a7779_init_irq_dt(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 706832f..f96a304 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -737,11 +737,6 @@ void __init r8a7779_init_irq_dt(void)
__raw_writel(0x003fee3f, INT2SMSKCR4);
}
-void __init r8a7779_init_delay(void)
-{
- shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
-}
-
void __init r8a7779_add_standard_devices_dt(void)
{
platform_add_devices(r8a7779_devices_dt,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 19/24] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (17 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 18/24] ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay() Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 20/24] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells " Simon Horman
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
- Correct the unit-address for the "cpg_clocks" node,
- Add missing unit-addresses for the "mstp*_clks" nodes,
- Rename "cpg_clocks" and "mstp*_clks" nodes to the more generic
"clocks".
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 038c16a..27bf227 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -298,7 +298,7 @@
};
/* Special CPG clocks */
- cpg_clocks: cpg_clocks at 0xe6150000 {
+ cpg_clocks: clocks at ffc80000 {
compatible = "renesas,r8a7779-cpg-clocks";
reg = <0 0xffc80000 0 0x30>;
clocks = <&extal_clk>;
@@ -342,7 +342,7 @@
};
/* Gate clocks */
- mstp0_clks: mstp0_clks {
+ mstp0_clks: clocks at ffc80030 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
reg = <0 0xffc80030 0 4>;
@@ -379,7 +379,7 @@
"scif1", "scif0", "i2c3", "i2c2", "i2c1",
"i2c0";
};
- mstp1_clks: mstp1_clks {
+ mstp1_clks: clocks at ffc80034 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>;
@@ -408,7 +408,7 @@
"ether", "sata",
"pcie", "vin3";
};
- mstp3_clks: mstp3_clks {
+ mstp3_clks: clocks at ffc8003c {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
reg = <0 0xffc8003c 0 4>;
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 20/24] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells for clocks
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (18 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 19/24] ARM: shmobile: r8a7779 dtsi: Update unit-addresses for clocks Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 21/24] ARM: shmobile: r8a7779: Add scif nodes to dtsi Simon Horman
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Warning (ranges_format): /clocks has empty "ranges" property but its #address-cells (2) differs from / (1)
Warning (ranges_format): /clocks has empty "ranges" property but its #size-cells (2) differs from / (1)
As r8a7779 doesn't support LPAE, change #address-cells and #size-cells from
"<2>" to "<1>", and update the affected "reg" properties to fix this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 27bf227..61d08f4 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -284,8 +284,8 @@
};
clocks {
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
ranges;
/* External root clock */
@@ -300,7 +300,7 @@
/* Special CPG clocks */
cpg_clocks: clocks at ffc80000 {
compatible = "renesas,r8a7779-cpg-clocks";
- reg = <0 0xffc80000 0 0x30>;
+ reg = <0xffc80000 0x30>;
clocks = <&extal_clk>;
#clock-cells = <1>;
clock-output-names = "plla", "z", "zs", "s",
@@ -345,7 +345,7 @@
mstp0_clks: clocks at ffc80030 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc80030 0 4>;
+ reg = <0xffc80030 4>;
clocks = <&cpg_clocks R8A7779_CLK_S>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
@@ -382,7 +382,7 @@
mstp1_clks: clocks at ffc80034 {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc80034 0 4>, <0 0xffc80044 0 4>;
+ reg = <0xffc80034 4>, <0xffc80044 4>;
clocks = <&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_S>,
@@ -411,7 +411,7 @@
mstp3_clks: clocks at ffc8003c {
compatible = "renesas,r8a7779-mstp-clocks",
"renesas,cpg-mstp-clocks";
- reg = <0 0xffc8003c 0 4>;
+ reg = <0xffc8003c 4>;
clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
<&s4_clk>, <&s4_clk>;
#clock-cells = <1>;
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 21/24] ARM: shmobile: r8a7779: Add scif nodes to dtsi
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (19 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 20/24] ARM: shmobile: r8a7779 dtsi: Correct #address-cells/#size-cells " Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 22/24] ARM: shmobile: marzen: Remove early_printk from command line Simon Horman
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 61d08f4..94e2fc8 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -196,6 +196,66 @@
status = "disabled";
};
+ scif0: serial at ffe40000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe40000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif1: serial at ffe41000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe41000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif2: serial at ffe42000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe42000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 90 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif3: serial at ffe43000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe43000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif4: serial at ffe44000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe44000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif5: serial at ffe45000 {
+ compatible = "renesas,scif-r8a7779", "renesas,scif";
+ reg = <0xffe45000 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg_clocks R8A7779_CLK_P>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
pfc: pfc at fffc0000 {
compatible = "renesas,pfc-r8a7779";
reg = <0xfffc0000 0x23c>;
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 22/24] ARM: shmobile: marzen: Remove early_printk from command line
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (20 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 21/24] ARM: shmobile: r8a7779: Add scif nodes to dtsi Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 23/24] ARM: shmobile: marzen: Initialise SCIF devices using DT Simon Horman
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
As early printk support is not enabled in the kernel in the
shmobile defconfig it does not make much sense to provide for
it in the default command line.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 363f693..3212908 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -19,7 +19,7 @@
compatible = "renesas,marzen", "renesas,r8a7779";
chosen {
- bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on";
+ bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
};
memory {
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 23/24] ARM: shmobile: marzen: Initialise SCIF devices using DT
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (21 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 22/24] ARM: shmobile: marzen: Remove early_printk from command line Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-06-23 2:26 ` [PATCH 24/24] ARM: shmobile: marzen: Do not use workaround for scif devices Simon Horman
2014-07-07 0:20 ` [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Olof Johansson
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Initialise SCIF devices using DT when booting marzen
using multiplatform.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 22 +++++++++++++++++++---
arch/arm/mach-shmobile/setup-r8a7779.c | 8 ++++----
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 3212908..20b1768 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -18,6 +18,11 @@
model = "marzen";
compatible = "renesas,marzen", "renesas,r8a7779";
+ aliases {
+ serial2 = &scif2;
+ serial4 = &scif4;
+ };
+
chosen {
bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
};
@@ -74,9 +79,6 @@
};
&pfc {
- pinctrl-0 = <&scif2_pins &scif4_pins>;
- pinctrl-names = "default";
-
lan0_pins: lan0 {
intc {
renesas,groups = "intc_irq1_b";
@@ -109,6 +111,20 @@
};
};
+&scif2 {
+ pinctrl-0 = <&scif2_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
+&scif4 {
+ pinctrl-0 = <&scif4_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index f96a304..2f59b99 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -640,16 +640,16 @@ static void __init r8a7779_register_hpb_dmae(void)
}
static struct platform_device *r8a7779_devices_dt[] __initdata = {
+ &tmu0_device,
+};
+
+static struct platform_device *r8a7779_standard_devices[] __initdata = {
&scif0_device,
&scif1_device,
&scif2_device,
&scif3_device,
&scif4_device,
&scif5_device,
- &tmu0_device,
-};
-
-static struct platform_device *r8a7779_standard_devices[] __initdata = {
&i2c0_device,
&i2c1_device,
&i2c2_device,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 24/24] ARM: shmobile: marzen: Do not use workaround for scif devices
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (22 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 23/24] ARM: shmobile: marzen: Initialise SCIF devices using DT Simon Horman
@ 2014-06-23 2:26 ` Simon Horman
2014-07-07 0:20 ` [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Olof Johansson
24 siblings, 0 replies; 26+ messages in thread
From: Simon Horman @ 2014-06-23 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Now that SCIF devices are initialised using DT it should
not be necessary to use the work around to provide clocks any more.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index bb2df32..0a000b7 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -40,12 +40,6 @@ static void __init marzen_init_timer(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "scif0", NULL, "sh-sci.0" },
- { "scif1", NULL, "sh-sci.1" },
- { "scif2", NULL, "sh-sci.2" },
- { "scif3", NULL, "sh-sci.3" },
- { "scif4", NULL, "sh-sci.4" },
- { "scif5", NULL, "sh-sci.5" },
{ "tmu0", "fck", "sh-tmu.0" },
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17
2014-06-23 2:26 [GIT PULL] Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17 Simon Horman
` (23 preceding siblings ...)
2014-06-23 2:26 ` [PATCH 24/24] ARM: shmobile: marzen: Do not use workaround for scif devices Simon Horman
@ 2014-07-07 0:20 ` Olof Johansson
24 siblings, 0 replies; 26+ messages in thread
From: Olof Johansson @ 2014-07-07 0:20 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 23, 2014 at 11:26:36AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC r8a7779-multiplatform updates
> for v3.17.
>
> This pull request is based on 'Renesas ARM Based SoC Header Cleanup for v3.17',
> tagged as header-cleanup-for-v3.17, which I have already sent a
> pull-request for.
>
>
> The following changes since commit 62872989bdbf1245d7239b9f4c05a8ee7c775ed5:
>
> ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case (2014-06-17 17:09:40 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-r8a7779-multiplatform-for-v3.17
Merged into next/soc. Thanks!
-Olof
^ permalink raw reply [flat|nested] 26+ messages in thread