Second Round of Renesas ARM Based SoC DT Updates for v4.13
Cleanup: * Correct PCI bus dtc warnings for r8a779x SoCs Enhancements: * Add support for iWave G20D-Q7 board based on RZ/G1M SoC * Add support for GR-Peach board based on r7s72100 SoC * Add composite video and HDMI input to gose board -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZQ9eZAAoJENfPZGlqN0++m0sQAJ6eIa0UylzP2mamuO6qqsiz np/zUggVGQhPeIqiT0sd8vE4h2vFkB+lsKXwIuWIdqm6ehIR+vOPsurmO92d9sSF IR6VlB0oHOj+e02JLT9UctsljLEieFqWtOoeOlgwC0ybxE1aAwfD3GVk+YMEr/uv 0TTAKAypW2Vz97IEARmvPb760LleaoxMX+DQr+l23Adc7r+mV8LMsloxK9iF0Xlx UTW4nmKcPfxdkrGRLUzavA6nO6VX16EbIK5AIaVtmhjVFFoXk3Iawg796a9ay6DC f/1gARF4Dzz/NRfTNFb1YJSJtcyYQsJrG4QS3OmgmX5LUqGOlW7zZGf0r468bfJW H084JaWO7MdH0mURHYOP9jW4ahrIjPfL15HO5USI4FcrUeKhhVEOzBugWGOMy9++ 7aIx+veUPHtdFOm/Fbm0WxZe5FVTf8xx8qPfiH8Witldm6hjTxAVbqmUYOgal9Md hBlZ1MA4UxVduOVW7ITO78k15QNg4/gyHNyhEOQVXeQVRVRlYdkPUlJDyNgp1Jjb XYpG0OJvXGffoefr6zQMUQMTMhEYUTifOknTST7cF7PsFfKwfuk6A4F12LE8XVVN etlG/OhxE5F3+PqovYOctSDwYH56d6jBmxYeE6RT60KG16LsSAoqxg3kSnSWCMjx Zp70DNr9Tkgi6T27YrmI =zBWR -----END PGP SIGNATURE----- Merge tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.13 Cleanup: * Correct PCI bus dtc warnings for r8a779x SoCs Enhancements: * Add support for iWave G20D-Q7 board based on RZ/G1M SoC * Add support for GR-Peach board based on r7s72100 SoC * Add composite video and HDMI input to gose board * tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r8a779x: Fix PCI bus dtc warnings ARM: dts: iwg20d-q7: Add support for iWave G20D-Q7 board based on RZ/G1M ARM: dts: iwg20m: Add iWave RZG1M Qseven SOM ARM: dts: gose: add composite video input ARM: dts: r7s72100: Add support for GR-Peach ARM: dts: gose: add HDMI input Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
878e917315
|
@ -55,6 +55,8 @@ Boards:
|
|||
compatible = "renesas,bockw", "renesas,r8a7778"
|
||||
- Genmai (RTK772100BC00000BR)
|
||||
compatible = "renesas,genmai", "renesas,r7s72100"
|
||||
- GR-Peach (X28A-M01-E/F)
|
||||
compatible = "renesas,gr-peach", "renesas,r7s72100"
|
||||
- Gose (RTP0RC7793SEB00010S)
|
||||
compatible = "renesas,gose", "renesas,r8a7793"
|
||||
- H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)
|
||||
|
|
|
@ -704,9 +704,11 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
|
|||
dtb-$(CONFIG_ARCH_RENESAS) += \
|
||||
emev2-kzm9d.dtb \
|
||||
r7s72100-genmai.dtb \
|
||||
r7s72100-gr-peach.dtb \
|
||||
r7s72100-rskrza1.dtb \
|
||||
r8a73a4-ape6evm.dtb \
|
||||
r8a7740-armadillo800eva.dtb \
|
||||
r8a7743-iwg20d-q7.dtb \
|
||||
r8a7743-sk-rzg1m.dtb \
|
||||
r8a7745-sk-rzg1e.dtb \
|
||||
r8a7778-bockw.dtb \
|
||||
|
|
66
arch/arm/boot/dts/r7s72100-gr-peach.dts
Normal file
66
arch/arm/boot/dts/r7s72100-gr-peach.dts
Normal file
|
@ -0,0 +1,66 @@
|
|||
/*
|
||||
* Device Tree Source for the GR-Peach board
|
||||
*
|
||||
* Copyright (C) 2017 Jacopo Mondi <jacopo+renesas@jmondi.org>
|
||||
* Copyright (C) 2016 Renesas Electronics
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public License
|
||||
* version 2. This program is licensed "as is" without any warranty of any
|
||||
* kind, whether express or implied.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "r7s72100.dtsi"
|
||||
|
||||
/ {
|
||||
model = "GR-Peach";
|
||||
compatible = "renesas,gr-peach", "renesas,r7s72100";
|
||||
|
||||
aliases {
|
||||
serial0 = &scif2;
|
||||
};
|
||||
|
||||
chosen {
|
||||
bootargs = "ignore_loglevel rw root=/dev/mtdblock0";
|
||||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
|
||||
memory@20000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x20000000 0x00a00000>;
|
||||
|
||||
};
|
||||
|
||||
lbsc {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
};
|
||||
|
||||
flash@18000000 {
|
||||
compatible = "mtd-rom";
|
||||
probe-type = "map_rom";
|
||||
reg = <0x18000000 0x00800000>;
|
||||
bank-width = <4>;
|
||||
device-width = <1>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
rootfs@600000 {
|
||||
label = "rootfs";
|
||||
reg = <0x00600000 0x00200000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&extal_clk {
|
||||
clock-frequency = <13333000>;
|
||||
};
|
||||
|
||||
&usb_x1_clk {
|
||||
clock-frequency = <48000000>;
|
||||
};
|
||||
|
||||
&scif2 {
|
||||
status = "okay";
|
||||
};
|
25
arch/arm/boot/dts/r8a7743-iwg20d-q7.dts
Normal file
25
arch/arm/boot/dts/r8a7743-iwg20d-q7.dts
Normal file
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Device Tree Source for the iWave-RZG1M Qseven carrier board
|
||||
*
|
||||
* Copyright (C) 2017 Renesas Electronics Corp.
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public License
|
||||
* version 2. This program is licensed "as is" without any warranty of any
|
||||
* kind, whether express or implied.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "r8a7743-iwg20m.dtsi"
|
||||
|
||||
/ {
|
||||
model = "iWave Systems RainboW-G20D-Qseven board based on RZ/G1M";
|
||||
compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743";
|
||||
|
||||
aliases {
|
||||
serial0 = &scif0;
|
||||
};
|
||||
};
|
||||
|
||||
&scif0 {
|
||||
status = "okay";
|
||||
};
|
29
arch/arm/boot/dts/r8a7743-iwg20m.dtsi
Normal file
29
arch/arm/boot/dts/r8a7743-iwg20m.dtsi
Normal file
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Device Tree Source for the iWave-RZG1M-20M Qseven SOM
|
||||
*
|
||||
* Copyright (C) 2017 Renesas Electronics Corp.
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public License
|
||||
* version 2. This program is licensed "as is" without any warranty of any
|
||||
* kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#include "r8a7743.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "iwave,g20m", "renesas,r8a7743";
|
||||
|
||||
memory@40000000 {
|
||||
device_type = "memory";
|
||||
reg = <0 0x40000000 0 0x20000000>;
|
||||
};
|
||||
|
||||
memory@200000000 {
|
||||
device_type = "memory";
|
||||
reg = <2 0x00000000 0 0x20000000>;
|
||||
};
|
||||
};
|
||||
|
||||
&extal_clk {
|
||||
clock-frequency = <20000000>;
|
||||
};
|
|
@ -1602,16 +1602,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
usb@1,0 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
usb@2,0 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
@ -1658,16 +1656,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@1,0 {
|
||||
reg = <0x20800 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@2,0 {
|
||||
reg = <0x21000 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
|
|
@ -1613,16 +1613,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
usb@1,0 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
usb@2,0 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
@ -1648,16 +1646,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@1,0 {
|
||||
reg = <0x10800 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@2,0 {
|
||||
reg = <0x11000 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
|
|
@ -253,17 +253,38 @@
|
|||
};
|
||||
};
|
||||
|
||||
hdmi-in {
|
||||
compatible = "hdmi-connector";
|
||||
type = "a";
|
||||
|
||||
port {
|
||||
hdmi_con_in: endpoint {
|
||||
remote-endpoint = <&adv7612_in>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hdmi-out {
|
||||
compatible = "hdmi-connector";
|
||||
type = "a";
|
||||
|
||||
port {
|
||||
hdmi_con: endpoint {
|
||||
hdmi_con_out: endpoint {
|
||||
remote-endpoint = <&adv7511_out>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
composite-in {
|
||||
compatible = "composite-video-connector";
|
||||
|
||||
port {
|
||||
composite_con_in: endpoint {
|
||||
remote-endpoint = <&adv7180_in>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
x2_clk: x2-clock {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
|
@ -395,6 +416,16 @@
|
|||
groups = "audio_clk_a";
|
||||
function = "audio_clk";
|
||||
};
|
||||
|
||||
vin0_pins: vin0 {
|
||||
groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";
|
||||
function = "vin0";
|
||||
};
|
||||
|
||||
vin1_pins: vin1 {
|
||||
groups = "vin1_data8", "vin1_clk";
|
||||
function = "vin1";
|
||||
};
|
||||
};
|
||||
|
||||
ðer {
|
||||
|
@ -526,6 +557,32 @@
|
|||
reg = <0x12>;
|
||||
};
|
||||
|
||||
composite-in@20 {
|
||||
compatible = "adi,adv7180cp";
|
||||
reg = <0x20>;
|
||||
remote = <&vin1>;
|
||||
|
||||
port {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
adv7180_in: endpoint {
|
||||
remote-endpoint = <&composite_con_in>;
|
||||
};
|
||||
};
|
||||
|
||||
port@3 {
|
||||
reg = <3>;
|
||||
adv7180_out: endpoint {
|
||||
bus-width = <8>;
|
||||
remote-endpoint = <&vin1ep>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hdmi@39 {
|
||||
compatible = "adi,adv7511w";
|
||||
reg = <0x39>;
|
||||
|
@ -552,7 +609,34 @@
|
|||
port@1 {
|
||||
reg = <1>;
|
||||
adv7511_out: endpoint {
|
||||
remote-endpoint = <&hdmi_con>;
|
||||
remote-endpoint = <&hdmi_con_out>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hdmi-in@4c {
|
||||
compatible = "adi,adv7612";
|
||||
reg = <0x4c>;
|
||||
interrupt-parent = <&gpio4>;
|
||||
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
|
||||
default-input = <0>;
|
||||
|
||||
port {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
adv7612_in: endpoint {
|
||||
remote-endpoint = <&hdmi_con_in>;
|
||||
};
|
||||
};
|
||||
|
||||
port@2 {
|
||||
reg = <2>;
|
||||
adv7612_out: endpoint {
|
||||
remote-endpoint = <&vin0ep2>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -606,3 +690,42 @@
|
|||
&ssi1 {
|
||||
shared-pin;
|
||||
};
|
||||
|
||||
/* HDMI video input */
|
||||
&vin0 {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&vin0_pins>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
port {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
vin0ep2: endpoint {
|
||||
remote-endpoint = <&adv7612_out>;
|
||||
bus-width = <24>;
|
||||
hsync-active = <0>;
|
||||
vsync-active = <0>;
|
||||
pclk-sample = <1>;
|
||||
data-active = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* composite video input */
|
||||
&vin1 {
|
||||
pinctrl-0 = <&vin1_pins>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
status = "okay";
|
||||
|
||||
port {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
vin1ep: endpoint {
|
||||
remote-endpoint = <&adv7180_out>;
|
||||
bus-width = <8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -820,16 +820,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
usb@1,0 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
usb@2,0 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
phys = <&usb0 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
@ -855,16 +853,14 @@
|
|||
0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
|
||||
0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
usb@0,1 {
|
||||
reg = <0x800 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@1,0 {
|
||||
reg = <0x10800 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
||||
usb@0,2 {
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
device_type = "pci";
|
||||
usb@2,0 {
|
||||
reg = <0x11000 0 0 0 0>;
|
||||
phys = <&usb2 0>;
|
||||
phy-names = "usb";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue