03 Aug, 2018
1 commit
-
[ Upstream commit 06a574c7ef69bd0bd26ed08e35967acb76622ab3 ]
Current Sound is using simple-audio-card which can't support HDMI.
To use HDMI sound, we need to use audio-graph-card.
But, one note is that r8a7795 has 2 HDMI ports, but r8a7796 has 1.
Because of this mismatch, supporting HDMI on salvator-common is
impossible.
Thus, this patch exchange sound card to audio-graph-card and keep
supporting ak4613 as 1st sound node.
r8a7795/r8a7796 salvator-x{s} need to add HDMI sound individually.Signed-off-by: Kuninori Morimoto
Tested-by: Nguyen Viet Dung
Signed-off-by: Simon Horman
Signed-off-by: Sasha Levin
Signed-off-by: Greg Kroah-Hartman
19 Mar, 2018
1 commit
-
[ Upstream commit f5bbcd533a9d1af97b8a0862a421bb8455f1bf6d ]
Describe the GPIO used to reset the Ethernet PHY for EthernetAVB.
This allows the driver to reset the PHY during probe and after system
resume.This fixes Ethernet operation after resume from s2ram on Salvator-XS,
where the enable pin of the regulator providing PHY power is connected
to PRESETn, and PSCI powers down the SoC during system suspend.On Salvator-X, the enable pin is always pulled high, but the driver may
still need to reset the PHY if this wasn't done by the bootloader
before.Inspired by patches in the BSP for the individual Salvator-X/XS boards
by Kazuya Mizuguchi.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Simon Horman
Signed-off-by: Sasha Levin
Signed-off-by: Greg Kroah-Hartman
03 Mar, 2018
1 commit
-
[ Upstream commit 7d2901f809c110bd9a261e879d59efe62e3bc758 ]
The present change is a bug fix for AVB link iteratively up/down.
Steps to reproduce:
- start AVB TX stream (Using aplay via MSE),
- disconnect+reconnect the eth cable,
- after a reconnection the eth connection goes iteratively up/down
without user interaction,
- this may heal after some seconds or even stay for minutes.As the documentation specifies, the "renesas,no-ether-link" option
should be used when a board does not provide a proper AVB_LINK signal.
There is no need for this option enabled on RCAR H3/M3 Salvator-X/XS
and ULCB starter kits since the AVB_LINK is correctly handled by HW.Choosing to keep or remove the "renesas,no-ether-link" option will
have impact on the code flow in the following ways:
- keeping this option enabled may lead to unexpected behavior since
the RX & TX are enabled/disabled directly from adjust_link function
without any HW interrogation,
- removing this option, the RX & TX will only be enabled/disabled after
HW interrogation. The HW check is made through the LMON pin in PSR
register which specifies AVB_LINK signal value (0 - at low level;
1 - at high level).In conclusion, the present change is also a safety improvement because
it removes the "renesas,no-ether-link" option leading to a proper way
of detecting the link state based on HW interrogation and not on
software heuristic.Fixes: dc36965a8905 ("arm64: dts: r8a7796: salvator-x: Enable EthernetAVB")
Fixes: 6fa501c549aa ("arm64: dts: r8a7795: enable EthernetAVB on Salvator-X")
Signed-off-by: Bogdan Mirea
Signed-off-by: Vladimir Zapolskiy
Signed-off-by: Simon Horman
Signed-off-by: Sasha Levin
Signed-off-by: Greg Kroah-Hartman
02 Nov, 2017
1 commit
-
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.By default all files without license information are under the default
license of the kernel, which is GPL version 2.Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if
Reviewed-by: Philippe Ombredanne
Reviewed-by: Thomas Gleixner
Signed-off-by: Greg Kroah-Hartman
21 Sep, 2017
1 commit
-
This fixes the warning "pwm-backlight backlight: backlight supply power
not found, using dummy regulator".Fixes: b33be33670217533 ("arm64: dts: salvator-x: Add panel backlight support")
Reported-by: Geert Uytterhoeven
Signed-off-by: Ulrich Hecht
Reviewed-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman
11 Sep, 2017
1 commit
-
Pull ARM/arm64 Devicetree updates from Olof Johansson:
"As usual, device tree updates is the bulk of our material in this
merge window. This time around, 559 patches affecting both 32- and
64-bit platforms.Changes are too many to list individually, but some of the larger
ones:New platform/SoC support:
- Automotive:
+ Renesas R-Car D3 (R8A77995)
+ TI DT76x
+ MediaTek mt2712e
- Communication-oriented:
+ Qualcomm IPQ8074
+ Broadcom Stingray
+ Marvell Armada 8080
- Set top box:
+ Uniphier PXs3Besides some vendor reference boards for the SoC above, there are also
several new boards/machines:- TI AM335x Moxa UC-8100-ME-T open platform
- TI AM57xx Beaglebone X15 Rev C
- Microchip/Atmel sama5d27 SoM1 EK
- Broadcom Raspberry Pi Zero W
- Gemini-based D-Link DIR-685 router
- Freescale i.MX6:
+ Toradex Apalis module + Apalis and Ixora carrier boards
+ Engicam GEAM6UL Starter Kit
- Freescale i.MX53-based Beckhoff CX9020 Embedded PC
- Mediatek mt7623-based BananaPi R2
- Several Allwinner-based single-board computers:
+ Cubietruck plus
+ Bananapi M3, M2M and M64
+ NanoPi A64
+ A64-OLinuXino
+ Pine64
- Rockchip RK3328 Pine64/Rock64 board support
- Rockchip RK3399 boards:
+ RK3399 Sapphire module on Excavator carrier (RK3399 reference design)
+ Theobroma Systems RK3399-Q7 SoM
- ZTE ZX296718 PCBOX Board"* tag 'armsoc-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (559 commits)
ARM: dts: at91: at91sam9g45: add AC97
arm64: dts: marvell: mcbin: enable more networking ports
arm64: dts: marvell: add a reference to the sysctrl syscon in the ppv2 node
arm64: dts: marvell: add TX interrupts for PPv2.2
arm64: dts: uniphier: add PXs3 SoC support
ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
ARM: dts: uniphier: fix size of sdctrl nodes
ARM: dts: uniphier: add AIDET nodes
arm64: dts: uniphier: fix size of sdctrl node
arm64: dts: uniphier: add AIDET nodes
Revert "ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2"
arm64: dts: uniphier: add reset controller node of analog amplifier
arm64: dts: marvell: add Device Tree files for Armada-8KP
arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM
arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM
dt-bindings: add rk3399-q7 SoM
ARM: dts: rockchip: enable usb for rv1108-evb
ARM: dts: rockchip: add usb nodes for rv1108 SoCs
dt-bindings: update grf-binding for rv1108 SoCs
ARM: dts: aspeed-g4: fix AHB window size of the SMC controllers
...
19 Aug, 2017
1 commit
-
…kernel/git/horms/renesas into next/dt64
Pull "Second Round of Renesas ARM64 Based SoC DT Updates for v4.14" from Simon Horman:
* Add PFC device node to R-Car D3 (r8a77995)
This is a step towards enabling devices that use multiplexed pins
- including ethernet - on boards that use the r8a7796 SoC.* Add USB nodes to R-Car M3-W (r8a7796)
This is a step towards enabling USB devices on boards that
use the r8a7796 SoC.* Use newly added Gen-3 fallback compat string
This is consistent with ongoing efforts to use per-generation
fallback strings where appropriate across devices found
on R-Car SoCs. The aim of the effort being to strike a balance
between the limited information available about the compatibility
of devices found on different SoCs and the desire to ease enabling
devices on new SoCs.This has no run-time effect due to the presence of a per-SoC
compat string.* Cleanup whitespace and extra LVDS port label
Minor cleanups, no run-time effect.
* tag 'renesas-arm64-dt2-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: dts: r8a77995: add pfc device node
arm64: dts: r8a7796: Add HSUSB device node
arm64: dts: r8a7796: Add USB-DMAC device nodes
arm64: dts: r8a7796: Add USB3.0 host device node
arm64: dts: r8a7796: add USB2.0 Host (EHCI/OHCI) device nodes
arm64: dts: r8a7796: add usb2_phy device nodes
arm64: dts: r8a7795: correct whitespace of companion property
arm64: dts: r8a7795: Use R-Car SATA Gen3 fallback compat string
arm64: dts: salvator-common: Remove extra LVDS port label
17 Aug, 2017
10 commits
-
Signed-off-by: Yoshihiro Shimoda
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
Fixes: 4dad6dcdae7b ("arm64: dts: renesas: r8a7795: add usb2.0 host ch3 device nodes")
Fixes: 1c422b4c501e ("arm64: dts: renesas: r8a7795: Add usb companion property in EHCI")
Signed-off-by: Simon Horman -
Use newly added R-Car SATA Gen3 fallback compat string
in the DT of the r8a7795 SoC.This should have no run-time effect as the driver matches against
the per-SoC compat string before the fallback compat string is considered.Signed-off-by: Simon Horman
Reviewed-by: Geert Uytterhoeven -
The DU LVDS output is on port 3 on R8A7795 but on port 2 on R8A7796. The
lvds_connector label thus can't be defined in salvator-common.dtsi,
common to the two SoCs.The lvds_connector label is meant for convenience to be referenced from
panel device tree files, such as r8a77xx-aa104xd12-panel.dtsi or
r8a77xx-aa121td01-panel.dtsi. As those files are not included in any
device tree source, and the label never used elsewhere, we can simply
remove it. Out-of-tree patches that include panel device tree files can
then add a#define lvds_connector du_out_lvds0
before including the panel device tree file.
Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
…ernel/git/horms/renesas into next/dt64
Pull "Renesas ARM64 Based SoC DT Updates for v4.14" from Simon Horman:
* Add usb2.0 for R-Car H3 (r8a7795) ES2.0 SoC
* Add R-Car D3 (r8a77995) SoC and Draak board support
Adds minimal support for the R-Car D3 SoC and the Draak development
board, allowing to boot from a ramdisk using a serial console.* Add Add VC6 clock generator to R-Car H3 (r8a7795)/Salvator-XS board
The VC6 is an I2C-controlled programmable clock generator, used on the
board to provide a display dot clock. Add it to DT.* Add missing second pair of DMA names to MSIOF nodes to
R-Car M3-W (r8a7796) SoCMSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of
DMA specifiers. However, the second pair of corresponding DMA names was
missing.* Add support for the DU to R-Car H3 (r8a7795) SoC
Add a compatible string and VSP links to the DU node. The H3 ES1.x and H3
ES2.0 are compatible save for the links to the VSPs that are described
explicitly in DT, so there's no need for a new ES2-specific compatible
string.* Enable HDMI on R-Car H3 (r8a7795) and M3-W (r8a7796) ULCB boards
* Enable DU on R-Car M3-W (r8a7796) Salvator-X board
* Enable I2C for DVFS on R-Car H3 (r8a7795) and M3-W (r8a7796) ULCB boards
* Add Add DRIF support to R-Car H3 (r8a7795) and M3-W (r8a7796) SoCs
Ramesh Shanmugasundaram says, "R-Car Gen3 DRIF is a SPI like receive only
slave device."* Move CPG_AUDIO_CLK_I from board to soc files
Geert Uytterhoeven says, "The definition of CPG_AUDIO_CLK_I is
SoC-specific, not board-specific."* Add IMR-LX4 support to R-Car H3 (r8a7795) and M3-W (r8a7796) SoCs
Sergei Shtylyov says, "The image renderer light extended 4 (IMR-LX4) or
the distortion correction engine is a drawing processor with a simple
instruction system capable of referencing data on an external memory as
2D texture data and performing texture mapping and drawing with respect
to any shape that is split into triangular objects."* tag 'renesas-arm64-dt-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (31 commits)
arm64: dts: renesas: r8a7795: add hsusb ch3 device node
arm64: dts: renesas: r8a7795: add usb-dmac ch2 and ch3 device nodes
arm64: dts: renesas: r8a7795: add usb2.0 host ch3 device nodes
arm64: dts: renesas: r8a7795: add usb2_phy ch3 device node
arm64: dts: renesas: r8a7795: Add usb companion property in EHCI
arm64: dts: renesas: Add Renesas Draak board support
arm64: dts: renesas: Add Renesas R8A77995 SoC support
arm64: renesas: Add Renesas R8A77995 Kconfig support
arm64: dts: r8a7795: salvator-xs: Connect DU dot clocks 0 and 3
arm64: dts: salvator-xs: Add VC6 clock generator
arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes
arm64: dts: r8a7795: Add all MSIOF nodes
arm64: dts: r8a7795: Add support for the DU
arm64: dts: ulcb: Enable HDMI output
arm64: dts: ulcb: Add HDMI output connector
arm64: dts: r8a7796: m3ulcb: Add DU external dot clocks
arm64: dts: r8a7795: h3ulcb: Add DU external dot clocks
arm64: dts: ulcb: Add DU external dot clock sources
arm64: dts: r8a7796: salvator-x: Enable HDMI output
arm64: dts: r8a7796: salvator-x: Add DU external dot clocks
...
07 Aug, 2017
1 commit
-
clock name of "audio_clkout" is used by Renesas sound driver.
This duplicated naming breaks its clock registering/unregistering.
Especially, when unbind/bind it can't handle clkout correctly.
This patch renames "audio_clkout" to "audio-clkout" to avoid
naming conflict.Fixes: 8a8f181d2cfd ("arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B")
Signed-off-by: Kuninori Morimoto
Signed-off-by: Simon Horman
27 Jul, 2017
22 commits
-
This patch adds support for hsusb ch3 device nodes for R-Car H3 ES2.0.
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
This patch adds support for usb-dmac ch2 and ch3 device nodes for
R-Car H3 ES2.0.Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
This patch adds support for usb2.0 host ch3 device nodes for R-Car
H3 ES2.0.Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
This patch adds support for usb3_phy ch3 device node for R-Car H3 ES2.0.
Signed-off-by: Yoshihiro Shimoda
Signed-off-by: Simon Horman -
This patch adds the "companion" property in the EHCI ch0, ch1 and
ch2 nodes to wait for the usb companion controller startup at resume.Signed-off-by: Kazuya Mizuguchi
Signed-off-by: Takeshi Kihara
[remove ch3 node and revise the commit log]
Signed-off-by: Yoshihiro ShimodaSigned-off-by: Simon Horman
-
Basic support for the Renesas Draak board based on R-Car D3:
- Memory,
- Main crystal,
- Serial console,
- Watchdog.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Basic support for the R-Car D3 SoC:
- PSCI,
- CPU,
- Cache controller,
- Main clocks and controller,
- Interrupt controller,
- Timer,
- Watchdog,
- PMU,
- Reset controller,
- Product register,
- System controller,
- UART for console.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The DU dot clocks 0 and 3 are provided by the programmable VC6 clock
generator. Connect them to the clock source node.Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The VC6 is an I2C-controlled programmable clock generator, used on the
board to provide a display dot clock. Add it to DT.Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of
DMA specifiers. However, the second pair of corresponding DMA names was
missing.Fixes: 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes")
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Add the device nodes for all MSIOF SPI controllers, incl. clocks, power
domain, dma, and reset properties.Due to a hardware erratum on R-Car H3 ES1.x, using MSIOF for SPI is only
supported on ES2.0 and later.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Add a compatible string and VSP links to the DU node. The H3 ES1.x and
H3 ES2.0 are compatible save for the links to the VSPs that are
described explicitly in DT, so there's no need for a new ES2-specific
compatible string.Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Enable the HDMI encoder for ULCB board and hook it up to the HDMI connector.
The HDMI encoder and connector are available on both the H3 and M3-W ULCB boards.
Add them to the ulcb.dtsi file.Signed-off-by: Vladimir Barinov
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The ULCB board has one HDMI output connector.
This connector is available on both the H3 and M3-W ULCB boards.
Add this to the ulcb.dtsi file.Signed-off-by: Vladimir Barinov
Reviewed-by: Geert Uytterhoeven
Reviewed-by: Laurent Pinchart
Signed-off-by: Simon Horman -
The DU0/DU1/DU2 external dot clocks are provided by the programmable
Versaclock5 clock generator.Signed-off-by: Vladimir Barinov
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The DU0/DU1/DU2/DU3 external dot clocks are provided by the programmable
Versaclock5 clock generator.Signed-off-by: Vladimir Barinov
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The DU0/DU1/DU2/DU3 external dot clocks are generated by an I2C-controlled
programmable clock generator.Clock generator is available on both the H3 and M3-W ULCB boards.
Add this to the ulcb.dtsi file.Signed-off-by: Vladimir Barinov
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Enable the HDMI encoder for the M3-W Salvator-X board and hook it up to
the HDMI connector.Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The DU1 external dot clock is provided by the fixed frequency clock
generator X21, while the DU0 and DU2 clocks are provided by the
programmable Versaclock5 clock generator.Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Add the HDMI encoder to the R8A7796 DT in disabled state.
Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
Add the DU device to r8a7796.dtsi in a disabled state.
Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman -
The r8a7796 has 5 VSP instances.
Signed-off-by: Laurent Pinchart
Reviewed-by: Geert Uytterhoeven
Signed-off-by: Simon Horman
