Skip to contentSkip to conversation

ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

PATCH New Geert Uytterhoeven 4 participants 13 messages Feb 17, 2015 – Feb 19, 2015

Subsystems (6)
lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

Hi Simon, Magnus,

This patch series completes the migration from aep6evm-legacy (legacy board code) and ape6evm-reference (legacy DT based) to ape6evm-multiplatform (ARM multiplatform DT based with common clock framework).

It depends on Simon's branch simple-pm-bus-for-v3.21.

- The first two patches fix Ethernet on ape6evm, by adding a Bus State Controller node, and moving the Ethernet node to it, and thus depends on Simon's branch simple-pm-bus-for-v3.21,
- The third patch moves the pfc node after the irqc nodes, to work around a bug in the core OF proving code,
- The fourth and fifth patch remove all ape6evm-legacy and ape6evm-reference support, now the r8a73a4 generic multiplatform case has the same feature set,
- The sixth patch is new, and removes the now superfluous console= bootargs parameter.

Thanks for applying!

Geert Uytterhoeven (4):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering
bug
ARM: shmobile: ape6evm dts: Drop console= bootargs parameter

Ulrich Hecht (2):
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform

 Documentation/devicetree/bindings/arm/shmobile.txt |   2 -
 MAINTAINERS                                        |   1 -
 arch/arm/boot/dts/Makefile                         |   2 -
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    | 156 -----------
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |  37 ++-
 arch/arm/boot/dts/r8a73a4.dtsi                     |  56 ++--
 arch/arm/configs/ape6evm_defconfig                 | 109 --------
 arch/arm/mach-shmobile/Kconfig                     |  25 --
 arch/arm/mach-shmobile/Makefile                    |   2 -
 arch/arm/mach-shmobile/Makefile.boot               |   2 -
 arch/arm/mach-shmobile/board-ape6evm-reference.c   |  61 ----
 arch/arm/mach-shmobile/board-ape6evm.c             | 306 ---------------------
 12 files changed, 49 insertions(+), 710 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
 delete mode 100644 arch/arm/configs/ape6evm_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
Signature · 12 lines
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
author maintainer
#1 lore raw

PATCH v4 1/6 ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node

Add a node for the Bus State Controller (BSC) on r8a73a4, to which multiple external devices can be connected.

The BSC is driven by the ZB clock, and located in PM domain C4. A reference to the latter will be added later.

---
v4:
- Add Acked-by,
- Claim compatiblity with "simple-pm-bus" instead of "simple-bus",

v3:
- Add Tested-by,
- Move "ranges" before "reg",

v2:
- New.

---
 arch/arm/boot/dts/r8a73a4.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/r8a73a4.dtsi +10 -0
index fdcca5d0fb61f0bc..77bd35cd89113df7 100644
@@ -409,6 +409,16 @@
 		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	bsc: bus at fec10000 {
+		compatible = "renesas,bsc-r8a73a4", "renesas,bsc",
+			     "simple-pm-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0 0 0 0x20000000>;
+		reg = <0 0xfec10000 0 0x400>;
+		clocks = <&zb_clk>;
+	};
+
 	clocks {
 		#address-cells = <2>;
 		#size-cells = <2>;
Signature · 1 line
1.9.1
author maintainer
#2 lore raw

PATCH v4 2/6 ARM: shmobile: ape6evm dts: Move Ethernet node to BSC

In reply to Geert Uytterhoeven

Move the Ethernet node from the ad-hoc lbsc node to the BSC node, as its connected to the Bus State Controller. This allows the system to know the right position of the Ethernet node in the clock and PM domain hierarchy, and manage the clock and PM domain appropriately.

---
v4:
- Add Acked-by,

v3:
- Add Tested-by,

v2:
- New.

---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +15 -20
index 0d50bef0123449f5..44c4cac1820a4dfe 100644
@@ -72,26 +72,6 @@
 		regulator-always-on;
 	};
 
-	lbsc {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0 0 0 0x20000000>;
-
-		ethernet at 8000000 {
-			compatible = "smsc,lan9220", "smsc,lan9115";
-			reg = <0x08000000 0x1000>;
-			interrupt-parent = <&irqc1>;
-			interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
-			phy-mode = "mii";
-			reg-io-width = <4>;
-			smsc,irq-active-high;
-			smsc,irq-push-pull;
-			vdd33a-supply = <&ape6evm_fixed_3v3>;
-			vddvario-supply = <&ape6evm_fixed_1v8>;
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 		led1 {
@@ -184,6 +164,21 @@
 	voltage-tolerance = <1>; /* 1% */
 };
 
+&bsc {
+	ethernet at 8000000 {
+		compatible = "smsc,lan9220", "smsc,lan9115";
+		reg = <0x08000000 0x1000>;
+		interrupt-parent = <&irqc1>;
+		interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+		phy-mode = "mii";
+		reg-io-width = <4>;
+		smsc,irq-active-high;
+		smsc,irq-push-pull;
+		vdd33a-supply = <&ape6evm_fixed_3v3>;
+		vddvario-supply = <&ape6evm_fixed_1v8>;
+	};
+};
+
 &cmt1 {
 	status = "okay";
 };
Signature · 1 line
1.9.1
author maintainer
#3 lore raw

PATCH v4 3/6 ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug

In reply to Geert Uytterhoeven

Currently the pin function controller (which is also a GPIO controller) is instantiated before the interrupt controllers due to the order in the DTS. At that time, the irq domains for the interrupt controllers referenced by its interrupts-extended property cannot be found yet:

irq: no irq domain found for /interrupt-controller at e61c0000 !

Nevertheless, the core OF probing code ignores this failure, besides a debug message that's not normally printed:

not all legacy IRQ resources mapped for pfc

and continues initialization of the device. Then, the sh-pfc driver cannot find any IRQ resources, and thinks no interrupts are available, causing gpio-keys to fail later:

gpio-keys keyboard: Unable to claim irq 0; error -22
gpio-keys: probe of keyboard failed with error -22

Move the pin function controller node after the interrupt controller nodes it references to work around the bug in the core OF probing code.

---
This can be reproduced on other SoCs (e.g. sh73a0 and r8a7740) by moving their pfc nodes before their interrupt controller nodes.

v4:
- New, but an RFC version of this patch has been sent before as a separate patch.

---
 arch/arm/boot/dts/r8a73a4.dtsi | 46 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)
arch/arm/boot/dts/r8a73a4.dtsi +23 -23
index 77bd35cd89113df7..d41201d258cacb1f 100644
@@ -92,29 +92,6 @@
 		};
 	};
 
-	pfc: pfc at e6050000 {
-		compatible = "renesas,pfc-r8a73a4";
-		reg = <0 0xe6050000 0 0x9000>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		interrupts-extended =
-			<&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,
-			<&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,
-			<&irqc0  8 0>, <&irqc0  9 0>, <&irqc0 10 0>, <&irqc0 11 0>,
-			<&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>,
-			<&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>,
-			<&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>,
-			<&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>,
-			<&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>,
-			<&irqc1  0 0>, <&irqc1  1 0>, <&irqc1  2 0>, <&irqc1  3 0>,
-			<&irqc1  4 0>, <&irqc1  5 0>, <&irqc1  6 0>, <&irqc1  7 0>,
-			<&irqc1  8 0>, <&irqc1  9 0>, <&irqc1 10 0>, <&irqc1 11 0>,
-			<&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>,
-			<&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>,
-			<&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>,
-			<&irqc1 24 0>, <&irqc1 25 0>;
-	};
-
 	i2c5: i2c at e60b0000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -210,6 +187,29 @@
 			     <0 57 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
+	pfc: pfc at e6050000 {
+		compatible = "renesas,pfc-r8a73a4";
+		reg = <0 0xe6050000 0 0x9000>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupts-extended =
+			<&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,
+			<&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,
+			<&irqc0  8 0>, <&irqc0  9 0>, <&irqc0 10 0>, <&irqc0 11 0>,
+			<&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>,
+			<&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>,
+			<&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>,
+			<&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>,
+			<&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>,
+			<&irqc1  0 0>, <&irqc1  1 0>, <&irqc1  2 0>, <&irqc1  3 0>,
+			<&irqc1  4 0>, <&irqc1  5 0>, <&irqc1  6 0>, <&irqc1  7 0>,
+			<&irqc1  8 0>, <&irqc1  9 0>, <&irqc1 10 0>, <&irqc1 11 0>,
+			<&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>,
+			<&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>,
+			<&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>,
+			<&irqc1 24 0>, <&irqc1 25 0>;
+	};
+
 	thermal at e61f0000 {
 		compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
 		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
Signature · 1 line
1.9.1
author maintainer
#4 lore raw

PATCH v4 4/6 ARM: shmobile: ape6evm-reference: Remove board C code and DT file

In reply to Geert Uytterhoeven

From: Ulrich Hecht <[email protected]>

Now that the r8a73a4 generic multiplatform case has the same features as the APE6EVM DT reference board code, we get rid of the latter. DT reference code in the future shall make use of the r8a73a4 multiplatform support code with the generic SoC machine vector.

[geert: Update Documentation/devicetree/bindings/arm/shmobile.txt]

---
v4:
- No changes,

v3:
- New.

---
 Documentation/devicetree/bindings/arm/shmobile.txt |   2 -
 arch/arm/boot/dts/Makefile                         |   1 -
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    | 156 ---------------------
 arch/arm/mach-shmobile/Kconfig                     |  12 --
 arch/arm/mach-shmobile/Makefile                    |   1 -
 arch/arm/mach-shmobile/Makefile.boot               |   1 -
 arch/arm/mach-shmobile/board-ape6evm-reference.c   |  61 --------
 7 files changed, 234 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
Documentation/devicetree/bindings/arm/shmobile.txt +0 -2
index e37849e75318b738..c4f19b2e7dd95c10 100644
@@ -35,8 +35,6 @@ Boards:
     compatible = "renesas,alt", "renesas,r8a7794"
   - APE6-EVM
     compatible = "renesas,ape6evm", "renesas,r8a73a4"
-  - APE6-EVM - Reference Device Tree Implementation
-    compatible = "renesas,ape6evm-reference", "renesas,r8a73a4"
   - Atmark Techno Armadillo-800 EVA
     compatible = "renesas,armadillo800eva"
   - BOCK-W
arch/arm/boot/dts/Makefile +0 -1
index 5450d4fa6b77402c..30a9579a4572f22b 100644
@@ -465,7 +465,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
 	s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 	r8a73a4-ape6evm.dtb \
-	r8a73a4-ape6evm-reference.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts deleted +0 -156

156 lines not on this page · raw message

arch/arm/mach-shmobile/Kconfig +0 -12
index 087d4d1e7461caf7..a1a7919c72bb1bd8 100644
@@ -141,18 +141,6 @@ config MACH_APE6EVM
 	select SMSC_PHY if SMSC911X
 	select USE_OF
 
-config MACH_APE6EVM_REFERENCE
-	bool "APE6EVM board - Reference Device Tree Implementation"
-	depends on ARCH_R8A73A4
-	select SMSC_PHY if SMSC911X
-	select USE_OF
-	---help---
-	   Use reference implementation of APE6EVM board support
-	   which makes a greater use of device tree at the expense
-	   of not supporting a number of devices.
-
-	   This is intended to aid developers
-
 config MACH_ARMADILLO800EVA
 	bool "Armadillo-800 EVA board"
 	depends on ARCH_R8A7740
arch/arm/mach-shmobile/Makefile +0 -1
index 016bbb6dcb3cc7b4..8ceeac59cfbb5774 100644
@@ -54,7 +54,6 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI
 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
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
index 5c2117d06f0d3fea..f9cc8a8f1d6c9256 100644
@@ -1,7 +1,6 @@
 # per-board load address for uImage
 loadaddr-y	:=
 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
-loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
arch/arm/mach-shmobile/board-ape6evm-reference.c deleted +0 -61

61 lines not on this page · raw message

Signature · 1 line
1.9.1
author maintainer
#5 lore raw

PATCH v4 5/6 ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform

In reply to Geert Uytterhoeven

From: Ulrich Hecht <[email protected]>

This removes the remains of the legacy ape6evm platform.

---
v4:
- No changes,

v3:
- New.

---
 MAINTAINERS                            |   1 -
 arch/arm/boot/dts/Makefile             |   1 -
 arch/arm/configs/ape6evm_defconfig     | 109 ------------
 arch/arm/mach-shmobile/Kconfig         |  13 --
 arch/arm/mach-shmobile/Makefile        |   1 -
 arch/arm/mach-shmobile/Makefile.boot   |   1 -
 arch/arm/mach-shmobile/board-ape6evm.c | 306 ---------------------------------
 7 files changed, 432 deletions(-)
 delete mode 100644 arch/arm/configs/ape6evm_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
MAINTAINERS +0 -1
index bfd88e2de5f1de8e..c2d2cb4930eda68f 100644
@@ -1413,7 +1413,6 @@ F:	arch/arm/boot/dts/emev2*
 F:	arch/arm/boot/dts/r7s*
 F:	arch/arm/boot/dts/r8a*
 F:	arch/arm/boot/dts/sh*
-F:	arch/arm/configs/ape6evm_defconfig
 F:	arch/arm/configs/armadillo800eva_defconfig
 F:	arch/arm/configs/bockw_defconfig
 F:	arch/arm/configs/kzm9g_defconfig
arch/arm/boot/dts/Makefile +0 -1
index 30a9579a4572f22b..65c13eb3f7de28e1 100644
@@ -464,7 +464,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
 	s5pv210-smdkv210.dtb \
 	s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
-	r8a73a4-ape6evm.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
arch/arm/configs/ape6evm_defconfig deleted +0 -109

109 lines not on this page · raw message

arch/arm/mach-shmobile/Kconfig +0 -13
index a1a7919c72bb1bd8..0cbe84a7cd68c45f 100644
@@ -107,13 +107,6 @@ config ARCH_SH73A0
 	select SH_INTC
 	select RENESAS_INTC_IRQPIN
 
-config ARCH_R8A73A4
-	bool "R-Mobile APE6 (R8A73A40)"
-	select ARCH_RMOBILE
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select ARM_GIC
-	select RENESAS_IRQC
-
 config ARCH_R8A7740
 	bool "R-Mobile A1 (R8A77400)"
 	select ARCH_RMOBILE
@@ -135,12 +128,6 @@ config ARCH_R8A7779
 
 comment "Renesas ARM SoCs Board Type"
 
-config MACH_APE6EVM
-	bool "APE6EVM board"
-	depends on ARCH_R8A73A4
-	select SMSC_PHY if SMSC911X
-	select USE_OF
-
 config MACH_ARMADILLO800EVA
 	bool "Armadillo-800 EVA board"
 	depends on ARCH_R8A7740
arch/arm/mach-shmobile/Makefile +0 -1
index 8ceeac59cfbb5774..94890b62ab8cc514 100644
@@ -53,7 +53,6 @@ obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o
 ifdef CONFIG_ARCH_SHMOBILE_MULTI
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o
 else
-obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
index f9cc8a8f1d6c9256..e1ef19cef89c7f34 100644
@@ -1,6 +1,5 @@
 # per-board load address for uImage
 loadaddr-y	:=
-loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
arch/arm/mach-shmobile/board-ape6evm.c deleted +0 -306

306 lines not on this page · raw message

Signature · 1 line
1.9.1
author maintainer
#6 lore raw

PATCH v4 6/6 ARM: shmobile: ape6evm dts: Drop console= bootargs parameter

In reply to Geert Uytterhoeven

Since ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform"), ape6evm is restricted to booting from DT, so chosen/stdout-path is always used, and we can drop the "console=" parameter from chosen/bootargs.

---
v4:
- New.

---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1
index 44c4cac1820a4dfe..f9e81512201a2ec4 100644
@@ -22,7 +22,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
 		stdout-path = &scifa0;
 	};
 
Signature · 1 line
1.9.1
#7 lore raw

PATCH v4 6/6 ARM: shmobile: ape6evm dts: Drop console= bootargs parameter

Quoted 18 lines · Geert Uytterhoeven

Since ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform"), ape6evm is restricted to booting from DT, so chosen/stdout-path is always used, and we can drop the "console=" parameter from chosen/bootargs.

---
v4:
- New.

---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +0 -0
index 44c4cac1820a4dfe..f9e81512201a2ec4 100644

arch/arm/boot/dts/r8a73a4-ape6evm.dts line 26

Quoted 6 lines
arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1
@@ -22,7 +22,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
 		stdout-path = &scifa0;

I'd strongly recommend that you also pass the configuration explicitly here, so as to avoid nasty surprises. For that you can either use a path or an alias, depending on what the rest of your DT looks like:

	stdout-path = "/path/to/scifa0:115200n8"

	stdout-path = "serial0:115200n8"

Thanks,
Mark.

#8 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

In reply to Geert Uytterhoeven
Quoted 19 lines · Geert Uytterhoeven

Hi Simon, Magnus,

This patch series completes the migration from aep6evm-legacy (legacy board code) and ape6evm-reference (legacy DT based) to ape6evm-multiplatform (ARM multiplatform DT based with common clock framework).

It depends on Simon's branch simple-pm-bus-for-v3.21.

- The first two patches fix Ethernet on ape6evm, by adding a Bus State Controller node, and moving the Ethernet node to it, and thus depends on Simon's branch simple-pm-bus-for-v3.21,
- The third patch moves the pfc node after the irqc nodes, to work around a bug in the core OF proving code,
- The fourth and fifth patch remove all ape6evm-legacy and ape6evm-reference support, now the r8a73a4 generic multiplatform case has the same feature set,
- The sixth patch is new, and removes the now superfluous console= bootargs parameter.

Quoted 1 line

Thanks for applying!

Thanks, done.

With this patch applied I am able to NFS boot the ape6evm using multiplatform using the shmobile_defconfig with CONFIG_MMC disabled.

For reference the boot log for shmobile_defconfig (without CONFIG_MMC disabled) is as follows:

Booting Linux on physical CPU 0x0
Linux version 3.19.0-00014-g507937a (horms at ayumi.isobedori.kobe.vergenet.net) (gcc version 4.6.3 (GCC) ) #725 SMP Thu Feb 19 04:45:03 JST 2015
CPU: ARMv7 Processor [412fc0f3] revision 3 (ARMv7), cr=10c5307d
CPU: PIPT / VIPT nonaliasing data cache, PIPT instruction cache
Machine model: APE6EVM
Ignoring memory block 0x200000000 - 0x240000000
debug: ignoring loglevel setting.
Memory policy: Data cache writealloc
On node 0 totalpages: 262144
free_area_init_node: node 0, pgdat c064fb40, node_mem_map eeff9000
Normal zone: 1520 pages used for memmap
Normal zone: 0 pages reserved
Normal zone: 194560 pages, LIFO batch:31
HighMem zone: 67584 pages, LIFO batch:15
PERCPU: Embedded 7 pages/cpu @eefdf000 s6976 r0 d21696 u32768
pcpu-alloc: s6976 r0 d21696 u32768 alloc=8*4096
pcpu-alloc: [0] 0
Built 1 zonelists in Zone order, mobility grouping on. Total pages: 260624
Kernel command line: ignore_loglevel root=/dev/nfs ip=dhcp rw
PID hash table entries: 4096 (order: 2, 16384 bytes)
Dentry cache hash table entries: 131072 (order: 7, 524288 bytes)
Inode-cache hash table entries: 65536 (order: 6, 262144 bytes)
Memory: 1032816K/1048576K available (4632K kernel code, 317K rwdata, 1212K rodata, 268K init, 191K bss, 15760K reserved, 0K cma-reserved, 270336K highmem) Virtual kernel memory layout:

    vector  : 0xffff0000 - 0xffff1000   (   4 kB)
    fixmap  : 0xffc00000 - 0xfff00000   (3072 kB)
    vmalloc : 0xf0000000 - 0xff000000   ( 240 MB)
    lowmem  : 0xc0000000 - 0xef800000   ( 760 MB)
    pkmap   : 0xbfe00000 - 0xc0000000   (   2 MB)
      .text : 0xc0008000 - 0xc05be024   (5849 kB)
      .init : 0xc05bf000 - 0xc0602000   ( 268 kB)
      .data : 0xc0602000 - 0xc0651460   ( 318 kB)
       .bss : 0xc0651460 - 0xc06811bc   ( 192 kB)

Hierarchical RCU implementation.
RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=1.
RCU: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=1
NR_IRQS:16 nr_irqs:16 16
Architected cp15 timer(s) running at 13.00MHz (virt).
sched_clock: 56 bits at 13MHz, resolution 76ns, wraps every 2643056803840ns
Switching to timer-based delay loop, resolution 76ns
Console: colour dummy device 80x30
console [tty0] enabled
Calibrating delay loop (skipped), value calculated using timer frequency.. 26.00 BogoMIPS (lpj=130000)
pid_max: default: 32768 minimum: 301
Mount-cache hash table entries: 2048 (order: 1, 8192 bytes)
Mountpoint-cache hash table entries: 2048 (order: 1, 8192 bytes)
CPU: Testing write buffer coherency: ok
CPU0: update cpu_capacity 1024
CPU0: thread -1, cpu 0, socket 0, mpidr 80000000
Setting up static identity map for 0x4048c270 - 0x4048c2c8
Brought up 1 CPUs
SMP: Total of 1 processors activated (26.00 BogoMIPS).
CPU: All CPU(s) started in SVC mode.
devtmpfs: initialized
VFP support v0.3: implementor 41 architecture 4 part 30 variant f rev 0
pinctrl core: initialized pinctrl subsystem
NET: Registered protocol family 16
DMA: preallocated 256 KiB pool for atomic coherent allocations
renesas_irqc e61c0000.interrupt-controller: driving 32 irqs
renesas_irqc e61c0200.interrupt-controller: driving 26 irqs
sh-pfc e6050000.pfc: r8a73a4_pfc handling gpio 0 -> 329
sh-pfc e6050000.pfc: r8a73a4_pfc support registered
No ATAGs?
hw-breakpoint: found 5 (+1 reserved) breakpoint and 4 watchpoint registers.
hw-breakpoint: maximum watchpoint size is 8 bytes.
vgaarb: loaded
SCSI subsystem initialized
libata version 3.00 loaded.
usbcore: registered new interface driver usbfs
usbcore: registered new interface driver hub
usbcore: registered new device driver usb
max8973: failed to enable
max8973 0-001b: regulator register failed, err -110
max8973: probe of 0-001b failed with error -110
i2c-sh_mobile e60b0000.i2c: I2C adapter 0, bus speed 100000 Hz
media: Linux media interface: v0.10
Linux video capture interface: v2.00
sh_cmt e6130000.timer: ch0: used for clock events
sh_cmt e6130000.timer: ch1: used as clock source
Advanced Linux Sound Architecture Driver Initialized.
Switched to clocksource arch_sys_counter
NET: Registered protocol family 2
TCP established hash table entries: 8192 (order: 3, 32768 bytes)
TCP bind hash table entries: 8192 (order: 4, 65536 bytes)
TCP: Hash tables configured (established 8192 bind 8192)
TCP: reno registered
UDP hash table entries: 512 (order: 2, 16384 bytes)
UDP-Lite hash table entries: 512 (order: 2, 16384 bytes)
NET: Registered protocol family 1
RPC: Registered named UNIX socket transport module.
RPC: Registered udp transport module.
RPC: Registered tcp transport module.
RPC: Registered tcp NFSv4.1 backchannel transport module.
PCI: CLS 0 bytes, default 64
futex hash table entries: 256 (order: 2, 16384 bytes)
NFS: Registering the id_resolver key type
Key type id_resolver registered
Key type id_legacy registered
nfs4filelayout_init: NFSv4 File Layout Driver Registering...
bounce: pool size: 64 pages
Block layer SCSI generic (bsg) driver version 0.4 loaded (major 250)
io scheduler noop registered
io scheduler deadline registered
io scheduler cfq registered (default)
Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
SuperH (H)SCI(F) driver initialized
e6c40000.serial: ttySC0 at MMIO 0xe6c40000 (irq = 139, base_baud = 0) is a scifa
console [ttySC0] enabled
[drm] Initialized drm 1.1.0 20060810
libphy: smsc911x-mdio: probed
smsc911x 8000000.ethernet eth0: attached PHY driver [SMSC LAN8700] (mii_bus:phy_addr=8000000.ethernet:01, irq=-1) smsc911x 8000000.ethernet eth0: MAC Address: 00:08:f7:00:02:4b
ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
ehci-pci: EHCI PCI platform driver
ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
ohci-pci: OHCI PCI platform driver
mousedev: PS/2 mouse device common for all mice
i2c /dev entries driver
rcar_thermal e61f0000.thermal: 3 sensor probed
Driver 'mmcblk' needs updating - please use bus_type methods
sh_mobile_sdhi ee100000.sd: No vqmmc regulator found
sh_mobile_sdhi: probe of ee100000.sd failed with error -22
sh_mobile_sdhi ee120000.sd: No vqmmc regulator found
sh_mobile_sdhi: probe of ee120000.sd failed with error -22
sh_mmcif ee200000.mmc: No vqmmc regulator found
of_dma_request_slave_channel: dma-names property of node '/mmc at ee200000' missing or empty sh_mmcif ee200000.mmc: Chip version 0x0003, clock rate 0MHz
usbcore: registered new interface driver usbhid
usbhid: USB HID core driver
TCP: cubic registered
NET: Registered protocol family 10
sit: IPv6 over IPv4 tunneling driver
NET: Registered protocol family 17
Key type dns_resolver registered
platform cpufreq-dt: Driver cpufreq-dt requests probe deferral
Registering SWP/SWPB emulation handler
platform cpufreq-dt: Driver cpufreq-dt requests probe deferral
input: keyboard as /devices/platform/keyboard/input/input0
drivers/rtc/hctosys.c: unable to open rtc device (rtc0)
platform cpufreq-dt: Driver cpufreq-dt requests probe deferral
smsc911x 8000000.ethernet eth0: SMSC911x/921x identified at 0xf009c000, IRQ: 120
IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready
sh_mmcif ee200000.mmc: Timeout waiting for 1 on CMD0

#9 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

Hi Simon,

Quoted 7 lines · Simon Horman

With this patch applied I am able to NFS boot the ape6evm using multiplatform using the shmobile_defconfig with CONFIG_MMC disabled.

For reference the boot log for shmobile_defconfig (without CONFIG_MMC disabled) is as follows:

sh_mmcif ee200000.mmc: Timeout waiting for 1 on CMD0

I hadn't really planned to do a renesas-drivers release today, but as I can reproduce the hang with renesas-devel-20150218-v3.19, but not with my local tree, I made a release.

Shmobile-defconfig from renesas-drivers-2015-02-19-v3.19 boots fine on my ape6evm. It seems there are still +100 mmc commits in -next that are not yet in upstream.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#10 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

Quoted 11 lines · Geert Uytterhoeven

Hi Simon,

Quoted 7 lines · Simon Horman

With this patch applied I am able to NFS boot the ape6evm using multiplatform using the shmobile_defconfig with CONFIG_MMC disabled.

For reference the boot log for shmobile_defconfig (without CONFIG_MMC disabled) is as follows:

sh_mmcif ee200000.mmc: Timeout waiting for 1 on CMD0

Quoted 7 lines

I hadn't really planned to do a renesas-drivers release today, but as I can reproduce the hang with renesas-devel-20150218-v3.19, but not with my local tree, I made a release.

Shmobile-defconfig from renesas-drivers-2015-02-19-v3.19 boots fine on my ape6evm. It seems there are still +100 mmc commits in -next that are not yet in upstream.

Thanks, that is good to know.
It seems we may eventually get a working system in mainline :)

#11 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

In reply to Geert Uytterhoeven
Quoted 9 lines · Geert Uytterhoeven
Quoted 7 lines · Simon Horman

With this patch applied I am able to NFS boot the ape6evm using multiplatform using the shmobile_defconfig with CONFIG_MMC disabled.

For reference the boot log for shmobile_defconfig (without CONFIG_MMC disabled) is as follows:

sh_mmcif ee200000.mmc: Timeout waiting for 1 on CMD0

Quoted 7 lines

I hadn't really planned to do a renesas-drivers release today, but as I can reproduce the hang with renesas-devel-20150218-v3.19, but not with my local tree, I made a release.

Shmobile-defconfig from renesas-drivers-2015-02-19-v3.19 boots fine on my ape6evm. It seems there are still +100 mmc commits in -next that are not yet in upstream.

Correction: they are upstream. They're just not yet in renesas-devel. Better luck on Monday, after -rc1 ;-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#12 lore raw

v4 cover ARM: shmobile: r8a73a4/ape6evm: Complete multiplatform support

Quoted 15 lines · Geert Uytterhoeven
Quoted 13 lines · Geert Uytterhoeven
Quoted 7 lines · Simon Horman

With this patch applied I am able to NFS boot the ape6evm using multiplatform using the shmobile_defconfig with CONFIG_MMC disabled.

For reference the boot log for shmobile_defconfig (without CONFIG_MMC disabled) is as follows:

sh_mmcif ee200000.mmc: Timeout waiting for 1 on CMD0

I hadn't really planned to do a renesas-drivers release today, but as I can reproduce the hang with renesas-devel-20150218-v3.19, but not with my local tree, I made a release.

Quoted 6 lines
Quoted 3 lines

Shmobile-defconfig from renesas-drivers-2015-02-19-v3.19 boots fine on my ape6evm. It seems there are still +100 mmc commits in -next that are not yet in upstream.

Correction: they are upstream. They're just not yet in renesas-devel. Better luck on Monday, after -rc1 ;-)

Nice :)