Renesas ARM64 DT updates for v5.4 (take two)

- Sort nodes in various SoC and board DTSes,
   - HDMI sound for HiHope RZ/G2M and R-Car M3-N Salvator-X(S) boards,
   - Limit EtherAVB to 100Mbps on the Ebisu and Draak boards,
   - Small fixes and improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iHQEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCXV/RMAAKCRCKwlD9ZEnx
 cCHSAPjpUc37iMoA3csJiReZLVWBudUR5gHf3J8xZD0+7pHBAP4i4yPTEkYRPudB
 6qLtSfPHbDE07R00nAMeyuxinKx/CQ==
 =RWpv
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm64-dt-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM64 DT updates for v5.4 (take two)

  - Sort nodes in various SoC and board DTSes,
  - HDMI sound for HiHope RZ/G2M and R-Car M3-N Salvator-X(S) boards,
  - Limit EtherAVB to 100Mbps on the Ebisu and Draak boards,
  - Small fixes and improvements.

* tag 'renesas-arm64-dt-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (21 commits)
  arm64: dts: renesas: Update 'vsps' properties for readability
  arm64: dts: renesas: r8a77965-salvator-x(s): Enable HDMI sound
  arm64: dts: renesas: r8a774c0: Fix register range of display node
  arm64: dts: renesas: r8a77970: Sort nodes
  arm64: dts: renesas: r8a7796: Sort nodes
  arm64: dts: renesas: r8a774c0: Sort nodes
  arm64: dts: renesas: r8a774c0: cat874: Sort nodes
  arm64: dts: renesas: r8a774a1: Sort nodes
  arm64: dts: renesas: r8a77980: Fix IPMMU-VC0 base address
  arm64: dts: renesas: ebisu, draak: Limit EtherAVB to 100Mbps
  arm64: dts: renesas: hihope-common: Add HDMI audio support
  arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator
  arm64: dts: renesas: r8a774c0: Point LVDS0 to its companion LVDS1
  arm64: dts: renesas: r8a77995: Sort nodes
  arm64: dts: renesas: r8a77995: draak: Sort nodes
  arm64: dts: renesas: r8a77990: Sort nodes
  arm64: dts: renesas: r8a77990: ebisu: Sort nodes
  arm64: dts: renesas: r8a77980: v3hsk: Sort nodes
  arm64: dts: renesas: r8a77980: condor: Sort nodes
  arm64: dts: renesas: r8a77970: v3msk: Sort nodes
  ...

Link: https://lore.kernel.org/r/20190823123643.18799-4-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-03 15:37:05 +02:00
commit f2a3d36cca
19 changed files with 657 additions and 527 deletions

View File

@ -81,6 +81,14 @@
regulator-always-on; regulator-always-on;
}; };
sound_card: sound {
compatible = "audio-graph-card";
label = "rcar-sound";
dais = <&rsnd_port0>;
};
vbus0_usb2: regulator-vbus0-usb2 { vbus0_usb2: regulator-vbus0-usb2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
@ -129,6 +137,10 @@
}; };
}; };
&audio_clk_a {
clock-frequency = <22579200>;
};
&du { &du {
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>, <&cpg CPG_MOD 723>,
@ -176,6 +188,12 @@
remote-endpoint = <&hdmi0_con>; remote-endpoint = <&hdmi0_con>;
}; };
}; };
port@2 {
reg = <2>;
dw_hdmi0_snd_in: endpoint {
remote-endpoint = <&rsnd_endpoint0>;
};
};
}; };
}; };
@ -272,6 +290,11 @@
power-source = <1800>; power-source = <1800>;
}; };
sound_clk_pins: sound_clk {
groups = "audio_clk_a_a";
function = "audio_clk";
};
usb0_pins: usb0 { usb0_pins: usb0 {
groups = "usb0"; groups = "usb0";
function = "usb0"; function = "usb0";
@ -295,6 +318,30 @@
}; };
}; };
&rcar_sound {
pinctrl-0 = <&sound_clk_pins>;
pinctrl-names = "default";
status = "okay";
/* Single DAI */
#sound-dai-cells = <0>;
ports {
rsnd_port0: port@0 {
rsnd_endpoint0: endpoint {
remote-endpoint = <&dw_hdmi0_snd_in>;
dai-format = "i2s";
bitclock-master = <&rsnd_endpoint0>;
frame-master = <&rsnd_endpoint0>;
playback = <&ssi2>;
};
};
};
};
&rwdt { &rwdt {
timeout-sec = <60>; timeout-sec = <60>;
status = "okay"; status = "okay";

View File

@ -1726,6 +1726,28 @@
"ssi.1", "ssi.0"; "ssi.1", "ssi.0";
status = "disabled"; status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
};
port@1 {
reg = <1>;
};
};
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,dvc { rcar_sound,dvc {
dvc0: dvc-0 { dvc0: dvc-0 {
dmas = <&audma1 0xbc>; dmas = <&audma1 0xbc>;
@ -1742,17 +1764,6 @@
mix1: mix-1 { }; mix1: mix-1 { };
}; };
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,src { rcar_sound,src {
src0: src-0 { src0: src-0 {
interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@ -1806,6 +1817,59 @@
}; };
}; };
rcar_sound,ssi {
ssi0: ssi-0 {
interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x01>, <&audma1 0x02>;
dma-names = "rx", "tx";
};
ssi1: ssi-1 {
interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x03>, <&audma1 0x04>;
dma-names = "rx", "tx";
};
ssi2: ssi-2 {
interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x05>, <&audma1 0x06>;
dma-names = "rx", "tx";
};
ssi3: ssi-3 {
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x07>, <&audma1 0x08>;
dma-names = "rx", "tx";
};
ssi4: ssi-4 {
interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x09>, <&audma1 0x0a>;
dma-names = "rx", "tx";
};
ssi5: ssi-5 {
interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0b>, <&audma1 0x0c>;
dma-names = "rx", "tx";
};
ssi6: ssi-6 {
interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0d>, <&audma1 0x0e>;
dma-names = "rx", "tx";
};
ssi7: ssi-7 {
interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0f>, <&audma1 0x10>;
dma-names = "rx", "tx";
};
ssi8: ssi-8 {
interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x11>, <&audma1 0x12>;
dma-names = "rx", "tx";
};
ssi9: ssi-9 {
interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x13>, <&audma1 0x14>;
dma-names = "rx", "tx";
};
};
rcar_sound,ssiu { rcar_sound,ssiu {
ssiu00: ssiu-0 { ssiu00: ssiu-0 {
dmas = <&audma0 0x15>, <&audma1 0x16>; dmas = <&audma0 0x15>, <&audma1 0x16>;
@ -2016,70 +2080,6 @@
dma-names = "rx", "tx"; dma-names = "rx", "tx";
}; };
}; };
rcar_sound,ssi {
ssi0: ssi-0 {
interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x01>, <&audma1 0x02>;
dma-names = "rx", "tx";
};
ssi1: ssi-1 {
interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x03>, <&audma1 0x04>;
dma-names = "rx", "tx";
};
ssi2: ssi-2 {
interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x05>, <&audma1 0x06>;
dma-names = "rx", "tx";
};
ssi3: ssi-3 {
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x07>, <&audma1 0x08>;
dma-names = "rx", "tx";
};
ssi4: ssi-4 {
interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x09>, <&audma1 0x0a>;
dma-names = "rx", "tx";
};
ssi5: ssi-5 {
interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0b>, <&audma1 0x0c>;
dma-names = "rx", "tx";
};
ssi6: ssi-6 {
interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0d>, <&audma1 0x0e>;
dma-names = "rx", "tx";
};
ssi7: ssi-7 {
interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0f>, <&audma1 0x10>;
dma-names = "rx", "tx";
};
ssi8: ssi-8 {
interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x11>, <&audma1 0x12>;
dma-names = "rx", "tx";
};
ssi9: ssi-9 {
interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x13>, <&audma1 0x14>;
dma-names = "rx", "tx";
};
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
};
port@1 {
reg = <1>;
};
};
}; };
audma0: dma-controller@ec700000 { audma0: dma-controller@ec700000 {
@ -2746,6 +2746,18 @@
thermal-sensors = <&tsc 2>; thermal-sensors = <&tsc 2>;
sustainable-power = <3874>; sustainable-power = <3874>;
cooling-maps {
map0 {
trip = <&target>;
cooling-device = <&a57_0 0 2>;
contribution = <1024>;
};
map1 {
trip = <&target>;
cooling-device = <&a53_0 0 2>;
contribution = <1024>;
};
};
trips { trips {
target: trip-point1 { target: trip-point1 {
temperature = <100000>; temperature = <100000>;
@ -2759,18 +2771,6 @@
type = "critical"; type = "critical";
}; };
}; };
cooling-maps {
map0 {
trip = <&target>;
cooling-device = <&a57_0 0 2>;
contribution = <1024>;
};
map1 {
trip = <&target>;
cooling-device = <&a53_0 0 2>;
contribution = <1024>;
};
};
}; };
}; };

View File

@ -65,6 +65,15 @@
reg = <0x0 0x48000000 0x0 0x78000000>; reg = <0x0 0x48000000 0x0 0x78000000>;
}; };
reg_12p0v: regulator-12p0v {
compatible = "regulator-fixed";
regulator-name = "D12.0V";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-boot-on;
regulator-always-on;
};
sound: sound { sound: sound {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
@ -73,13 +82,13 @@
simple-audio-card,bitclock-master = <&sndcpu>; simple-audio-card,bitclock-master = <&sndcpu>;
simple-audio-card,frame-master = <&sndcpu>; simple-audio-card,frame-master = <&sndcpu>;
sndcpu: simple-audio-card,cpu {
sound-dai = <&rcar_sound>;
};
sndcodec: simple-audio-card,codec { sndcodec: simple-audio-card,codec {
sound-dai = <&tda19988>; sound-dai = <&tda19988>;
}; };
sndcpu: simple-audio-card,cpu {
sound-dai = <&rcar_sound>;
};
}; };
vcc_sdhi0: regulator-vcc-sdhi0 { vcc_sdhi0: regulator-vcc-sdhi0 {
@ -271,16 +280,16 @@
function = "du"; function = "du";
}; };
i2c1_pins: i2c1 {
groups = "i2c1_b";
function = "i2c1";
};
hscif2_pins: hscif2 { hscif2_pins: hscif2 {
groups = "hscif2_data_a", "hscif2_ctrl_a"; groups = "hscif2_data_a", "hscif2_ctrl_a";
function = "hscif2"; function = "hscif2";
}; };
i2c1_pins: i2c1 {
groups = "i2c1_b";
function = "i2c1";
};
scif2_pins: scif2 { scif2_pins: scif2 {
groups = "scif2_data_a"; groups = "scif2_data_a";
function = "scif2"; function = "scif2";
@ -304,16 +313,16 @@
power-source = <1800>; power-source = <1800>;
}; };
sound_pins: sound {
groups = "ssi01239_ctrl", "ssi0_data";
function = "ssi";
};
sound_clk_pins: sound_clk { sound_clk_pins: sound_clk {
groups = "audio_clkout1_a"; groups = "audio_clkout1_a";
function = "audio_clk"; function = "audio_clk";
}; };
sound_pins: sound {
groups = "ssi01239_ctrl", "ssi0_data";
function = "ssi";
};
usb30_pins: usb30 { usb30_pins: usb30 {
groups = "usb30", "usb30_id"; groups = "usb30", "usb30_id";
function = "usb30"; function = "usb30";

View File

@ -1371,6 +1371,17 @@
"ssi.1", "ssi.0"; "ssi.1", "ssi.0";
status = "disabled"; status = "disabled";
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,dvc { rcar_sound,dvc {
dvc0: dvc-0 { dvc0: dvc-0 {
dmas = <&audma0 0xbc>; dmas = <&audma0 0xbc>;
@ -1387,17 +1398,6 @@
mix1: mix-1 { }; mix1: mix-1 { };
}; };
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,src { rcar_sound,src {
src0: src-0 { src0: src-0 {
interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@ -1706,34 +1706,6 @@
renesas,fcp = <&fcpvb0>; renesas,fcp = <&fcpvb0>;
}; };
fcpvb0: fcp@fe96f000 {
compatible = "renesas,fcpv";
reg = <0 0xfe96f000 0 0x200>;
clocks = <&cpg CPG_MOD 607>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 607>;
iommus = <&ipmmu_vp0 5>;
};
vspi0: vsp@fe9a0000 {
compatible = "renesas,vsp2";
reg = <0 0xfe9a0000 0 0x8000>;
interrupts = <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 631>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 631>;
renesas,fcp = <&fcpvi0>;
};
fcpvi0: fcp@fe9af000 {
compatible = "renesas,fcpv";
reg = <0 0xfe9af000 0 0x200>;
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 611>;
iommus = <&ipmmu_vp0 8>;
};
vspd0: vsp@fea20000 { vspd0: vsp@fea20000 {
compatible = "renesas,vsp2"; compatible = "renesas,vsp2";
reg = <0 0xfea20000 0 0x7000>; reg = <0 0xfea20000 0 0x7000>;
@ -1744,15 +1716,6 @@
renesas,fcp = <&fcpvd0>; renesas,fcp = <&fcpvd0>;
}; };
fcpvd0: fcp@fea27000 {
compatible = "renesas,fcpv";
reg = <0 0xfea27000 0 0x200>;
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 603>;
iommus = <&ipmmu_vi0 8>;
};
vspd1: vsp@fea28000 { vspd1: vsp@fea28000 {
compatible = "renesas,vsp2"; compatible = "renesas,vsp2";
reg = <0 0xfea28000 0 0x7000>; reg = <0 0xfea28000 0 0x7000>;
@ -1763,6 +1726,34 @@
renesas,fcp = <&fcpvd1>; renesas,fcp = <&fcpvd1>;
}; };
vspi0: vsp@fe9a0000 {
compatible = "renesas,vsp2";
reg = <0 0xfe9a0000 0 0x8000>;
interrupts = <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 631>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 631>;
renesas,fcp = <&fcpvi0>;
};
fcpvb0: fcp@fe96f000 {
compatible = "renesas,fcpv";
reg = <0 0xfe96f000 0 0x200>;
clocks = <&cpg CPG_MOD 607>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 607>;
iommus = <&ipmmu_vp0 5>;
};
fcpvd0: fcp@fea27000 {
compatible = "renesas,fcpv";
reg = <0 0xfea27000 0 0x200>;
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 603>;
iommus = <&ipmmu_vi0 8>;
};
fcpvd1: fcp@fea2f000 { fcpvd1: fcp@fea2f000 {
compatible = "renesas,fcpv"; compatible = "renesas,fcpv";
reg = <0 0xfea2f000 0 0x200>; reg = <0 0xfea2f000 0 0x200>;
@ -1772,6 +1763,15 @@
iommus = <&ipmmu_vi0 9>; iommus = <&ipmmu_vi0 9>;
}; };
fcpvi0: fcp@fe9af000 {
compatible = "renesas,fcpv";
reg = <0 0xfe9af000 0 0x200>;
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 611>;
iommus = <&ipmmu_vp0 8>;
};
csi40: csi2@feaa0000 { csi40: csi2@feaa0000 {
compatible = "renesas,r8a774c0-csi2"; compatible = "renesas,r8a774c0-csi2";
reg = <0 0xfeaa0000 0 0x10000>; reg = <0 0xfeaa0000 0 0x10000>;
@ -1805,13 +1805,13 @@
du: display@feb00000 { du: display@feb00000 {
compatible = "renesas,du-r8a774c0"; compatible = "renesas,du-r8a774c0";
reg = <0 0xfeb00000 0 0x80000>; reg = <0 0xfeb00000 0 0x40000>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>; <&cpg CPG_MOD 723>;
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
vsps = <&vspd0 0 &vspd1 0>; vsps = <&vspd0 0>, <&vspd1 0>;
status = "disabled"; status = "disabled";
ports { ports {
@ -1848,6 +1848,8 @@
resets = <&cpg 727>; resets = <&cpg 727>;
status = "disabled"; status = "disabled";
renesas,companion = <&lvds1>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -1906,6 +1908,9 @@
polling-delay = <1000>; polling-delay = <1000>;
thermal-sensors = <&thermal>; thermal-sensors = <&thermal>;
cooling-maps {
};
trips { trips {
cpu-crit { cpu-crit {
temperature = <120000>; temperature = <120000>;
@ -1913,9 +1918,6 @@
type = "critical"; type = "critical";
}; };
}; };
cooling-maps {
};
}; };
}; };

View File

@ -3112,7 +3112,7 @@
<&cpg CPG_MOD 722>, <&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>; <&cpg CPG_MOD 721>;
clock-names = "du.0", "du.1", "du.2", "du.3"; clock-names = "du.0", "du.1", "du.2", "du.3";
vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>; vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
status = "disabled"; status = "disabled";
ports { ports {

View File

@ -1833,6 +1833,17 @@
"ssi.1", "ssi.0"; "ssi.1", "ssi.0";
status = "disabled"; status = "disabled";
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,dvc { rcar_sound,dvc {
dvc0: dvc-0 { dvc0: dvc-0 {
dmas = <&audma1 0xbc>; dmas = <&audma1 0xbc>;
@ -1849,17 +1860,6 @@
mix1: mix-1 { }; mix1: mix-1 { };
}; };
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,src { rcar_sound,src {
src0: src-0 { src0: src-0 {
interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@ -1913,6 +1913,59 @@
}; };
}; };
rcar_sound,ssi {
ssi0: ssi-0 {
interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x01>, <&audma1 0x02>;
dma-names = "rx", "tx";
};
ssi1: ssi-1 {
interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x03>, <&audma1 0x04>;
dma-names = "rx", "tx";
};
ssi2: ssi-2 {
interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x05>, <&audma1 0x06>;
dma-names = "rx", "tx";
};
ssi3: ssi-3 {
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x07>, <&audma1 0x08>;
dma-names = "rx", "tx";
};
ssi4: ssi-4 {
interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x09>, <&audma1 0x0a>;
dma-names = "rx", "tx";
};
ssi5: ssi-5 {
interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0b>, <&audma1 0x0c>;
dma-names = "rx", "tx";
};
ssi6: ssi-6 {
interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0d>, <&audma1 0x0e>;
dma-names = "rx", "tx";
};
ssi7: ssi-7 {
interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0f>, <&audma1 0x10>;
dma-names = "rx", "tx";
};
ssi8: ssi-8 {
interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x11>, <&audma1 0x12>;
dma-names = "rx", "tx";
};
ssi9: ssi-9 {
interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x13>, <&audma1 0x14>;
dma-names = "rx", "tx";
};
};
rcar_sound,ssiu { rcar_sound,ssiu {
ssiu00: ssiu-0 { ssiu00: ssiu-0 {
dmas = <&audma0 0x15>, <&audma1 0x16>; dmas = <&audma0 0x15>, <&audma1 0x16>;
@ -2123,59 +2176,6 @@
dma-names = "rx", "tx"; dma-names = "rx", "tx";
}; };
}; };
rcar_sound,ssi {
ssi0: ssi-0 {
interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x01>, <&audma1 0x02>;
dma-names = "rx", "tx";
};
ssi1: ssi-1 {
interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x03>, <&audma1 0x04>;
dma-names = "rx", "tx";
};
ssi2: ssi-2 {
interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x05>, <&audma1 0x06>;
dma-names = "rx", "tx";
};
ssi3: ssi-3 {
interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x07>, <&audma1 0x08>;
dma-names = "rx", "tx";
};
ssi4: ssi-4 {
interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x09>, <&audma1 0x0a>;
dma-names = "rx", "tx";
};
ssi5: ssi-5 {
interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0b>, <&audma1 0x0c>;
dma-names = "rx", "tx";
};
ssi6: ssi-6 {
interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0d>, <&audma1 0x0e>;
dma-names = "rx", "tx";
};
ssi7: ssi-7 {
interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x0f>, <&audma1 0x10>;
dma-names = "rx", "tx";
};
ssi8: ssi-8 {
interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x11>, <&audma1 0x12>;
dma-names = "rx", "tx";
};
ssi9: ssi-9 {
interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&audma0 0x13>, <&audma1 0x14>;
dma-names = "rx", "tx";
};
};
}; };
audma0: dma-controller@ec700000 { audma0: dma-controller@ec700000 {
@ -2860,6 +2860,18 @@
thermal-sensors = <&tsc 2>; thermal-sensors = <&tsc 2>;
sustainable-power = <3874>; sustainable-power = <3874>;
cooling-maps {
map0 {
trip = <&target>;
cooling-device = <&a57_0 2 4>;
contribution = <1024>;
};
map1 {
trip = <&target>;
cooling-device = <&a53_0 0 2>;
contribution = <1024>;
};
};
trips { trips {
target: trip-point1 { target: trip-point1 {
temperature = <100000>; temperature = <100000>;
@ -2873,18 +2885,6 @@
type = "critical"; type = "critical";
}; };
}; };
cooling-maps {
map0 {
trip = <&target>;
cooling-device = <&a57_0 2 4>;
contribution = <1024>;
};
map1 {
trip = <&target>;
cooling-device = <&a53_0 0 2>;
contribution = <1024>;
};
};
}; };
}; };

View File

@ -41,9 +41,37 @@
remote-endpoint = <&hdmi0_con>; remote-endpoint = <&hdmi0_con>;
}; };
}; };
port@2 {
reg = <2>;
dw_hdmi0_snd_in: endpoint {
remote-endpoint = <&rsnd_endpoint1>;
};
};
}; };
}; };
&hdmi0_con { &hdmi0_con {
remote-endpoint = <&rcar_dw_hdmi0_out>; remote-endpoint = <&rcar_dw_hdmi0_out>;
}; };
&rcar_sound {
ports {
rsnd_port1: port@1 {
reg = <1>;
rsnd_endpoint1: endpoint {
remote-endpoint = <&dw_hdmi0_snd_in>;
dai-format = "i2s";
bitclock-master = <&rsnd_endpoint1>;
frame-master = <&rsnd_endpoint1>;
playback = <&ssi2>;
};
};
};
};
&sound_card {
dais = <&rsnd_port0 /* ak4613 */
&rsnd_port1>; /* HDMI0 */
};

View File

@ -41,6 +41,12 @@
remote-endpoint = <&hdmi0_con>; remote-endpoint = <&hdmi0_con>;
}; };
}; };
port@2 {
reg = <2>;
dw_hdmi0_snd_in: endpoint {
remote-endpoint = <&rsnd_endpoint1>;
};
};
}; };
}; };
@ -57,7 +63,29 @@
}; };
}; };
&rcar_sound {
ports {
rsnd_port1: port@1 {
reg = <1>;
rsnd_endpoint1: endpoint {
remote-endpoint = <&dw_hdmi0_snd_in>;
dai-format = "i2s";
bitclock-master = <&rsnd_endpoint1>;
frame-master = <&rsnd_endpoint1>;
playback = <&ssi2>;
};
};
};
};
/* SW12-7 must be set 'Off' (MD12 set to 1) which is not the default! */ /* SW12-7 must be set 'Off' (MD12 set to 1) which is not the default! */
&sata { &sata {
status = "okay"; status = "okay";
}; };
&sound_card {
dais = <&rsnd_port0 /* ak4613 */
&rsnd_port1>; /* HDMI0 */
};

View File

@ -2469,7 +2469,7 @@
clock-names = "du.0", "du.1", "du.3"; clock-names = "du.0", "du.1", "du.3";
status = "disabled"; status = "disabled";
vsps = <&vspd0 0 &vspd1 0 &vspd0 1>; vsps = <&vspd0 0>, <&vspd1 0>, <&vspd0 1>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;

View File

@ -23,10 +23,13 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@48000000 { d3p3: regulator-fixed {
device_type = "memory"; compatible = "regulator-fixed";
/* first 128MB is reserved for secure area. */ regulator-name = "fixed-3.3V";
reg = <0x0 0x48000000 0x0 0x38000000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
regulator-always-on;
}; };
hdmi-out { hdmi-out {
@ -40,15 +43,6 @@
}; };
}; };
d3p3: regulator-fixed {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
regulator-always-on;
};
lvds-decoder { lvds-decoder {
compatible = "thine,thc63lvd1024"; compatible = "thine,thc63lvd1024";
@ -73,6 +67,12 @@
}; };
}; };
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0x0 0x48000000 0x0 0x38000000>;
};
}; };
&avb { &avb {
@ -102,6 +102,10 @@
}; };
}; };
&du {
status = "okay";
};
&extal_clk { &extal_clk {
clock-frequency = <16666666>; clock-frequency = <16666666>;
}; };
@ -157,6 +161,18 @@
}; };
}; };
&lvds0 {
status = "okay";
ports {
port@1 {
lvds0_out: endpoint {
remote-endpoint = <&thc63lvd1024_in>;
};
};
};
};
&pfc { &pfc {
avb_pins: avb0 { avb_pins: avb0 {
groups = "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; groups = "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
@ -190,19 +206,3 @@
status = "okay"; status = "okay";
}; };
&du {
status = "okay";
};
&lvds0 {
status = "okay";
ports {
port@1 {
lvds0_out: endpoint {
remote-endpoint = <&thc63lvd1024_in>;
};
};
};
};

View File

@ -21,6 +21,41 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
hdmi-out {
compatible = "hdmi-connector";
type = "a";
port {
hdmi_con: endpoint {
remote-endpoint = <&adv7511_out>;
};
};
};
lvds-decoder {
compatible = "thine,thc63lvd1024";
vcc-supply = <&vcc_d3_3v>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
thc63lvd1024_in: endpoint {
remote-endpoint = <&lvds0_out>;
};
};
port@2 {
reg = <2>;
thc63lvd1024_out: endpoint {
remote-endpoint = <&adv7511_in>;
};
};
};
};
memory@48000000 { memory@48000000 {
device_type = "memory"; device_type = "memory";
/* first 128MB is reserved for secure area. */ /* first 128MB is reserved for secure area. */
@ -59,41 +94,6 @@
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
lvds-decoder {
compatible = "thine,thc63lvd1024";
vcc-supply = <&vcc_d3_3v>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
thc63lvd1024_in: endpoint {
remote-endpoint = <&lvds0_out>;
};
};
port@2 {
reg = <2>;
thc63lvd1024_out: endpoint {
remote-endpoint = <&adv7511_in>;
};
};
};
};
hdmi-out {
compatible = "hdmi-connector";
type = "a";
port {
hdmi_con: endpoint {
remote-endpoint = <&adv7511_out>;
};
};
};
}; };
&avb { &avb {
@ -128,29 +128,6 @@
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
&pfc {
avb_pins: avb0 {
groups = "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
function = "avb0";
};
i2c0_pins: i2c0 {
groups = "i2c0";
function = "i2c0";
};
mmc_pins: mmc_3_3v {
groups = "mmc_data8", "mmc_ctrl";
function = "mmc";
power-source = <3300>;
};
scif0_pins: scif0 {
groups = "scif0_data";
function = "scif0";
};
};
&i2c0 { &i2c0 {
pinctrl-0 = <&i2c0_pins>; pinctrl-0 = <&i2c0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -220,6 +197,29 @@
status = "okay"; status = "okay";
}; };
&pfc {
avb_pins: avb0 {
groups = "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
function = "avb0";
};
i2c0_pins: i2c0 {
groups = "i2c0";
function = "i2c0";
};
mmc_pins: mmc_3_3v {
groups = "mmc_data8", "mmc_ctrl";
function = "mmc";
power-source = <3300>;
};
scif0_pins: scif0 {
groups = "scif0_data";
function = "scif0";
};
};
&scif0 { &scif0 {
pinctrl-0 = <&scif0_pins>; pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";

View File

@ -1181,6 +1181,9 @@
polling-delay = <1000>; polling-delay = <1000>;
thermal-sensors = <&thermal>; thermal-sensors = <&thermal>;
cooling-maps {
};
trips { trips {
cpu-crit { cpu-crit {
temperature = <120000>; temperature = <120000>;
@ -1188,9 +1191,6 @@
type = "critical"; type = "critical";
}; };
}; };
cooling-maps {
};
}; };
}; };

View File

@ -22,10 +22,13 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@48000000 { d1_8v: regulator-2 {
device_type = "memory"; compatible = "regulator-fixed";
/* first 128MB is reserved for secure area. */ regulator-name = "D1.8V";
reg = <0 0x48000000 0 0x78000000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
}; };
d3_3v: regulator-0 { d3_3v: regulator-0 {
@ -37,24 +40,6 @@
regulator-always-on; regulator-always-on;
}; };
vddq_vin01: regulator-1 {
compatible = "regulator-fixed";
regulator-name = "VDDQ_VIN01";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
d1_8v: regulator-2 {
compatible = "regulator-fixed";
regulator-name = "D1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
hdmi-out { hdmi-out {
compatible = "hdmi-connector"; compatible = "hdmi-connector";
type = "a"; type = "a";
@ -90,6 +75,21 @@
}; };
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0 0x48000000 0 0x78000000>;
};
vddq_vin01: regulator-1 {
compatible = "regulator-fixed";
regulator-name = "VDDQ_VIN01";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
};
x1_clk: x1-clock { x1_clk: x1-clock {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;

View File

@ -22,12 +22,6 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0 0x48000000 0 0x78000000>;
};
hdmi-out { hdmi-out {
compatible = "hdmi-connector"; compatible = "hdmi-connector";
type = "a"; type = "a";
@ -63,6 +57,12 @@
}; };
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0 0x48000000 0 0x78000000>;
};
osc1_clk: osc1-clock { osc1_clk: osc1-clock {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;

View File

@ -1299,9 +1299,9 @@
#iommu-cells = <1>; #iommu-cells = <1>;
}; };
ipmmu_vc0: mmu@fe6b0000 { ipmmu_vc0: mmu@fe990000 {
compatible = "renesas,ipmmu-r8a77980"; compatible = "renesas,ipmmu-r8a77980";
reg = <0 0xfe6b0000 0 0x1000>; reg = <0 0xfe990000 0 0x1000>;
renesas,ipmmu-main = <&ipmmu_mm 12>; renesas,ipmmu-main = <&ipmmu_mm 12>;
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
#iommu-cells = <1>; #iommu-cells = <1>;

View File

@ -23,12 +23,6 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
reg = <0x0 0x48000000 0x0 0x38000000>;
};
audio_clkout: audio-clkout { audio_clkout: audio-clkout {
/* /*
* This is same as <&rcar_sound 0> * This is same as <&rcar_sound 0>
@ -107,36 +101,10 @@
}; };
}; };
vga { memory@48000000 {
compatible = "vga-connector"; device_type = "memory";
/* first 128MB is reserved for secure area. */
port { reg = <0x0 0x48000000 0x0 0x38000000>;
vga_in: endpoint {
remote-endpoint = <&adv7123_out>;
};
};
};
vga-encoder {
compatible = "adi,adv7123";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
adv7123_in: endpoint {
remote-endpoint = <&du_out_rgb>;
};
};
port@1 {
reg = <1>;
adv7123_out: endpoint {
remote-endpoint = <&vga_in>;
};
};
};
}; };
reg_1p8v: regulator0 { reg_1p8v: regulator0 {
@ -157,15 +125,13 @@
regulator-always-on; regulator-always-on;
}; };
vbus0_usb2: regulator-vbus0-usb2 { reg_12p0v: regulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "D12.0V";
regulator-name = "USB20_VBUS_CN"; regulator-min-microvolt = <12000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <12000000>;
regulator-max-microvolt = <5000000>; regulator-boot-on;
regulator-always-on;
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
rsnd_ak4613: sound { rsnd_ak4613: sound {
@ -176,34 +142,24 @@
simple-audio-card,bitclock-master = <&sndcpu>; simple-audio-card,bitclock-master = <&sndcpu>;
simple-audio-card,frame-master = <&sndcpu>; simple-audio-card,frame-master = <&sndcpu>;
sndcpu: simple-audio-card,cpu {
sound-dai = <&rcar_sound>;
};
sndcodec: simple-audio-card,codec { sndcodec: simple-audio-card,codec {
sound-dai = <&ak4613>; sound-dai = <&ak4613>;
}; };
sndcpu: simple-audio-card,cpu {
sound-dai = <&rcar_sound>;
};
}; };
x12_clk: x12 { vbus0_usb2: regulator-vbus0-usb2 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24576000>;
};
reg_12p0v: regulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "D12.0V";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
regulator-boot-on;
regulator-always-on;
};
x13_clk: x13 { regulator-name = "USB20_VBUS_CN";
compatible = "fixed-clock"; regulator-min-microvolt = <5000000>;
#clock-cells = <0>; regulator-max-microvolt = <5000000>;
clock-frequency = <74250000>;
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
vcc_sdhi0: regulator-vcc-sdhi0 { vcc_sdhi0: regulator-vcc-sdhi0 {
@ -253,6 +209,50 @@
states = <3300000 1 states = <3300000 1
1800000 0>; 1800000 0>;
}; };
vga {
compatible = "vga-connector";
port {
vga_in: endpoint {
remote-endpoint = <&adv7123_out>;
};
};
};
vga-encoder {
compatible = "adi,adv7123";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
adv7123_in: endpoint {
remote-endpoint = <&du_out_rgb>;
};
};
port@1 {
reg = <1>;
adv7123_out: endpoint {
remote-endpoint = <&vga_in>;
};
};
};
};
x12_clk: x12 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24576000>;
};
x13_clk: x13 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <74250000>;
};
}; };
&audio_clk_a { &audio_clk_a {
@ -271,6 +271,14 @@
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <21 IRQ_TYPE_LEVEL_LOW>; interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
/*
* TX clock internal delay mode is required for reliable
* 1Gbps communication using the KSZ9031RNX phy present on
* the Ebisu board, however, TX clock internal delay mode
* isn't supported on r8a77990. Thus, limit speed to
* 100Mbps for reliable communication.
*/
max-speed = <100>;
}; };
}; };
@ -547,6 +555,11 @@
function = "pwm5"; function = "pwm5";
}; };
scif2_pins: scif2 {
groups = "scif2_data_a";
function = "scif2";
};
sdhi0_pins: sd0 { sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl"; groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0"; function = "sdhi0";
@ -577,20 +590,15 @@
power-source = <1800>; power-source = <1800>;
}; };
sound_pins: sound {
groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data";
function = "ssi";
};
sound_clk_pins: sound_clk { sound_clk_pins: sound_clk {
groups = "audio_clk_a", "audio_clk_b_a", "audio_clk_c_a", groups = "audio_clk_a", "audio_clk_b_a", "audio_clk_c_a",
"audio_clkout_a", "audio_clkout1_a"; "audio_clkout_a", "audio_clkout1_a";
function = "audio_clk"; function = "audio_clk";
}; };
scif2_pins: scif2 { sound_pins: sound {
groups = "scif2_data_a"; groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data";
function = "scif2"; function = "ssi";
}; };
usb0_pins: usb { usb0_pins: usb {
@ -671,38 +679,6 @@
status = "okay"; status = "okay";
}; };
&ssi1 {
shared-pin;
};
&usb2_phy0 {
pinctrl-0 = <&usb0_pins>;
pinctrl-names = "default";
vbus-supply = <&vbus0_usb2>;
status = "okay";
};
&usb3_peri0 {
companion = <&xhci0>;
status = "okay";
};
&vin4 {
status = "okay";
};
&vin5 {
status = "okay";
};
&xhci0 {
pinctrl-0 = <&usb30_pins>;
pinctrl-names = "default";
status = "okay";
};
&sdhi0 { &sdhi0 {
pinctrl-0 = <&sdhi0_pins>; pinctrl-0 = <&sdhi0_pins>;
pinctrl-1 = <&sdhi0_pins_uhs>; pinctrl-1 = <&sdhi0_pins_uhs>;
@ -746,3 +722,35 @@
non-removable; non-removable;
status = "okay"; status = "okay";
}; };
&ssi1 {
shared-pin;
};
&usb2_phy0 {
pinctrl-0 = <&usb0_pins>;
pinctrl-names = "default";
vbus-supply = <&vbus0_usb2>;
status = "okay";
};
&usb3_peri0 {
companion = <&xhci0>;
status = "okay";
};
&vin4 {
status = "okay";
};
&vin5 {
status = "okay";
};
&xhci0 {
pinctrl-0 = <&usb30_pins>;
pinctrl-names = "default";
status = "okay";
};

View File

@ -1326,6 +1326,17 @@
"ssi.1", "ssi.0"; "ssi.1", "ssi.0";
status = "disabled"; status = "disabled";
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,dvc { rcar_sound,dvc {
dvc0: dvc-0 { dvc0: dvc-0 {
dmas = <&audma0 0xbc>; dmas = <&audma0 0xbc>;
@ -1342,17 +1353,6 @@
mix1: mix-1 { }; mix1: mix-1 { };
}; };
rcar_sound,ctu {
ctu00: ctu-0 { };
ctu01: ctu-1 { };
ctu02: ctu-2 { };
ctu03: ctu-3 { };
ctu10: ctu-4 { };
ctu11: ctu-5 { };
ctu12: ctu-6 { };
ctu13: ctu-7 { };
};
rcar_sound,src { rcar_sound,src {
src0: src-0 { src0: src-0 {
interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@ -1768,7 +1768,7 @@
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>; resets = <&cpg 724>;
reset-names = "du.0"; reset-names = "du.0";
vsps = <&vspd0 0 &vspd1 0>; vsps = <&vspd0 0>, <&vspd1 0>;
status = "disabled"; status = "disabled";
ports { ports {
@ -1866,20 +1866,6 @@
thermal-sensors = <&thermal 0>; thermal-sensors = <&thermal 0>;
sustainable-power = <717>; sustainable-power = <717>;
trips {
target: trip-point1 {
temperature = <100000>;
hysteresis = <2000>;
type = "passive";
};
sensor1_crit: sensor1-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
};
};
cooling-maps { cooling-maps {
map0 { map0 {
trip = <&target>; trip = <&target>;
@ -1887,6 +1873,20 @@
contribution = <1024>; contribution = <1024>;
}; };
}; };
trips {
sensor1_crit: sensor1-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
};
target: trip-point1 {
temperature = <100000>;
hysteresis = <2000>;
type = "passive";
};
};
}; };
}; };

View File

@ -19,11 +19,6 @@
ethernet0 = &avb; ethernet0 = &avb;
}; };
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
stdout-path = "serial0:115200n8";
};
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm1 0 50000>; pwms = <&pwm1 0 50000>;
@ -35,6 +30,11 @@
enable-gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>;
}; };
chosen {
bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
stdout-path = "serial0:115200n8";
};
composite-in { composite-in {
compatible = "composite-video-connector"; compatible = "composite-video-connector";
@ -175,6 +175,14 @@
reg = <0>; reg = <0>;
interrupt-parent = <&gpio5>; interrupt-parent = <&gpio5>;
interrupts = <19 IRQ_TYPE_LEVEL_LOW>; interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
/*
* TX clock internal delay mode is required for reliable
* 1Gbps communication using the KSZ9031RNX phy present on
* the Draak board, however, TX clock internal delay mode
* isn't supported on r8a77995. Thus, limit speed to
* 100Mbps for reliable communication.
*/
max-speed = <100>;
}; };
}; };

View File

@ -242,41 +242,6 @@
resets = <&cpg 407>; resets = <&cpg 407>;
}; };
hscif0: serial@e6540000 {
compatible = "renesas,hscif-r8a77995",
"renesas,rcar-gen3-hscif",
"renesas,hscif";
reg = <0 0xe6540000 0 0x60>;
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 520>,
<&cpg CPG_CORE R8A77995_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x31>, <&dmac1 0x30>,
<&dmac2 0x31>, <&dmac2 0x30>;
dma-names = "tx", "rx", "tx", "rx";
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
resets = <&cpg 520>;
status = "disabled";
};
hscif3: serial@e66a0000 {
compatible = "renesas,hscif-r8a77995",
"renesas,rcar-gen3-hscif",
"renesas,hscif";
reg = <0 0xe66a0000 0 0x60>;
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 517>,
<&cpg CPG_CORE R8A77995_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x37>, <&dmac0 0x36>;
dma-names = "tx", "rx";
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
resets = <&cpg 517>;
status = "disabled";
};
i2c0: i2c@e6500000 { i2c0: i2c@e6500000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -344,6 +309,41 @@
status = "disabled"; status = "disabled";
}; };
hscif0: serial@e6540000 {
compatible = "renesas,hscif-r8a77995",
"renesas,rcar-gen3-hscif",
"renesas,hscif";
reg = <0 0xe6540000 0 0x60>;
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 520>,
<&cpg CPG_CORE R8A77995_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x31>, <&dmac1 0x30>,
<&dmac2 0x31>, <&dmac2 0x30>;
dma-names = "tx", "rx", "tx", "rx";
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
resets = <&cpg 520>;
status = "disabled";
};
hscif3: serial@e66a0000 {
compatible = "renesas,hscif-r8a77995",
"renesas,rcar-gen3-hscif",
"renesas,hscif";
reg = <0 0xe66a0000 0 0x60>;
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 517>,
<&cpg CPG_CORE R8A77995_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x37>, <&dmac0 0x36>;
dma-names = "tx", "rx";
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
resets = <&cpg 517>;
status = "disabled";
};
hsusb: usb@e6590000 { hsusb: usb@e6590000 {
compatible = "renesas,usbhs-r8a77995", compatible = "renesas,usbhs-r8a77995",
"renesas,rcar-gen3-usbhs"; "renesas,rcar-gen3-usbhs";
@ -1003,7 +1003,7 @@
clock-names = "du.0", "du.1"; clock-names = "du.0", "du.1";
resets = <&cpg 724>; resets = <&cpg 724>;
reset-names = "du.0"; reset-names = "du.0";
vsps = <&vspd0 0 &vspd1 0>; vsps = <&vspd0 0>, <&vspd1 0>;
status = "disabled"; status = "disabled";
ports { ports {
@ -1100,6 +1100,9 @@
polling-delay = <1000>; polling-delay = <1000>;
thermal-sensors = <&thermal>; thermal-sensors = <&thermal>;
cooling-maps {
};
trips { trips {
cpu-crit { cpu-crit {
temperature = <120000>; temperature = <120000>;
@ -1107,9 +1110,6 @@
type = "critical"; type = "critical";
}; };
}; };
cooling-maps {
};
}; };
}; };