* [PATCH v3 1/4] ARM: shmobile: r8a7790: Add serial ports to the device tree
2013-12-11 13:14 [PATCH v3 0/4] Lager and Koelsch reference serial port support Laurent Pinchart
@ 2013-12-11 13:14 ` Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 2/4] ARM: shmobile: r8a7791: " Laurent Pinchart
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Laurent Pinchart @ 2013-12-11 13:14 UTC (permalink / raw)
To: linux-arm-kernel
Add all serial ports marked as disabled.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 8ed48de..6582f9d 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -299,6 +299,106 @@
status = "disabled";
};
+ scifa0: serial@e6c40000 {
+ compatible = "renesas,scifa-r8a7790", "renesas,scifa";
+ reg = <0 0xe6c40000 0 64>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa1: serial@e6c50000 {
+ compatible = "renesas,scifa-r8a7790", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c50000 0 64>;
+ interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa2: serial@e6c60000 {
+ compatible = "renesas,scifa-r8a7790", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c60000 0 64>;
+ interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb0: serial@e6c20000 {
+ compatible = "renesas,scifb-r8a7790", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c20000 0 64>;
+ interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb1: serial@e6c30000 {
+ compatible = "renesas,scifb-r8a7790", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c30000 0 64>;
+ interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb2: serial@e6ce0000 {
+ compatible = "renesas,scifb-r8a7790", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6ce0000 0 64>;
+ interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif0: serial@e6e60000 {
+ compatible = "renesas,scif-r8a7790", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6e60000 0 64>;
+ interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif1: serial@e6e68000 {
+ compatible = "renesas,scif-r8a7790", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6e68000 0 64>;
+ interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif0: serial@e62c0000 {
+ compatible = "renesas,hscif-r8a7790", "renesas,hscif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe62c0000 0 96>;
+ interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif1: serial@e62c8000 {
+ compatible = "renesas,hscif-r8a7790", "renesas,hscif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe62c8000 0 96>;
+ interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 2/4] ARM: shmobile: r8a7791: Add serial ports to the device tree
2013-12-11 13:14 [PATCH v3 0/4] Lager and Koelsch reference serial port support Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 1/4] ARM: shmobile: r8a7790: Add serial ports to the device tree Laurent Pinchart
@ 2013-12-11 13:14 ` Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 3/4] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Laurent Pinchart
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Laurent Pinchart @ 2013-12-11 13:14 UTC (permalink / raw)
To: linux-arm-kernel
Add all serial ports marked as disabled.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7791.dtsi | 180 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 180 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 0a82192..413e6ed 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -185,6 +185,186 @@
#gpio-range-cells = <3>;
};
+ scifa0: serial@e6c40000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ reg = <0 0xe6c40000 0 64>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFA0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa1: serial@e6c50000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c50000 0 64>;
+ interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFA1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa2: serial@e6c60000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c60000 0 64>;
+ interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFA2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa3: serial@e6c70000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c70000 0 64>;
+ interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7791_CLK_SCIFA3>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa4: serial@e6c78000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c78000 0 64>;
+ interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7791_CLK_SCIFA4>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifa5: serial@e6c80000 {
+ compatible = "renesas,scifa-r8a7791", "renesas,scifa";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c80000 0 64>;
+ interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp11_clks R8A7791_CLK_SCIFA5>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb0: serial@e6c20000 {
+ compatible = "renesas,scifb-r8a7791", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c20000 0 64>;
+ interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb1: serial@e6c30000 {
+ compatible = "renesas,scifb-r8a7791", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6c30000 0 64>;
+ interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scifb2: serial@e6ce0000 {
+ compatible = "renesas,scifb-r8a7791", "renesas,scifb";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6ce0000 0 64>;
+ interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp2_clks R8A7791_CLK_SCIFB2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif0: serial@e6e60000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6e60000 0 64>;
+ interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif1: serial@e6e68000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6e68000 0 64>;
+ interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif2: serial@e6e58000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6e58000 0 64>;
+ interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif3: serial@e6ea8000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6ea8000 0 64>;
+ interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF3>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif4: serial@e6ee0000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6ee0000 0 64>;
+ interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF4>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ scif5: serial@e6ee8000 {
+ compatible = "renesas,scif-r8a7791", "renesas,scif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe6ee8000 0 64>;
+ interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_SCIF5>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif0: serial@e62c0000 {
+ compatible = "renesas,hscif-r8a7791", "renesas,hscif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe62c0000 0 96>;
+ interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_HSCIF0>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif1: serial@e62c8000 {
+ compatible = "renesas,hscif-r8a7791", "renesas,hscif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe62c8000 0 96>;
+ interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_HSCIF1>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
+ hscif2: serial@e62d0000 {
+ compatible = "renesas,hscif-r8a7791", "renesas,hscif";
+ interrupt-parent = <&gic>;
+ reg = <0 0xe62d0000 0 96>;
+ interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp7_clks R8A7791_CLK_HSCIF2>;
+ clock-names = "sci_ick";
+ status = "disabled";
+ };
+
clocks {
#address-cells = <2>;
#size-cells = <2>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 3/4] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
2013-12-11 13:14 [PATCH v3 0/4] Lager and Koelsch reference serial port support Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 1/4] ARM: shmobile: r8a7790: Add serial ports to the device tree Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 2/4] ARM: shmobile: r8a7791: " Laurent Pinchart
@ 2013-12-11 13:14 ` Laurent Pinchart
2013-12-11 13:14 ` [PATCH v3 4/4] ARM: shmobile: koelsch: " Laurent Pinchart
2014-01-07 1:39 ` [PATCH v3 0/4] Lager and Koelsch reference serial port support Simon Horman
4 siblings, 0 replies; 12+ messages in thread
From: Laurent Pinchart @ 2013-12-11 13:14 UTC (permalink / raw)
To: linux-arm-kernel
SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Lager reference board file.
As a side effect of switching to DT-based serial port instantiation,
ttySC6 and ttySC7 get renamed to ttySC0 and ttySC1. As the device tree
source if now shared between lager and lager-reference, we need to
update the serial ports in C code as well.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++++++++++----
arch/arm/mach-shmobile/board-lager-reference.c | 18 ++----------------
arch/arm/mach-shmobile/clock-r8a7790.c | 16 ++++++++--------
arch/arm/mach-shmobile/setup-r8a7790.c | 26 +++++++++++++-------------
4 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 57569cb..fde806b 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -16,8 +16,13 @@
model = "Lager";
compatible = "renesas,lager", "renesas,r8a7790";
+ aliases {
+ serial0 = &scif0;
+ serial1 = &scif1;
+ };
+
chosen {
- bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+ bootargs = "console=ttySC0,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
};
memory@40000000 {
@@ -63,9 +68,6 @@
};
&pfc {
- pinctrl-0 = <&scif0_pins &scif1_pins>;
- pinctrl-names = "default";
-
scif0_pins: serial0 {
renesas,groups = "scif0_data";
renesas,function = "scif0";
@@ -91,3 +93,17 @@
non-removable;
status = "okay";
};
+
+&scif0 {
+ pinctrl-0 = <&scif0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
+&scif1 {
+ pinctrl-0 = <&scif1_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index a6e271d..19170e7 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -31,24 +31,10 @@ static void __init lager_add_standard_devices(void)
{
#ifdef CONFIG_COMMON_CLK
/*
- * This is a really crude hack to provide clkdev support to the SCIF
- * and CMT devices until they get moved to DT.
+ * This is a really crude hack to provide clkdev support to the CMT
+ * device until it gets moved to DT.
*/
- static const char * const scif_names[] = {
- "scifa0", "scifa1", "scifb0", "scifb1",
- "scifb2", "scifa2", "scif0", "scif1",
- "hscif0", "hscif1",
- };
struct clk *clk;
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(scif_names); ++i) {
- clk = clk_get(NULL, scif_names[i]);
- if (clk) {
- clk_register_clkdev(clk, NULL, "sh-sci.%u", i);
- clk_put(clk);
- }
- }
clk = clk_get(NULL, "cmt0");
if (clk) {
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 368cb40..25b0648 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -281,14 +281,14 @@ static struct clk_lookup lookups[] = {
/* MSTP */
CLKDEV_DEV_ID("rcar_sound", &mstp_clks[MSTP1005]),
- 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]),
- CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]),
- CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),
- CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),
- CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),
- CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
+ CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP721]),
+ CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP720]),
+ CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP204]),
+ CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP203]),
+ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP206]),
+ CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]),
+ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP216]),
+ CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP202]),
CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index bb805a4..0208d0b 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -106,14 +106,14 @@ static struct resource scif##index##_resources[] = { \
__R8A7790_SCIF(PORT_HSCIF, SCSCR_RE | SCSCR_TE, \
index, baseaddr, irq)
-R8A7790_SCIFA(0, 0xe6c40000, gic_spi(144)); /* SCIFA0 */
-R8A7790_SCIFA(1, 0xe6c50000, gic_spi(145)); /* SCIFA1 */
-R8A7790_SCIFB(2, 0xe6c20000, gic_spi(148)); /* SCIFB0 */
-R8A7790_SCIFB(3, 0xe6c30000, gic_spi(149)); /* SCIFB1 */
-R8A7790_SCIFB(4, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
-R8A7790_SCIFA(5, 0xe6c60000, gic_spi(151)); /* SCIFA2 */
-R8A7790_SCIF(6, 0xe6e60000, gic_spi(152)); /* SCIF0 */
-R8A7790_SCIF(7, 0xe6e68000, gic_spi(153)); /* SCIF1 */
+R8A7790_SCIF(0, 0xe6e60000, gic_spi(152)); /* SCIF0 */
+R8A7790_SCIF(1, 0xe6e68000, gic_spi(153)); /* SCIF1 */
+R8A7790_SCIFA(2, 0xe6c40000, gic_spi(144)); /* SCIFA0 */
+R8A7790_SCIFA(3, 0xe6c50000, gic_spi(145)); /* SCIFA1 */
+R8A7790_SCIFB(4, 0xe6c20000, gic_spi(148)); /* SCIFB0 */
+R8A7790_SCIFB(5, 0xe6c30000, gic_spi(149)); /* SCIFB1 */
+R8A7790_SCIFB(6, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
+R8A7790_SCIFA(7, 0xe6c60000, gic_spi(151)); /* SCIFA2 */
R8A7790_HSCIF(8, 0xe62c0000, gic_spi(154)); /* HSCIF0 */
R8A7790_HSCIF(9, 0xe62c8000, gic_spi(155)); /* HSCIF1 */
@@ -175,6 +175,11 @@ static const struct resource cmt00_resources[] __initconst = {
void __init r8a7790_add_dt_devices(void)
{
+ r8a7790_register_cmt(00);
+}
+
+void __init r8a7790_add_standard_devices(void)
+{
r8a7790_register_scif(0);
r8a7790_register_scif(1);
r8a7790_register_scif(2);
@@ -185,11 +190,6 @@ void __init r8a7790_add_dt_devices(void)
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
- r8a7790_register_cmt(00);
-}
-
-void __init r8a7790_add_standard_devices(void)
-{
r8a7790_add_dt_devices();
r8a7790_register_irqc(0);
r8a7790_register_thermal();
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 4/4] ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
2013-12-11 13:14 [PATCH v3 0/4] Lager and Koelsch reference serial port support Laurent Pinchart
` (2 preceding siblings ...)
2013-12-11 13:14 ` [PATCH v3 3/4] ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT Laurent Pinchart
@ 2013-12-11 13:14 ` Laurent Pinchart
2014-01-07 1:39 ` [PATCH v3 0/4] Lager and Koelsch reference serial port support Simon Horman
4 siblings, 0 replies; 12+ messages in thread
From: Laurent Pinchart @ 2013-12-11 13:14 UTC (permalink / raw)
To: linux-arm-kernel
SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Koelsch reference board
file.
As a side effect of switching to DT-based serial port instantiation,
ttySC6 and ttySC7 get renamed to ttySC0 and ttySC1. As the device tree
source if now shared between koelsch and koelsch-reference, we need to
update the serial ports in C code as well.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++++++++++++++---
arch/arm/mach-shmobile/board-koelsch-reference.c | 18 ++-----------
arch/arm/mach-shmobile/clock-r8a7791.c | 24 ++++++++---------
arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++++++++++++------------
4 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index fd556c3..9e96ff3 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -17,8 +17,13 @@
model = "Koelsch";
compatible = "renesas,koelsch", "renesas,r8a7791";
+ aliases {
+ serial0 = &scif0;
+ serial1 = &scif1;
+ };
+
chosen {
- bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+ bootargs = "console=ttySC0,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
};
memory@40000000 {
@@ -50,9 +55,6 @@
};
&pfc {
- pinctrl-0 = <&scif0_pins &scif1_pins>;
- pinctrl-names = "default";
-
scif0_pins: serial0 {
renesas,groups = "scif0_data_d";
renesas,function = "scif0";
@@ -63,3 +65,17 @@
renesas,function = "scif1";
};
};
+
+&scif0 {
+ pinctrl-0 = <&scif0_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
+
+&scif1 {
+ pinctrl-0 = <&scif1_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+};
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 652b592..3b6b824 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -32,24 +32,10 @@ static void __init koelsch_add_standard_devices(void)
{
#ifdef CONFIG_COMMON_CLK
/*
- * This is a really crude hack to provide clkdev support to the SCIF
- * and CMT devices until they get moved to DT.
+ * This is a really crude hack to provide clkdev support to the CMT
+ * device until they get moved to DT.
*/
- static const char * const scif_names[] = {
- "scifa0", "scifa1", "scifb0", "scifb1", "scifb2", "scifa2",
- "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scifa3",
- "scifa4", "scifa5",
- };
struct clk *clk;
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(scif_names); ++i) {
- clk = clk_get(NULL, scif_names[i]);
- if (clk) {
- clk_register_clkdev(clk, NULL, "sh-sci.%u", i);
- clk_put(clk);
- }
- }
clk = clk_get(NULL, "cmt0");
if (clk) {
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
index ff2d60d..5a6f96d 100644
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -174,18 +174,18 @@ static struct clk_lookup lookups[] = {
CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7791", &mstp_clks[MSTP726]),
CLKDEV_ICK_ID("du.0", "rcar-du-r8a7791", &mstp_clks[MSTP724]),
CLKDEV_ICK_ID("du.1", "rcar-du-r8a7791", &mstp_clks[MSTP723]),
- 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.0", &mstp_clks[MSTP721]), /* SCIF0 */
+ CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP720]), /* SCIF1 */
+ CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP719]), /* SCIF2 */
+ CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP718]), /* SCIF3 */
+ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP715]), /* SCIF4 */
+ CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP714]), /* SCIF5 */
+ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP204]), /* SCIFA0 */
+ CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP203]), /* SCIFA1 */
+ CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB0 */
+ CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP207]), /* SCIFB1 */
+ CLKDEV_DEV_ID("sh-sci.10", &mstp_clks[MSTP216]), /* SCIFB2 */
+ CLKDEV_DEV_ID("sh-sci.11", &mstp_clks[MSTP202]), /* SCIFA2 */
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 */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index e28404e..605f4cf 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -105,18 +105,18 @@ static struct resource scif##index##_resources[] = { \
#define R8A7791_SCIFB(index, baseaddr, irq) \
__R8A7791_SCIF(PORT_SCIFB, index, baseaddr, irq)
-R8A7791_SCIFA(0, 0xe6c40000, gic_spi(144)); /* SCIFA0 */
-R8A7791_SCIFA(1, 0xe6c50000, gic_spi(145)); /* SCIFA1 */
-R8A7791_SCIFB(2, 0xe6c20000, gic_spi(148)); /* SCIFB0 */
-R8A7791_SCIFB(3, 0xe6c30000, gic_spi(149)); /* SCIFB1 */
-R8A7791_SCIFB(4, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
-R8A7791_SCIFA(5, 0xe6c60000, gic_spi(151)); /* SCIFA2 */
-R8A7791_SCIF(6, 0xe6e60000, gic_spi(152)); /* SCIF0 */
-R8A7791_SCIF(7, 0xe6e68000, gic_spi(153)); /* SCIF1 */
-R8A7791_SCIF(8, 0xe6e58000, gic_spi(22)); /* SCIF2 */
-R8A7791_SCIF(9, 0xe6ea8000, gic_spi(23)); /* SCIF3 */
-R8A7791_SCIF(10, 0xe6ee0000, gic_spi(24)); /* SCIF4 */
-R8A7791_SCIF(11, 0xe6ee8000, gic_spi(25)); /* SCIF5 */
+R8A7791_SCIF(0, 0xe6e60000, gic_spi(152)); /* SCIF0 */
+R8A7791_SCIF(1, 0xe6e68000, gic_spi(153)); /* SCIF1 */
+R8A7791_SCIF(2, 0xe6e58000, gic_spi(22)); /* SCIF2 */
+R8A7791_SCIF(3, 0xe6ea8000, gic_spi(23)); /* SCIF3 */
+R8A7791_SCIF(4, 0xe6ee0000, gic_spi(24)); /* SCIF4 */
+R8A7791_SCIF(5, 0xe6ee8000, gic_spi(25)); /* SCIF5 */
+R8A7791_SCIFA(6, 0xe6c40000, gic_spi(144)); /* SCIFA0 */
+R8A7791_SCIFA(7, 0xe6c50000, gic_spi(145)); /* SCIFA1 */
+R8A7791_SCIFB(8, 0xe6c20000, gic_spi(148)); /* SCIFB0 */
+R8A7791_SCIFB(9, 0xe6c30000, gic_spi(149)); /* SCIFB1 */
+R8A7791_SCIFB(10, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
+R8A7791_SCIFA(11, 0xe6c60000, gic_spi(151)); /* SCIFA2 */
R8A7791_SCIFA(12, 0xe6c70000, gic_spi(29)); /* SCIFA3 */
R8A7791_SCIFA(13, 0xe6c78000, gic_spi(30)); /* SCIFA4 */
R8A7791_SCIFA(14, 0xe6c80000, gic_spi(31)); /* SCIFA5 */
@@ -185,6 +185,11 @@ static const struct resource thermal_resources[] __initconst = {
void __init r8a7791_add_dt_devices(void)
{
+ r8a7791_register_cmt(00);
+}
+
+void __init r8a7791_add_standard_devices(void)
+{
r8a7791_register_scif(0);
r8a7791_register_scif(1);
r8a7791_register_scif(2);
@@ -200,11 +205,6 @@ void __init r8a7791_add_dt_devices(void)
r8a7791_register_scif(12);
r8a7791_register_scif(13);
r8a7791_register_scif(14);
- r8a7791_register_cmt(00);
-}
-
-void __init r8a7791_add_standard_devices(void)
-{
r8a7791_add_dt_devices();
r8a7791_register_irqc(0);
r8a7791_register_thermal();
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2013-12-11 13:14 [PATCH v3 0/4] Lager and Koelsch reference serial port support Laurent Pinchart
` (3 preceding siblings ...)
2013-12-11 13:14 ` [PATCH v3 4/4] ARM: shmobile: koelsch: " Laurent Pinchart
@ 2014-01-07 1:39 ` Simon Horman
2014-01-07 8:03 ` Laurent Pinchart
4 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2014-01-07 1:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> Hello,
>
> This patch set implements serial port support for the Lager reference board.
>
> The code is available in my git tree at
>
> git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
>
> The patches are based on top of the "[PATCH 00/47] sh-sci updates for v3.14"
> and "[PATCH v3 00/15] Lager and Koelsch multiplatform support" patch series.
Hi Laurent, Hi Magnus,
I have marked this series as deferred, but to be honest
I don't quite recall what we decided to do with it.
>
> Changes compared to v2:
>
> - Added Koelsch support
>
> Changes compared to v1:
>
> - Removed early debugging support as it requires more work before being
> mainlined
>
> Laurent Pinchart (4):
> ARM: shmobile: r8a7790: Add serial ports to the device tree
> ARM: shmobile: r8a7791: Add serial ports to the device tree
> ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
>
> arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> arch/arm/boot/dts/r8a7791.dtsi | 180 +++++++++++++++++++++++
> arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> 10 files changed, 374 insertions(+), 90 deletions(-)
>
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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] 12+ messages in thread* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-07 1:39 ` [PATCH v3 0/4] Lager and Koelsch reference serial port support Simon Horman
@ 2014-01-07 8:03 ` Laurent Pinchart
2014-01-08 4:44 ` Simon Horman
0 siblings, 1 reply; 12+ messages in thread
From: Laurent Pinchart @ 2014-01-07 8:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
> On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> > Hello,
> >
> > This patch set implements serial port support for the Lager reference
> > board.
> >
> > The code is available in my git tree at
> >
> > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
> >
> > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
> > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
> > patch series.
>
> Hi Laurent, Hi Magnus,
>
> I have marked this series as deferred, but to be honest
> I don't quite recall what we decided to do with it.
If I recall correctly the decision was to apply patches 1/4 and 2/4 for v3.13
and delay 3/4 and 4/4.
> > Changes compared to v2:
> >
> > - Added Koelsch support
> >
> > Changes compared to v1:
> >
> > - Removed early debugging support as it requires more work before being
> >
> > mainlined
> >
> > Laurent Pinchart (4):
> > ARM: shmobile: r8a7790: Add serial ports to the device tree
> > ARM: shmobile: r8a7791: Add serial ports to the device tree
> > ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> > ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
> >
> > arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> > arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> > arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> > arch/arm/boot/dts/r8a7791.dtsi | 180 ++++++++++++++++++
> > arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> > arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> > arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> > arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> > arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> > arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> > 10 files changed, 374 insertions(+), 90 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-07 8:03 ` Laurent Pinchart
@ 2014-01-08 4:44 ` Simon Horman
2014-01-08 7:13 ` Magnus Damm
2014-01-08 7:51 ` Laurent Pinchart
0 siblings, 2 replies; 12+ messages in thread
From: Simon Horman @ 2014-01-08 4:44 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 07, 2014 at 09:03:13AM +0100, Laurent Pinchart wrote:
> Hi Simon,
>
> On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
> > On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> > > Hello,
> > >
> > > This patch set implements serial port support for the Lager reference
> > > board.
> > >
> > > The code is available in my git tree at
> > >
> > > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
> > >
> > > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
> > > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
> > > patch series.
> >
> > Hi Laurent, Hi Magnus,
> >
> > I have marked this series as deferred, but to be honest
> > I don't quite recall what we decided to do with it.
>
> If I recall correctly the decision was to apply patches 1/4 and 2/4 for v3.13
> and delay 3/4 and 4/4.
In that case I apologise as I did not queue up 1/4 and 1/4 for v3.13.
Instead I have now queued them up locally for v3.14 and will push them soon.
I will leave 3/4 and 4/4 marked as deferred.
>
> > > Changes compared to v2:
> > >
> > > - Added Koelsch support
> > >
> > > Changes compared to v1:
> > >
> > > - Removed early debugging support as it requires more work before being
> > >
> > > mainlined
> > >
> > > Laurent Pinchart (4):
> > > ARM: shmobile: r8a7790: Add serial ports to the device tree
> > > ARM: shmobile: r8a7791: Add serial ports to the device tree
> > > ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> > > ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
> > >
> > > arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> > > arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> > > arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> > > arch/arm/boot/dts/r8a7791.dtsi | 180 ++++++++++++++++++
> > > arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> > > arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> > > arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> > > arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> > > arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> > > arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> > > 10 files changed, 374 insertions(+), 90 deletions(-)
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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] 12+ messages in thread
* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-08 4:44 ` Simon Horman
@ 2014-01-08 7:13 ` Magnus Damm
2014-01-08 7:51 ` Laurent Pinchart
1 sibling, 0 replies; 12+ messages in thread
From: Magnus Damm @ 2014-01-08 7:13 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 8, 2014 at 1:44 PM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Jan 07, 2014 at 09:03:13AM +0100, Laurent Pinchart wrote:
>> Hi Simon,
>>
>> On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
>> > On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
>> > > Hello,
>> > >
>> > > This patch set implements serial port support for the Lager reference
>> > > board.
>> > >
>> > > The code is available in my git tree at
>> > >
>> > > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
>> > >
>> > > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
>> > > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
>> > > patch series.
>> >
>> > Hi Laurent, Hi Magnus,
>> >
>> > I have marked this series as deferred, but to be honest
>> > I don't quite recall what we decided to do with it.
>>
>> If I recall correctly the decision was to apply patches 1/4 and 2/4 for v3.13
>> and delay 3/4 and 4/4.
>
> In that case I apologise as I did not queue up 1/4 and 1/4 for v3.13.
> Instead I have now queued them up locally for v3.14 and will push them soon.
>
> I will leave 3/4 and 4/4 marked as deferred.
Sounds good, I believe this is in line with what we discussed earlier. Thanks!
/ magnus
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-08 4:44 ` Simon Horman
2014-01-08 7:13 ` Magnus Damm
@ 2014-01-08 7:51 ` Laurent Pinchart
2014-01-08 7:55 ` Simon Horman
1 sibling, 1 reply; 12+ messages in thread
From: Laurent Pinchart @ 2014-01-08 7:51 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Wednesday 08 January 2014 13:44:17 Simon Horman wrote:
> On Tue, Jan 07, 2014 at 09:03:13AM +0100, Laurent Pinchart wrote:
> > On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
> > > On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> > > > Hello,
> > > >
> > > > This patch set implements serial port support for the Lager reference
> > > > board.
> > > >
> > > > The code is available in my git tree at
> > > >
> > > > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
> > > >
> > > > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
> > > > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
> > > > patch series.
> > >
> > > Hi Laurent, Hi Magnus,
> > >
> > > I have marked this series as deferred, but to be honest
> > > I don't quite recall what we decided to do with it.
> >
> > If I recall correctly the decision was to apply patches 1/4 and 2/4 for
> > v3.13 and delay 3/4 and 4/4.
>
> In that case I apologise as I did not queue up 1/4 and 1/4 for v3.13.
> Instead I have now queued them up locally for v3.14 and will push them soon.
I actually meant v3.14, so all is good :-)
> I will leave 3/4 and 4/4 marked as deferred.
Sure. I'll resubmit them for v3.15.
> > > > Changes compared to v2:
> > > >
> > > > - Added Koelsch support
> > > >
> > > > Changes compared to v1:
> > > >
> > > > - Removed early debugging support as it requires more work before
> > > > being
> > > >
> > > > mainlined
> > > >
> > > > Laurent Pinchart (4):
> > > > ARM: shmobile: r8a7790: Add serial ports to the device tree
> > > > ARM: shmobile: r8a7791: Add serial ports to the device tree
> > > > ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> > > > ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
> > > >
> > > > arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> > > > arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> > > > arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> > > > arch/arm/boot/dts/r8a7791.dtsi | 180 ++++++++++++++
> > > > arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> > > > arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> > > > arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> > > > arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> > > > arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> > > > arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> > > > 10 files changed, 374 insertions(+), 90 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-08 7:51 ` Laurent Pinchart
@ 2014-01-08 7:55 ` Simon Horman
2014-01-08 7:56 ` Simon Horman
0 siblings, 1 reply; 12+ messages in thread
From: Simon Horman @ 2014-01-08 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 08, 2014 at 08:51:25AM +0100, Laurent Pinchart wrote:
> Hi Simon,
>
> On Wednesday 08 January 2014 13:44:17 Simon Horman wrote:
> > On Tue, Jan 07, 2014 at 09:03:13AM +0100, Laurent Pinchart wrote:
> > > On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
> > > > On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> > > > > Hello,
> > > > >
> > > > > This patch set implements serial port support for the Lager reference
> > > > > board.
> > > > >
> > > > > The code is available in my git tree at
> > > > >
> > > > > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
> > > > >
> > > > > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
> > > > > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
> > > > > patch series.
> > > >
> > > > Hi Laurent, Hi Magnus,
> > > >
> > > > I have marked this series as deferred, but to be honest
> > > > I don't quite recall what we decided to do with it.
> > >
> > > If I recall correctly the decision was to apply patches 1/4 and 2/4 for
> > > v3.13 and delay 3/4 and 4/4.
> >
> > In that case I apologise as I did not queue up 1/4 and 1/4 for v3.13.
> > Instead I have now queued them up locally for v3.14 and will push them soon.
>
> I actually meant v3.14, so all is good :-)
self.errors--; /* :-) */
>
> > I will leave 3/4 and 4/4 marked as deferred.
>
> Sure. I'll resubmit them for v3.15.
Great, thanks.
> > > > > Changes compared to v2:
> > > > >
> > > > > - Added Koelsch support
> > > > >
> > > > > Changes compared to v1:
> > > > >
> > > > > - Removed early debugging support as it requires more work before
> > > > > being
> > > > >
> > > > > mainlined
> > > > >
> > > > > Laurent Pinchart (4):
> > > > > ARM: shmobile: r8a7790: Add serial ports to the device tree
> > > > > ARM: shmobile: r8a7791: Add serial ports to the device tree
> > > > > ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> > > > > ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
> > > > >
> > > > > arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> > > > > arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> > > > > arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> > > > > arch/arm/boot/dts/r8a7791.dtsi | 180 ++++++++++++++
> > > > > arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> > > > > arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> > > > > arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> > > > > arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> > > > > arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> > > > > arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> > > > > 10 files changed, 374 insertions(+), 90 deletions(-)
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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] 12+ messages in thread
* Re: [PATCH v3 0/4] Lager and Koelsch reference serial port support
2014-01-08 7:55 ` Simon Horman
@ 2014-01-08 7:56 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-01-08 7:56 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 08, 2014 at 04:55:05PM +0900, Simon Horman wrote:
> On Wed, Jan 08, 2014 at 08:51:25AM +0100, Laurent Pinchart wrote:
> > Hi Simon,
> >
> > On Wednesday 08 January 2014 13:44:17 Simon Horman wrote:
> > > On Tue, Jan 07, 2014 at 09:03:13AM +0100, Laurent Pinchart wrote:
> > > > On Tuesday 07 January 2014 10:39:36 Simon Horman wrote:
> > > > > On Wed, Dec 11, 2013 at 02:14:20PM +0100, Laurent Pinchart wrote:
> > > > > > Hello,
> > > > > >
> > > > > > This patch set implements serial port support for the Lager reference
> > > > > > board.
> > > > > >
> > > > > > The code is available in my git tree at
> > > > > >
> > > > > > git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/serial/boards
> > > > > >
> > > > > > The patches are based on top of the "[PATCH 00/47] sh-sci updates for
> > > > > > v3.14" and "[PATCH v3 00/15] Lager and Koelsch multiplatform support"
> > > > > > patch series.
> > > > >
> > > > > Hi Laurent, Hi Magnus,
> > > > >
> > > > > I have marked this series as deferred, but to be honest
> > > > > I don't quite recall what we decided to do with it.
> > > >
> > > > If I recall correctly the decision was to apply patches 1/4 and 2/4 for
> > > > v3.13 and delay 3/4 and 4/4.
> > >
> > > In that case I apologise as I did not queue up 1/4 and 1/4 for v3.13.
> > > Instead I have now queued them up locally for v3.14 and will push them soon.
> >
> > I actually meant v3.14, so all is good :-)
>
> self.errors--; /* :-) */
I meant v3.15.
self.errors++; /* :-( */
>
> >
> > > I will leave 3/4 and 4/4 marked as deferred.
> >
> > Sure. I'll resubmit them for v3.15.
>
> Great, thanks.
>
> > > > > > Changes compared to v2:
> > > > > >
> > > > > > - Added Koelsch support
> > > > > >
> > > > > > Changes compared to v1:
> > > > > >
> > > > > > - Removed early debugging support as it requires more work before
> > > > > > being
> > > > > >
> > > > > > mainlined
> > > > > >
> > > > > > Laurent Pinchart (4):
> > > > > > ARM: shmobile: r8a7790: Add serial ports to the device tree
> > > > > > ARM: shmobile: r8a7791: Add serial ports to the device tree
> > > > > > ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
> > > > > > ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
> > > > > >
> > > > > > arch/arm/boot/dts/r8a7790-lager.dts | 24 ++-
> > > > > > arch/arm/boot/dts/r8a7790.dtsi | 100 +++++++++++++
> > > > > > arch/arm/boot/dts/r8a7791-koelsch.dts | 24 ++-
> > > > > > arch/arm/boot/dts/r8a7791.dtsi | 180 ++++++++++++++
> > > > > > arch/arm/mach-shmobile/board-koelsch-reference.c | 18 +--
> > > > > > arch/arm/mach-shmobile/board-lager-reference.c | 18 +--
> > > > > > arch/arm/mach-shmobile/clock-r8a7790.c | 16 +-
> > > > > > arch/arm/mach-shmobile/clock-r8a7791.c | 24 +--
> > > > > > arch/arm/mach-shmobile/setup-r8a7790.c | 26 ++--
> > > > > > arch/arm/mach-shmobile/setup-r8a7791.c | 34 ++---
> > > > > > 10 files changed, 374 insertions(+), 90 deletions(-)
> > --
> > Regards,
> >
> > Laurent Pinchart
> >
> > --
> > 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] 12+ messages in thread