Commit Graph

28 Commits

Author SHA1 Message Date
Geert Uytterhoeven
8a481af10e ARM: dts: renesas: Group tuples in regulator-gpio states properties
To improve human readability and enable automatic validation, the tuples
in the "states" properties of device nodes compatible with
"regulator-gpio" should be grouped, as reported by "make dtbs_check":

    $ make dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/regulator/gpio-regulator.yaml
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi0: states:0: Additional items are not allowed (1800000, 0 were unexpected)
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi0: states:0: [3300000, 1, 1800000, 0] is too long
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi1: states:0: Additional items are not allowed (1800000, 0 were unexpected)
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi1: states:0: [3300000, 1, 1800000, 0] is too long
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi2: states:0: Additional items are not allowed (1800000, 0 were unexpected)
    arch/arm/boot/dts/r8a7791-koelsch.dt.yaml: regulator-vccq-sdhi2: states:0: [3300000, 1, 1800000, 0] is too long
    ...

Fix this by grouping the tuples using angle brackets.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191213164115.3697-2-geert+renesas@glider.be
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
2019-12-20 16:36:47 +01:00
Magnus Damm
07d2bf96e0 ARM: dts: renesas: Use ip=on for bootargs
Convert bootargs from ip=dhcp to ip=on

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2019-06-21 09:45:29 +02:00
Magnus Damm
ee8b7420fe ARM: dts: marzen: Add rw to bootargs and use ip=dhcp
Add rw as bootargs parameter and change from ip=on to ip=dhcp to make the
Marzen board bootargs match other boards from Renesas. No need to be special.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2019-04-17 17:47:22 +02:00
Magnus Damm
a070e3dc61 ARM: dts: R-Car Gen1 board comment update
Include R-Car Gen1 product names for Bock-W and Marzen.

The product names are taken from:
Documentation/devicetree/bindings/arm/shmobile.txt

Signed-off-by: Magnus Damm <damm@opensource.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2018-09-28 10:32:36 +02:00
Wolfram Sang
cdbfaf640a ARM: dts: convert to SPDX identifier for Renesas boards
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2018-07-23 13:33:03 +02:00
Magnus Damm
56bac953b1 ARM: dts: marzen: Add SDHI0 VCCQ Regulator
Add support for the on-board voltage regulator hooked up to GPIO3_20
on r8a7779 Marzen. The board schematics describes the regulator as U4
TPS2110A. Input wise, U4 has D0 fixed to ground, D1 tied to GPIO3_20
while IN1 is fixed to 3.3V and IN2 is fixed to 1.8V. OUT goes to the
pull-ups for the data pins of SDHI0.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2018-03-16 17:24:17 +01:00
Geert Uytterhoeven
2f69fd8cb2 ARM: dts: marzen: Drop superfluous status update for frequency override
The scif_clk device node is already enabled in r8a7779.dtsi, so there is
no need to update its status again.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-03-13 10:17:32 +01:00
Geert Uytterhoeven
e8aa6811ca ARM: dts: r8a7779, marzen: Fix sata device status
Device nodes representing I/O devices should be marked disabled in the
SoC-specific DTS, and overridden by board-specific DTSes where needed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-01-17 10:04:06 +01:00
Laurent Pinchart
8698d83dcf ARM: dts: r8a7779: marzen: Configure pinmuxing for the DU0 input clock
DU0 uses an externally provided clock, but the corresponding pin isn't
correctly muxed. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-11-04 10:36:45 +01:00
Geert Uytterhoeven
822337d7ff ARM: dts: marzen: Add serial port config to chosen/stdout-path
Add the serial port config to "chosen/stdout-path", which requires
referring to the port by alias.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-29 14:19:14 +02:00
Geert Uytterhoeven
46344361f5 ARM: dts: marzen: Name serial port pfc subnodes after device names
Name the Pin Function Controller subnodes for SCIF2 and SCIF4 after
their device names, instead of using some arbitrary names that look like
serial port aliases, but differ from the actual 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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-06-14 09:06:14 +09:00
Geert Uytterhoeven
983ee3de2c ARM: dts: marzen: Fix W=1 dtc warnings
Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /fixedregulator@0 has a unit name, but no reg property

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-05-30 09:37:13 +09:00
Simon Horman
8870d1393e ARM: dts: marzen: use generic pinctrl properties
Since 16ccaf5bb5 ("pinctrl: sh-pfc: Accept standard function, pins and
groups properties") renesas pfc drivers accept generic "function", "pins"
and "groups" properties.

This patch updates the marzen device tree to use the generic properties.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
2016-03-28 08:55:41 +09:00
Geert Uytterhoeven
e50b5ac88d ARM: dts: marzen: Enable SCIF_CLK frequency and pins
Add and enable the external crystal for the SCIF_CLK and its pinctrl, to
be used by the Baud Rate Generator for External Clock (BRG) on (H)SCIF.

This increases the range and accuracy of supported baud rates.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-09 19:43:27 +01:00
Magnus Damm
8025e3ff4c ARM: shmobile: marzen: Board specific serial port order
Convert Marzen to use board-specific serial0 and serial1 instead
of the older shared SoC-specific SCIF index.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-09-14 10:16:36 +09:00
Geert Uytterhoeven
f92d9dc7e6 ARM: shmobile: marzen dts: Use generic names for device nodes
lan0 -> ethernet

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-05-11 15:01:28 +09:00
Laurent Pinchart
665d79aa47 ARM: shmobile: marzen: Add DU external pixel clock to DT
Declare the fixed 65MHz pixel clock connected to the DU clock input.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-27 10:00:10 +09:00
Arnd Bergmann
21220a7a32 Renesas ARM Based SoC DT Cleanups for v3.19
* Add chosen/stdout-path to DTS files for shmobile boards
 * Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
   - The corresponding board file has already been removed
 * Sort dts nodes by address
 * Sort SHMOBILE dtbs alphabetically in Makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG0JAAoJENfPZGlqN0++NvoP/1pbn8UA1kfxTpxcQ+GIr9TV
 yUbN50FMwsjeVgIPLn3kfD9PrgwAh7AdSR3oxo/dBF0WR8edhgCFX5WcHGk8yYlf
 9dQXcDpFXPGh7ia5ggh0NNO8wv1Sr95dVqoaI9i9EqEXNVWi2P1yKuzJ2PFYwXqS
 KOqyzBzAlb2dpNnFj6xjtsepGhJwXkwm0X82Vg3FCjVVq3BPzNIUvizpE2GJe3ql
 e5ihwESwOhGL7NapiPcjMpmHpDrp7J/Xrux0jeQFsHTCgCvR09n4JlTY2qIdJlbp
 +Fz8WehIRz2wrd9tngCdmoIGgaQJ6s9iVEOcxTrC1OelfpR3728vPaYihHCP0Ehp
 ewW65U9MRvBDa+EPm0Hb8w9BLThvQJzEQZpHGqzD3+A/FN2B0jNFBafqmv2bHvv8
 WuDy4a3yvjCWAqQ/f8dqWWqUYyXy4FYE2nu2HtYnZJQDPdBVVQ9ZHhMuStKVZjma
 8YYZ87SgF5Ogo0iWWLCaVaJgiy6SkEOAeYT7TORaYQ+1kCSQmDHs5Jc++Kuc3uFT
 n4Y8Wmh67kzabJ2L2NyNgDkf3bK6JKDCo3w+rKARIZESFODw93DlavuGLn62kEng
 TWNl1UL7gsjDT3b5rooPoNXYDfIxgp6aY1rrkxpDInqeDZZbepgaV2u5g6pEjl2K
 q+HNAJqFGezwo4SXnA7Y
 =sqJL
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Pull "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  - The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile

* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9d dts: Add chosen/stdout-path
  ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
  ARM: shmobile: alt dts: Add chosen/stdout-path
  ARM: shmobile: koelsch dts: Add chosen/stdout-path
  ARM: shmobile: henninger dts: Add chosen/stdout-path
  ARM: shmobile: lager dts: Add chosen/stdout-path
  ARM: shmobile: marzen dts: Add chosen/stdout-path
  ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
  ARM: shmobile: genmai dts: Add chosen/stdout-path
  ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  ARM: shmobile: emev2 dtsi: Use generic names for device nodes
  ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a73a4: sort dtsi file by address
  ARM: shmobile: kzm9d: sort dts file by address
  ARM: shmobile: r7s72100: sort dtsi file by address
  ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
  ARM: dts: Sort SHMOBILE dtbs alphabetically

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-20 08:30:24 +01:00
Laurent Pinchart
a7aee3ac43 ARM: shmobile: marzen: Enable DU device in DT
Specify the DU output topology, enable the DU device and configure the
related pins.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-10-30 09:47:11 +09:00
Geert Uytterhoeven
1877a35096 ARM: shmobile: marzen dts: Add chosen/stdout-path
Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=" parameter in chosen/bootargs,
as this DTS is shared between legacy and multi-platform.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-10-24 10:44:09 +09:00
Laurent Pinchart
5ecd7a5185 ARM: shmobile: marzen-reference: Enable TMU0 in device tree
No more device needs to be added from platform code when booting the
reference platform, remove the now empty
r8a7779_add_standard_devices_dt() function completely.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-08-17 09:00:56 +09:00
Simon Horman
08af64097d ARM: shmobile: marzen: Consistently use tabs for indentation
Unify white space usage by consistently using tabs for indentation.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-07-09 10:36:01 +02:00
Simon Horman
6d4abd79c8 ARM: shmobile: marzen: Initialise SCIF devices using DT
Initialise SCIF devices using DT when booting marzen
using multiplatform.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-06-17 19:56:36 +09:00
Simon Horman
33b9966db3 ARM: shmobile: marzen: Remove early_printk from command line
As early printk support is not enabled in the kernel in the
shmobile defconfig it does not make much sense to provide for
it in the default command line.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-06-17 19:56:35 +09:00
Simon Horman
954e42cf54 ARM: shmobile: marzen: Specify external clock frequency in DT
The external crystal frequency is 31.25 on the Marzen board.
Specify it in the device tree.

Based on work for the Lager board by Laurent Pinchart.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-06-17 17:29:24 +09:00
Simon Horman
bedd672409 ARM: shmobile: Sync Marzen DTS with Marzen reference DTS
Copy the device nodes from Marzen reference into the Marzen device tree
file. This will allow us to use a single DTS file regardless of kernel
configuration. In case of legacy C board code the device nodes may or
may not be used, but in the multiplatform case all the DT device nodes
will be used.

Based on a similar change for the Lager board by Laurent Pinchart.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-06-17 17:29:24 +09:00
Laurent Pinchart
31c46cbf5b ARM: shmobile: Use #include in device tree sources
In order to allow usage of the preprocessor in the SoC device tree
sources, switch from /include/ to #include.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:06 +09:00
Simon Horman
d6b51d6b6a ARM: shmobile: marzen: Add r8a7779-marzen.dtb
This is in preparation for converting the marzen board to
use DT_MACHINE_START.

Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-07-30 13:27:56 +09:00