Hi Simon, Magnus,
Currently board DTS files use various naming conventions for the Pin
Function Controller subnodes. This may cause conflicts when enabling
support for more instances later, either directly in board DT files, or
in DT overlays. These conflicts are most likely to happen for devices
that use/require aliases (e.g. "serial1"), or when using generic and
indexless names (e.g. "mmc"). Hence this series changes the names of
(most of) the submodes, to match the corresponding device names, which
are unique on a specific SoC.
I did not change the following node names:
- "sdX", as they always matched the corresponding "sdhiX" name,
- "touchscreen", as there's not much opportunity for conflicts,
- "mmc", for "mmcif_pins" on sh73a0/kzm9g (which has a single mmc
instance),
- "sounda" for fsia_pins on SH-Mobile,
If you think these should be changed too, please let me know.
This series is against renesas-devel-20160606-v4.7-rc2.
Thanks!
Geert Uytterhoeven (19):
ARM: dts: ape6evm: Name serial port pfc subnode after device name
ARM: dts: ape6evm: Name mmc pfc subnode after device name
ARM: dts: armadillo800eva: Name serial port pfc subnode after device
name
ARM: dts: bockw: Name serial port pfc subnode after device name
ARM: dts: marzen: Name serial port pfc subnodes after device names
ARM: dts: lager: Name serial port pfc subnodes after device names
ARM: dts: lager: Name spi pfc subnodes after device names
ARM: dts: lager: Name vin pfc subnode after device name
ARM: dts: koelsch: Name serial port pfc subnodes after device names
ARM: dts: koelsch: Name spi pfc subnodes after device names
ARM: dts: porter: Name serial port pfc subnode after device name
ARM: dts: porter: Name spi pfc subnode after device name
ARM: dts: gose: Name serial port pfc subnodes after device names
ARM: dts: gose: Name spi pfc subnode after device name
ARM: dts: alt: Name serial port pfc subnode after device name
ARM: dts: alt: Name spi pfc subnode after device name
ARM: dts: silk: Name serial port pfc subnode after device name
ARM: dts: silk: Name spi pfc subnode after device name
ARM: dts: kzm9g: Name serial port pfc subnode after device name
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 ++--
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
arch/arm/boot/dts/r8a7779-marzen.dts | 4 ++--
arch/arm/boot/dts/r8a7790-lager.dts | 10 +++++-----
arch/arm/boot/dts/r8a7791-koelsch.dts | 8 ++++----
arch/arm/boot/dts/r8a7791-porter.dts | 4 ++--
arch/arm/boot/dts/r8a7793-gose.dts | 6 +++---
arch/arm/boot/dts/r8a7794-alt.dts | 4 ++--
arch/arm/boot/dts/r8a7794-silk.dts | 4 ++--
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
11 files changed, 25 insertions(+), 25 deletions(-)
--
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Name the Pin Function Controller subnode for SCIFA0 after its device
name, instead of after the serial port alias.
This avoids conflicts when enabling support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnode for SCIF0 after its device
name, instead of after the serial port alias.
This avoids conflicts when enabling support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnode for VIN1 after its device name,
instead of using the generic and indexless "vin".
This avoids conflicts when enabling support for more video inputs later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnodes for SCIF0 and SCIF1 after
their device names, instead of after the serial port aliases.
This avoids conflicts when enabling support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Name the Pin Function Controller subnode for SCIF0 after its device
name, instead of after the serial port alias.
This avoids conflicts when enabling support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791-porter.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnode for QSPI after its device name,
instead of after the spi interface alias.
This avoids conflicts when enabling support for more spi interfaces
later, either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791-porter.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnodes for SCIF0 and SCIF1 after
their device names, instead of after the serial port aliases.
This avoids conflicts when enabling support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7793-gose.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Name the Pin Function Controller subnode for QSPI after its device name,
instead of after the spi interface alias.
This avoids conflicts when enabl support for more spi interfaces later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7794-alt.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnode for QSPI after its device name,
instead of after the spi interface alias.
This avoids conflicts when enabling support for more spi interfaces
later, either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7794-silk.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Name the Pin Function Controller subnode for SCIFA4 after its device
name, instead of after the serial port alias.
This avoids conflicts when adding support for more serial ports later,
either here or in a DT overlay.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Simon Horman <horms@verge.net.au> Date: 2016-06-14 00:13:14
On Fri, Jun 10, 2016 at 03:00:46PM +0200, Geert Uytterhoeven wrote:
Hi Simon, Magnus,
Currently board DTS files use various naming conventions for the Pin
Function Controller subnodes. This may cause conflicts when enabling
support for more instances later, either directly in board DT files, or
in DT overlays. These conflicts are most likely to happen for devices
that use/require aliases (e.g. "serial1"), or when using generic and
indexless names (e.g. "mmc"). Hence this series changes the names of
(most of) the submodes, to match the corresponding device names, which
are unique on a specific SoC.
I did not change the following node names:
- "sdX", as they always matched the corresponding "sdhiX" name,
- "touchscreen", as there's not much opportunity for conflicts,
- "mmc", for "mmcif_pins" on sh73a0/kzm9g (which has a single mmc
instance),
- "sounda" for fsia_pins on SH-Mobile,
If you think these should be changed too, please let me know.
Thanks, I think this looks good, I have queued up this series.
I don't see any pressing need to rename the nodes you mention above
and we can always do so later if the need arises.