Commit Graph

40 Commits

Author SHA1 Message Date
Niklas Söderlund
7d73a4da26 arm64: dts: r8a7795: salvator-x: Set drive-strength for ravb pins
The EthernetAVB should not depend on the bootloader to setup correct
drive-strength values. Values for drive-strength where found by
examining the registers after the bootloader has configured the
registers and successfully used the EthernetAVB.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-03-07 07:51:09 +01:00
Kazuya Mizuguchi
0e45da1c6e arm64: dts: r8a7795: salvator-x: Fix EthernetAVB PHY timing
Set PHY rxc-skew-ps to 1500 and all other values to their default values.

This is intended to to address failures in the case of 1Gbps communication
using the by salvator-x board with the KSZ9031RNX phy. This has been
reported to occur with both the r8a7795 (H3) and r8a7796 (M3-W) SoCs.

Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-03-06 09:54:26 +01:00
Keita Kobayashi
006ced572a arm64: dts: r8a7795: salvator-x: Enable I2C for DVFS device
This patch enables I2C for DVFS device for for Salvator-X board on
R8A7795 SoC.

Signed-off-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
2017-03-06 09:54:26 +01:00
Kuninori Morimoto
ad5805f3aa arm64: dts: r8a7795: add sound MIX support
This patch adds MIX (= Mixer) support.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-01-03 10:41:32 +01:00
Kuninori Morimoto
c9293d784d arm64: dts: r8a7795: add sound CTU support
This patch adds CTU (= Channel Transfer Unit) support which is needed
to sound mixing.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-01-03 10:41:30 +01:00
Yoshihiro Shimoda
0751e1bd1e arm64: dts: r8a7795: salvator-x: add bias setting for usb1_pins
Since this board doesn't mount pull-up/down registers for
USB1_{OVC,PWEN} pins, we should enable bias setting to pull these
pins up/down.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-11-04 10:18:06 +01:00
Wolfram Sang
7c827d1fda arm64: dts: r8a7795: salvator: enable on-board eMMC
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-11-04 10:18:03 +01:00
Laurent Pinchart
ea3c17b03b arm64: dts: r8a7795: salvator-x: Add DU LVDS output endpoint
Declaring the endpoint makes LVDS enablement easier by just including
the corresponding panel's dtsi file.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-10-17 08:18:40 +02:00
Wolfram Sang
2a927eeaf6 arm64: dts: r8a7795: salvator-x: enable UHS for SDHI 0 & 3
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-10-17 08:18:40 +02:00
Laurent Pinchart
272bde0384 arm64: dts: r8a7795: salvator-x: Configure pins for the DU RGB output
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-09-08 09:35:25 +02:00
Laurent Pinchart
aadc4ee00a arm64: dts: r8a7795: renesas: salvator-x: Enable DU
Only the VGA output is supported for now.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-09-06 12:57:11 +02:00
Yoshihiro Shimoda
0b4dca78f0 arm64: dts: r8a7795: salvator-x: enable HSUSB
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-09-06 12:56:55 +02:00
Yoshihiro Shimoda
34ccd788a3 arm64: dts: r8a7795: salvator-x: enable USB 2.0 Host channel 0
We have to set SW15 to pin 2-3 side on the board before we use CN9
as USB host or peripheral.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-09-06 12:56:45 +02:00
Yoshihiro Shimoda
a905b72ce9 arm64: dts: r8a7795: salvator-x: enable usb2_phy of channel 0
This patch also adds a regulator node for USB2.0 to handle VBUS on/off
by the phy-rcar-gen3-usb2 driver.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-09-06 12:56:34 +02:00
Geert Uytterhoeven
4a4e2138d6 arm64: dts: salvator-x: Fix W=1 dtc warnings
Warning (unit_address_vs_reg): Node /regulator@1 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /regulator@2 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /regulator@3 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /regulator@4 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:34:51 +09:00
Wolfram Sang
329260d5c4 arm64: dts: salvator-x: Enable watchdog timer
This patch enables watchdog timer for Salvator-X board.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-05-30 09:34:50 +09:00
Geert Uytterhoeven
3cac478cce arm64: dts: salvator-x: SCIF1 supports RTS/CTS hardware flow control
On the Salvator-X development board, the RTS and CTS pins of debug
serial-1 port SCIF1 are wired to the CP2102 Serial-USB bridge.  Reflect
this in the DTS by adding the "uart-has-rtscts" property to the scif1
device node.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-05-30 09:34:49 +09:00
Arnd Bergmann
bf6fc0a249 Second Round of Renesas ARM64 Based SoC DT Updates for v4.7
* Don't disable referenced optional clocks in DT of r8a7795 SoC
 * Populate EXTALR in DT of salvator-x board
 * Enable PCIe in DT of salvator-x board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXICAoAAoJENfPZGlqN0++nGQP/2q0g8NyPiF3oUa2e0xF7MWf
 DP099+HGRoiI7aYhEOPpF8T1Ib4PsSXRBwv5VMZMjLQ+7k12t0NzKozAleQfT+DA
 PVewJWVIgQLovJjxY3vojr8Rg70IeGF1hwwVSK9q7osNP0ywwokVNjt6fpiMrrKq
 43mVfDHLt6AtIWwDph4D43+mHsBfBlnWiluM9WDtu4x/3iv1P1Pz8fnOU7+clNsW
 2Ij1pDZlsmx6do4du3ijvKb6DKwceluqSXUaoSQTlkrqy+ljwczM64j8AItnVbD5
 xr70cwMG6Em2lUWcXL/rel7+uLIyKoXirRstmIRLz7BKnUEjPb5NVM3kFNCG3I2s
 QAifVsyJpZflw1/VlDnTTXk3iG22wZn+o9UdN0dOIHlj0QE6ui9dBYcLt+ZtRshp
 v07eumPvK8rtwXiW4bBjlILaPmoQtF5RI+/Hb93dJHLLXeDaLHx37ve7SRxmFsrj
 NJv9HtsoPzWrEtyxIDuAUlabhcvd2mzZXMuAPFbKC4vckDdKWy1rVqGkGG1sRf0K
 RJDPjGhskKAg9ryeIg12+4GLmoKQRfPKjXG4ajuNwZvzfYIOI3rEZgIzBNuc6k1h
 U3rWFKZf1sMAs/uwSmabZjp+6Li9p1Lt/gZqagZ3bElJa/VTUQLafPMMm6rzV17d
 Hlx/ZjKAkALLTbzGNQzG
 =i1nn
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm64-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.7" from Simon Horman:

* Don't disable referenced optional clocks in DT of r8a7795 SoC
* Populate EXTALR in DT of salvator-x board
* Enable PCIe in DT of salvator-x board

* tag 'renesas-arm64-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7795: Don't disable referenced optional clocks
  arm64: dts: salvator-x: populate EXTALR
  arm64: dts: r8a7795: enable PCIe on Salvator-X
  arm64: dts: r8a7795: Add PCIe nodes
  arm64: dts: r8a7795: Use USB3.0 fallback compatibility string
  arm64: dts: r8a7795: Add CAN support
  arm64: dts: r8a7795: Add CAN external clock support
2016-04-28 16:11:54 +02:00
Geert Uytterhoeven
9f33a8a9e1 arm64: dts: r8a7795: Don't disable referenced optional clocks
clk_get() on a disabled clock node will return -EPROBE_DEFER, which can
cause drivers to be deferred forever if such clocks are referenced in
their devices' clocks properties.

Update the various disabled external clock nodes to default to a
frequency of 0, but don't disable them, to prevent this.

Reported-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-27 11:48:34 +10:00
Wolfram Sang
de5a79f125 arm64: dts: salvator-x: populate EXTALR
It can be used for the watchdog.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-27 11:48:34 +10:00
Phil Edworthy
bbd273047b arm64: dts: r8a7795: enable PCIe on Salvator-X
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-27 11:48:33 +10:00
Simon Horman
fa3d2aede8 arm64: dts: salvator-x: 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 kzm9g 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:50:52 +09:00
Yoshihiro Shimoda
474efcae3b arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2
We should set SW15 to pin 2-3 side on the board before we use CN9
as USB host or peripheral.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-26 08:55:32 +09:00
Yoshihiro Shimoda
e24250c008 arm64: dts: salvator-x: enable usb2_phy of channel 1 and 2
This board has a MAX3355 chip. However, we cannot use the extcon/max3355
driver because the ID pin doesn't connect to a gpio pin (in other words,
it connects to the SoC specific pin).
And, the phy-rcar-gen3-usb2 driver cannot handle such a chip for now.
So, this patch enables usb2_phy of channel 1 and 2.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-26 08:55:32 +09:00
Ai Kyuse
1c0e7b9a00 arm64: dts: r8a7795: salvator-x: enable SDHI0 & 3
Add the exposed SD card slots. The on-board eMMC needs to wait until we
fixed the 8bit support.

Signed-off-by: Ai Kyuse <ai.kyuse.uw@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-26 08:55:29 +09:00
Geert Uytterhoeven
a3fc85e27b arm64: dts: salvator-x: 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:
  - SCIF:
      - Supports now 50, 230400, 460800, 500000, and 921600 bps,
      - Perfect match for standard 50-460800, and 9216000 bps.
  - HSCIF:
      - Supports now 50, 75, and 110 bps,
      - Perfect match for standard 50-460800, and 9216000 bps.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-03 10:04:33 +01:00
Yoshihiro Shimoda
856ea9eddb arm64: dts: salvator-x: enable usb3.0 host channel 0
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-02-02 10:48:56 +01:00
Kouei Abe
52ee9fb34a arm64: dts: salvator-x: Enable SATA controller
This enables SATA device in r8a7795-salvator-x.dts.

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-18 10:07:29 +09:00
Kuninori Morimoto
8a8f181d2c arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B
CS2000 needs AUDIO_CLKOUT as master clock which is generated
by Renesas sound, and Renesas sound needs CS2000 as ADUIO_CLK_B.
Because of this relationship, it will be dead-lock when driver probe.

cs2000: clk_multiplier@4f {
        ...
        clocks = <&rcar_sound 0>, <&x12_clk>;
        ...
};

&rcar_sound {
        ...
        assigned-clocks = <&cs2000>;
        ...
};

This patch is using dummy audio_clkout to avoid this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-01 15:32:06 +09:00
Kuninori Morimoto
40fbe14b54 arm64: renesas: salvator-x: set ak4613 In/Out pin as single-end
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-30 09:36:35 +09:00
Kuninori Morimoto
672b79312c arm64: renesas: salvator-x: Sound DVC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-26 11:31:43 +09:00
Kuninori Morimoto
f7df91f5f2 arm64: renesas: salvator-x: Sound SRC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-26 11:31:43 +09:00
Kuninori Morimoto
b1d11d6743 arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
DMA transfer to/from SSIU

     DMA
[MEM] -> [SSIU] -> [SSI]

     DMA
[MEM] <- [SSIU] <- [SSI]

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-26 11:31:43 +09:00
Kuninori Morimoto
d70726f428 arm64: renesas: salvator-x: Sound SSI DMA support
DMA transfer to/from SSI

     DMA
[MEM] -> [SSI]

     DMA
[MEM] <- [SSI]

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-26 11:31:43 +09:00
Kuninori Morimoto
994aadf019 arm64: renesas: salvator-x: Sound SSI PIO support
This patch adds PIO sound support for Salvator-X board.
It can use 44.1kHz base sound only at this point, since 48kHz base
sound needs CS2000, but it is not yet upstreamed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-26 11:31:42 +09:00
Kuninori Morimoto
637d801e0b arm64: renesas: salvator-x: enable I2C
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
2015-11-20 09:57:02 -08:00
Geert Uytterhoeven
10ca6db79a arm64: renesas: salvator-x: Setup ethernet0 alias for U-Boot
Add an ethernet0 alias for the wired network card so that U-Boot can
find the device-node and add an appropriate "local-mac-address"
property.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-20 09:45:03 -08:00
Simon Horman
b2407c566b arm64: dts: r8a7795: enable nfs root on Salvator-X board
As has been the practice for boards for 32bit ARM Renesas SoCs

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
2015-11-20 09:44:30 -08:00
Kazuya Mizuguchi
6fa501c549 arm64: dts: r8a7795: enable EthernetAVB on Salvator-X
Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-20 09:43:06 -08:00
Kuninori Morimoto
1950fab078 arm64: renesas: add Salvator-X board support
Add initial board support for r8a7795 Salvator-X. At this point
only DEBUG0 and DEBUG1 serial ports are supported.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-11-17 02:54:53 +09:00