ARM: shmobile: dts: Update console parameters
Subsystems (2)
cover ARM: shmobile: dts: Update console parameters
Hi Simon, Magnus,
This patch series updates the console parameters in the DTSes for various Renesas ARM boards.
- For all of them, the serial port config is added to chosen/stdout-path, as per current best practices,
- On some boards (armadillo, bockw, kzm9d, kzm9g), "console=" parameters are removed from the kernel command lines, as they're no longer needed for DT-only platforms,
- On some boards (genmai, kzm9g), the console alias is changed to "serial0", for consistency with other boards (the first serial port is always called "serial0", unless labeled otherwise); this does mean the device changes its name to /dev/ttySC0 in userspace, which also happened on R-Car Gen2 before,
- On kzm9d, a console alias is added.
Tested on r8a73a4/ape6evm, r8a7740/armadillo, r8a7778/bockw, r8a7779/marzen, r8a7791/koelsch, and sh73a0/kzm9g.
Thanks for applying!
Geert Uytterhoeven (13):
ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
ARM: shmobile: ape6evm dts: Add serial port config to
chosen/stdout-path
ARM: shmobile: armadillo800eva dts: Update console parameters
ARM: shmobile: bockw dts: Update console parameters
ARM: shmobile: genmai dts: Update console parameters
ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
ARM: shmobile: koelsch dts: Add serial port config to
chosen/stdout-path
ARM: shmobile: kzm9d dts: Update console parameters
ARM: shmobile: kzm9g dts: Update console parameters
ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
ARM: shmobile: marzen dts: Add serial port config to
chosen/stdout-path
ARM: shmobile: porter dts: Add serial port config to
chosen/stdout-path
ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++++-- arch/arm/boot/dts/r7s72100-genmai.dts | 4 ++-- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 8 ++++---- arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++-- arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- arch/arm/boot/dts/r8a7790-lager.dts | 2 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- arch/arm/boot/dts/r8a7791-porter.dts | 2 +- arch/arm/boot/dts/r8a7793-gose.dts | 2 +- arch/arm/boot/dts/r8a7794-alt.dts | 2 +- arch/arm/boot/dts/r8a7794-silk.dts | 2 +- arch/arm/boot/dts/sh73a0-kzm9g.dts | 8 ++++---- 13 files changed, 26 insertions(+), 22 deletions(-)
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 TorvaldsPATCH 1/13 ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
--- arch/arm/boot/dts/r8a7794-alt.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7794-alt.dts +1 -1
@@ -21,7 +21,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 2/13 ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1
@@ -23,7 +23,7 @@ chosen { bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw"; - stdout-path = &scifa0; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 3/13 ARM: shmobile: armadillo800eva dts: Update console parameters
In reply to Geert UytterhoevenChange the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Drop the "console=" parameters from the kernel command line, as they're no longer needed for DT-based platforms.
Add the serial port config to chosen/stdout-path.
--- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +4 -4
@@ -20,12 +20,12 @@ compatible = "renesas,armadillo800eva", "renesas,r8a7740"; aliases { - serial1 = &scifa1; + serial0 = &scifa1; }; chosen { - bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; - stdout-path = &scifa1; + bootargs = "earlyprintk ignore_loglevel root=/dev/nfs ip=dhcp rw"; + stdout-path = "serial0:115200n8"; }; memory {
@@ -232,7 +232,7 @@ renesas,function = "gether"; }; - scifa1_pins: serial1 { + scifa1_pins: serial0 { renesas,groups = "scifa1_data"; renesas,function = "scifa1"; };
Signature · 1 line
1.9.1
PATCH 4/13 ARM: shmobile: bockw dts: Update console parameters
In reply to Geert UytterhoevenDrop the "console=" parameter from the kernel command line, as it's no longer needed for DT-based platforms.
Add serial port config to chosen/stdout-path.
--- arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/r8a7778-bockw.dts +2 -2
@@ -28,8 +28,8 @@ }; chosen { - bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw"; - stdout-path = &scif0; + bootargs = "ignore_loglevel ip=dhcp root=/dev/nfs rw"; + stdout-path = "serial0:115200n8"; }; memory {
Signature · 1 line
1.9.1
PATCH 5/13 ARM: shmobile: genmai dts: Update console parameters
In reply to Geert UytterhoevenChange the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Add serial port config to chosen/stdout-path.
--- arch/arm/boot/dts/r7s72100-genmai.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/r7s72100-genmai.dts +2 -2
@@ -17,12 +17,12 @@ compatible = "renesas,genmai", "renesas,r7s72100"; aliases { - serial2 = &scif2; + serial0 = &scif2; }; chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory {
Signature · 1 line
1.9.1
PATCH 5/13 ARM: shmobile: genmai dts: Update console parameters
Quoted 18 lines · Geert Uytterhoeven
Change the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Add serial port config to chosen/stdout-path.
Signed-off-by Geert Uytterhoeven <[email protected]>--- arch/arm/boot/dts/r7s72100-genmai.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/r7s72100-genmai.dts +0
-1@@ -17,12 +17,12 @@ compatible = "renesas,genmai", "renesas,r7s72100"; aliases { - serial2 = &scif2;
arch/arm/boot/dts/r7s72100-genmai.dts line 28
Quoted 10 lines
arch/arm/boot/dts/r7s72100-genmai.dts +2
-1+ serial0 = &scif2; }; chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory {
As noted elsewhere the serial2 -> serial0 portion of this patch seems to result in no console.
I am wary about that change as it is user-space visible but I didn't expect it to also have an impact on the kernel console.
In case it helps anyone now or in the future the output with earlyprintk follows.
-- after with early printk --
[ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 4.4.0-rc4-00017-gb298a5a501ed-dirty (horms at ayumi.isobedori.kobe.vergenet.net) (gcc version 4.6.3 (GCC) ) #1213 SMP Thu Dec 10 15:05:11 JST 2015 [ 0.000000] CPU: ARMv7 Processor [413fc090] revision 0 (ARMv7), cr=18c5307d [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache [ 0.000000] Machine model: Genmai [ 0.000000] debug: ignoring loglevel setting. [ 0.000000] bootconsole [earlycon0] enabled [ 0.000000] Memory policy: Data cache writeback [ 0.000000] On node 0 totalpages: 32768 [ 0.000000] free_area_init_node: node 0, pgdat c0829180, node_mem_map c7ef8000 [ 0.000000] Normal zone: 256 pages used for memmap [ 0.000000] Normal zone: 0 pages reserved [ 0.000000] Normal zone: 32768 pages, LIFO batch:7 [ 0.000000] CPU: All CPU(s) started in SVC mode. [ 0.000000] PERCPU: Embedded 10 pages/cpu @c7ee0000 s17984 r0 d22976 u40960 [ 0.000000] pcpu-alloc: s17984 r0 d22976 u40960 alloc=10*4096 [ 0.000000] pcpu-alloc: [0] 0 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 32512 [ 0.000000] Kernel command line: console=ttySC2,115200 root=/dev/nfs rw ip=dhcp ignore_loglevel earlyprintk=sh-sci.2,115200 [ 0.000000] PID hash table entries: 512 (order: -1, 2048 bytes) [ 0.000000] Dentry cache hash table entries: 16384 (order: 4, 65536 bytes) [ 0.000000] Inode-cache hash table entries: 8192 (order: 3, 32768 bytes) [ 0.000000] Memory: 121208K/131072K available (4976K kernel code, 242K rwdata, 1360K rodata, 1744K init, 268K bss, 9864K reserved, 0K cma-reserved, 0K highmem) [ 0.000000] Virtual kernel memory layout: [ 0.000000] vector : 0xffff0000 - 0xffff1000 ( 4 kB) [ 0.000000] fixmap : 0xffc00000 - 0xfff00000 (3072 kB) [ 0.000000] vmalloc : 0xc8800000 - 0xff800000 ( 880 MB) [ 0.000000] lowmem : 0xc0000000 - 0xc8000000 ( 128 MB) [ 0.000000] pkmap : 0xbfe00000 - 0xc0000000 ( 2 MB) [ 0.000000] .text : 0xc0008000 - 0xc063904c (6341 kB) [ 0.000000] .init : 0xc063a000 - 0xc07ee000 (1744 kB) [ 0.000000] .data : 0xc07ee000 - 0xc082aa20 ( 243 kB) [ 0.000000] .bss : 0xc082d000 - 0xc0870354 ( 269 kB) [ 0.000000] Hierarchical RCU implementation. [ 0.000000] Build-time adjustment of leaf fanout to 32. [ 0.000000] RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=1. [ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=32, nr_cpu_ids=1 [ 0.000000] NR_IRQS:16 nr_irqs:16 16 [ 0.000000] clocksource_probe: no matching clocksources found [ 0.000000] sched_clock: 32 bits at 100 Hz, resolution 10000000ns, wraps every 21474836475000000ns [ 0.000000] Console: colour dummy device 80x30 [ 0.000000] Calibrating delay loop (skipped) preset value.. 266.66 BogoMIPS (lpj=1333333) [ 0.000000] pid_max: default: 32768 minimum: 301 [ 0.000000] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.000000] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.000000] CPU: Testing write buffer coherency: ok [ 0.000000] CPU0: thread -1, cpu 0, socket 0, mpidr 80000000 [ 0.000000] Setting up static identity map for 0x8009000 - 0x8009058 [ 0.000000] Brought up 1 CPUs [ 0.000000] SMP: Total of 1 processors activated (266.66 BogoMIPS). [ 0.000000] CPU: All CPU(s) started in SVC mode. [ 0.000000] devtmpfs: initialized [ 0.000000] VFP support v0.3: implementor 41 architecture 3 part 30 variant 9 rev 4 [ 0.000000] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns [ 0.000000] pinctrl core: initialized pinctrl subsystem [ 0.000000] NET: Registered protocol family 16 [ 0.000000] DMA: preallocated 256 KiB pool for atomic coherent allocations [ 0.000000] No ATAGs? [ 0.000000] hw-breakpoint: found 5 (+1 reserved) breakpoint and 1 watchpoint registers. [ 0.000000] hw-breakpoint: maximum watchpoint size is 4 bytes. [ 0.000000] vgaarb: loaded [ 0.000000] SCSI subsystem initialized [ 0.000000] libata version 3.00 loaded. [ 0.000000] usbcore: registered new interface driver usbfs [ 0.000000] usbcore: registered new interface driver hub [ 0.000000] usbcore: registered new device driver usb [ 0.000000] media: Linux media interface: v0.10 [ 0.000000] Linux video capture interface: v2.00 [ 0.000000] sh_mtu2 fcff0000.timer: ch0: used for clock events [ 0.000000] sh_mtu2 fcff0000.timer: ch0: used for periodic clock events [ 0.000000] Advanced Linux Sound Architecture Driver Initialized. [ 0.410000] NET: Registered protocol family 2 [ 0.420000] TCP established hash table entries: 1024 (order: 0, 4096 bytes) [ 0.430000] TCP bind hash table entries: 1024 (order: 1, 8192 bytes) [ 0.440000] TCP: Hash tables configured (established 1024 bind 1024) [ 0.440000] UDP hash table entries: 256 (order: 1, 8192 bytes) [ 0.450000] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes) [ 0.460000] NET: Registered protocol family 1 [ 0.470000] RPC: Registered named UNIX socket transport module. [ 0.480000] RPC: Registered udp transport module. [ 0.480000] RPC: Registered tcp transport module. [ 0.490000] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 0.500000] PCI: CLS 0 bytes, default 64 [ 1.310000] futex hash table entries: 256 (order: 2, 16384 bytes) [ 1.350000] NFS: Registering the id_resolver key type [ 1.360000] Key type id_resolver registered [ 1.360000] Key type id_legacy registered [ 1.370000] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 1.370000] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registering... [ 1.410000] jitterentropy: Initialization failed with host not compliant with requirements: 2 [ 1.420000] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 250) [ 1.430000] io scheduler noop registered [ 1.430000] io scheduler deadline registered [ 1.440000] io scheduler cfq registered (default) [ 1.480000] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 1.520000] SuperH (H)SCI(F) driver initialized [ 1.520000] e8008000.serial: ttySC0 at MMIO 0xe8008000 (irq = 17, base_baud = 0) is a scif [ 1.550000] [drm] Initialized drm 1.1.0 20060810 [ 1.570000] renesas_spi e800e800.spi: dma_request_slave_channel_compat failed [ 1.580000] renesas_spi e800e800.spi: DMA not available, using PIO [ 1.610000] renesas_spi e800e800.spi: probed [ 1.620000] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 1.630000] ehci-pci: EHCI PCI platform driver [ 1.640000] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver [ 1.640000] ohci-pci: OHCI PCI platform driver [ 1.700000] mousedev: PS/2 mouse device common for all mice [ 1.710000] i2c /dev entries driver [ 1.740000] at24 2-0050: 16384 byte 24c128 EEPROM, writable, 64 bytes/write [ 1.740000] i2c-riic fcfee800.i2c: registered with 400000Hz bus speed [ 1.760000] usbcore: registered new interface driver usbhid [ 1.770000] usbhid: USB HID core driver [ 1.820000] NET: Registered protocol family 10 [ 1.850000] sit: IPv6 over IPv4 tunneling driver [ 1.860000] NET: Registered protocol family 17 [ 1.870000] Key type dns_resolver registered [ 1.880000] cpu cpu0: failed to get cpu0 clock: -2 [ 1.880000] cpufreq-dt: probe of cpufreq-dt failed with error -2 [ 1.890000] Registering SWP/SWPB emulation handler [ 1.920000] bootconsole [earlycon0] disabled
--
PATCH 5/13 ARM: shmobile: genmai dts: Update console parameters
Quoted 36 lines · Simon Horman
Quoted 18 lines · Geert Uytterhoeven
Change the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Add serial port config to chosen/stdout-path.
Signed-off-by Geert Uytterhoeven <[email protected]>--- arch/arm/boot/dts/r7s72100-genmai.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/boot/dts/r7s72100-genmai.dts +0
-1@@ -17,12 +17,12 @@ compatible = "renesas,genmai", "renesas,r7s72100"; aliases { - serial2 = &scif2;arch/arm/boot/dts/r7s72100-genmai.dts line 28
Quoted 10 lines
arch/arm/boot/dts/r7s72100-genmai.dts +2
-1+ serial0 = &scif2; }; chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory {As noted elsewhere the serial2 -> serial0 portion of this patch seems to result in no console.
I am wary about that change as it is user-space visible but I didn't expect it to also have an impact on the kernel console.
Quoted 6 lines
In case it helps anyone now or in the future the output with earlyprintk follows.
-- after with early printk --
[ 0.000000] Kernel command line: console=ttySC2,115200 root=/dev/nfs rw ip=dhcp ignore_loglevel earlyprintk=sh-sci.2,115200
Got you! Stale "bootargs" environment variable overriding the console.
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
PATCH 6/13 ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7793-gose.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7793-gose.dts +1 -1
@@ -24,7 +24,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif0; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 7/13 ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7791-koelsch.dts +1 -1
@@ -54,7 +54,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif0; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 8/13 ARM: shmobile: kzm9d dts: Update console parameters
In reply to Geert UytterhoevenAdd a "serial1" alias for the serial console (it's labeled "uart1"). Drop the "console=" parameter from the kernel command line, as it's no longer needed for DT-based platforms.
Add the serial port config to chosen/stdout-path.
--- arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/emev2-kzm9d.dts +6 -2
@@ -23,9 +23,13 @@ reg = <0x40000000 0x8000000>; }; + aliases { + serial1 = &uart1; + }; + chosen { - bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; - stdout-path = &uart1; + bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp"; + stdout-path = "serial1:115200n8"; }; gpio_keys {
Signature · 1 line
1.9.1
PATCH 9/13 ARM: shmobile: kzm9g dts: Update console parameters
In reply to Geert UytterhoevenChange the console alias to "serial0", for consistency with other boards (the first unlabeled serial port is always called "serial0"). Drop the "console=" parameters from the kernel command line, as they're no longer needed for DT-based platforms.
Add the serial port config to chosen/stdout-path.
--- arch/arm/boot/dts/sh73a0-kzm9g.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sh73a0-kzm9g.dts +4 -4
@@ -22,7 +22,7 @@ compatible = "renesas,kzm9g", "renesas,sh73a0"; aliases { - serial4 = &scifa4; + serial0 = &scifa4; }; cpus {
@@ -39,8 +39,8 @@ }; chosen { - bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel rw"; - stdout-path = &scifa4; + bootargs = "root=/dev/nfs ip=dhcp ignore_loglevel rw"; + stdout-path = "serial0:115200n8"; }; memory {
@@ -345,7 +345,7 @@ }; }; - scifa4_pins: serial4 { + scifa4_pins: serial0 { renesas,groups = "scifa4_data", "scifa4_ctrl"; renesas,function = "scifa4"; };
Signature · 1 line
1.9.1
PATCH 10/13 ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7790-lager.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7790-lager.dts +1 -1
@@ -53,7 +53,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif0; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 11/13 ARM: shmobile: marzen dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7779-marzen.dts +1 -1
@@ -25,7 +25,7 @@ chosen { bootargs = "ignore_loglevel root=/dev/nfs ip=on"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory {
Signature · 1 line
1.9.1
PATCH 12/13 ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7791-porter.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7791-porter.dts +1 -1
@@ -22,7 +22,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif0; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
PATCH 13/13 ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
In reply to Geert Uytterhoeven--- arch/arm/boot/dts/r8a7794-silk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7794-silk.dts +1 -1
@@ -24,7 +24,7 @@ chosen { bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; - stdout-path = &scif2; + stdout-path = "serial0:115200n8"; }; memory at 40000000 {
Signature · 1 line
1.9.1
cover ARM: shmobile: dts: Update console parameters
In reply to Geert UytterhoevenQuoted 20 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series updates the console parameters in the DTSes for various Renesas ARM boards.
- For all of them, the serial port config is added to chosen/stdout-path, as per current best practices,
- On some boards (armadillo, bockw, kzm9d, kzm9g), "console=" parameters are removed from the kernel command lines, as they're no longer needed for DT-only platforms,
- On some boards (genmai, kzm9g), the console alias is changed to "serial0", for consistency with other boards (the first serial port is always called "serial0", unless labeled otherwise); this does mean the device changes its name to/dev/ttySC0in userspace, which also happened on R-Car Gen2 before,
- On kzm9d, a console alias is added.Tested on r8a73a4/ape6evm, r8a7740/armadillo, r8a7778/bockw, r8a7779/marzen, r8a7791/koelsch, and sh73a0/kzm9g.
Quoted 6 lines
Thanks for applying!
Geert Uytterhoeven (13):
ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
ARM: shmobile: ape6evm dts: Add serial port config to
chosen/stdout-path
alt and ape6evm tested ok.
I have queued up the changes for those boards.
Quoted 1 line
ARM: shmobile: armadillo800eva dts: Update console parameters
I would prefer not to take the serial1 -> serial0 portion of this change at this time as it causes a user-space visible change: the console moves from ttySC1 to ttySC0. I noticed this because I no longer made it all the way to user-space which was expecting a console on ttySC1.
-- start before --
[ 0.050000] e6c50000.serial: ttySC1 at MMIO 0xe6c50000 (irq = 25, base_baud = 0) is a scifa [ 0.780000] console [ttySC1] enabled
-- end before --
-- start after --
[ 0.050000] e6c50000.serial: ttySC0 at MMIO 0xe6c50000 (irq = 25, base_baud = 0) is a scifa [ 0.780000] console [ttySC0] enabled
-- end after --
Quoted 1 line
ARM: shmobile: bockw dts: Update console parameters
bockw tested ok.
I have queued up the change for that board.
Quoted 1 line
ARM: shmobile: genmai dts: Update console parameters
As per my remarks regarding the armadillo800eva I would prefer not to make the serial2 -> serial0 portion of this change.
As a bonus the serial2 -> serial0 portion of this change seems to prevent console output during boot too. I've posted some debuging using earlyprintk in reply to this patch in case its useful.
Quoted 3 lines
ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
ARM: shmobile: koelsch dts: Add serial port config to
chosen/stdout-path
gose and koelsch tested ok.
I have queued up the change for those boards.
Quoted 1 line
ARM: shmobile: kzm9d dts: Update console parameters
I am wary of the new serial1 alias.
Have you checked to see if there is any user-space visible change as a result of this?
Quoted 1 line
ARM: shmobile: kzm9g dts: Update console parameters
As per my remarks regarding the armadillo800eva I would prefer not to make the serial4 -> serial0 portion of this change.
Quoted 1 line
ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
lager tested ok.
I have queued up the change for this board.
Quoted 2 lines
ARM: shmobile: marzen dts: Add serial port config to
chosen/stdout-path
Changing &scif2 to serial0 creates a user-space visible change:
the console moves from ttySC2 to ttySC0.
I'm unsure how we can update to use the new syntax without encountering this problem.
Quoted 3 lines
ARM: shmobile: porter dts: Add serial port config to
chosen/stdout-path
ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
I'm unable to test porter and silk but they look ok to me. I have queued up the changes for those boards.
cover ARM: shmobile: dts: Update console parameters
Hi Simon,
Quoted 37 lines · Simon Horman
Quoted 18 lines · Geert Uytterhoeven
This patch series updates the console parameters in the DTSes for various Renesas ARM boards.
- For all of them, the serial port config is added to chosen/stdout-path, as per current best practices,
- On some boards (armadillo, bockw, kzm9d, kzm9g), "console=" parameters are removed from the kernel command lines, as they're no longer needed for DT-only platforms,
- On some boards (genmai, kzm9g), the console alias is changed to "serial0", for consistency with other boards (the first serial port is always called "serial0", unless labeled otherwise); this does mean the device changes its name to/dev/ttySC0in userspace, which also happened on R-Car Gen2 before,
- On kzm9d, a console alias is added.Tested on r8a73a4/ape6evm, r8a7740/armadillo, r8a7778/bockw, r8a7779/marzen, r8a7791/koelsch, and sh73a0/kzm9g.
Quoted 6 lines
Thanks for applying!
Geert Uytterhoeven (13):
ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
ARM: shmobile: ape6evm dts: Add serial port config to
chosen/stdout-pathalt and ape6evm tested ok.
I have queued up the changes for those boards.Quoted 1 line
ARM: shmobile: armadillo800eva dts: Update console parameters
I would prefer not to take the serial1 -> serial0 portion of this change at this time as it causes a user-space visible change: the console moves from ttySC1 to ttySC0. I noticed this because I no longer made it all the way to user-space which was expecting a console on ttySC1.
-- start before --
Quoted 8 lines
[ 0.050000] e6c50000.serial: ttySC1 at MMIO 0xe6c50000 (irq = 25, base_baud = 0) is a scifa [ 0.780000] console [ttySC1] enabled-- end before --
-- start after --
[ 0.050000] e6c50000.serial: ttySC0 at MMIO 0xe6c50000 (irq = 25, base_baud = 0) is a scifa [ 0.780000] console [ttySC0] enabled-- end after --
We made a similar change on koelsch, lager, and marzen (cfr. below) before, so I assumed this is OK?
Quoted 5 lines
Quoted 2 lines
ARM: shmobile: marzen dts: Add serial port config to
chosen/stdout-pathChanging &scif2 to serial0 creates a user-space visible change:
the console moves from ttySC2 to ttySC0.
Does it? Serial0 was already pointing to scif2 since Magnus' commit 8025e3ff4ca972a0 ("ARM: shmobile: marzen: Board specific serial port order").
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