summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2026-03-17 11:27:44 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2026-03-17 11:27:44 +0300
commitd9ef8c91c4bba8160853a76ba0dc99919acef0ab (patch)
tree76c9dbbfaef6f33363a3906b1aaae54553082f85
parentf2f0587dcdecc29a8da59b1f0e720955f25ab015 (diff)
parent0928a28daf017504e14920f4131bb99e3bc39dba (diff)
downloadlinux-d9ef8c91c4bba8160853a76ba0dc99919acef0ab.tar.xz
Merge tag 'renesas-dts-for-v7.1-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/dt
Renesas DTS updates for v7.1 - Add CPU frequency scaling and QSPI NOR FLASH support on the RZ/N1 SoC and the RZN1D-DB development board, - Add PCIe slot power control on the R-Car H3, M3-W(+), M3-N, and E3 SoCs, - Add USB3.0 PHY support on the R-Car E3 SoC and the Ebisu development board, - Add PCIe/USB3.0 clock generator support on the Salvator-X(S), ULCB King Fisher extension, and Ebisu development boards, - Add RTC support on the RZ/V2N SoC and its EVK board, - Add SPI DMA support on the RZ/T2H, RZ/N2H, RZ/V2H(P), and RZ/V2N SoCs, - Add support for the second SDHI channel on the Atmark Techno Armadillo-800-EVA board, - Miscellaneous fixes and improvements. * tag 'renesas-dts-for-v7.1-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (30 commits) ARM: dts: renesas: armadillo800eva: Add wakeup-source to st1232 ARM: dts: renesas: armadillo800eva: Enable SDHI1 ARM: dts: renesas: r9a06g032-rzn1d400-db: Use interrupts for Micrel PHYs ARM: dts: renesas: r9a06g032-rzn1d400-db: Do not use underscores in node names ARM: dts: renesas: r9a06g032-rzn1d400-db: Add QSPI node including NOR flash arm64: dts: renesas: r9a09g057: Add DMA support for RSPI channels arm64: dts: renesas: r9a09g056: Add DMA support for RSPI channels ARM: dts: renesas: r9a06g032: Describe the QSPI controller arm64: dts: renesas: r9a09g087: Wire up DMA support for SPI arm64: dts: renesas: r9a09g077: Wire up DMA support for SPI arm64: dts: renesas: r9a09g056n48-rzv2n-evk: Enable RTC arm64: dts: renesas: r9a09g056: Add RTC node arm64: dts: renesas: ebisu: Describe PCIe/USB3.0 clock generator arm64: dts: renesas: ulcb: ulcb-kf: Describe PCIe/USB3.0 clock generator arm64: dts: renesas: salvator-common: Describe PCIe/USB3.0 clock generator arm64: dts: renesas: r8a77990: Add USB 3.0 PHY and USB3S0 clock nodes arm64: dts: renesas: r8a77990: Describe PCIe root port arm64: dts: renesas: r8a77965: Describe PCIe root ports arm64: dts: renesas: r8a77961: Describe PCIe root ports arm64: dts: renesas: r8a77960: Describe PCIe root ports ... Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-rw-r--r--arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts32
-rw-r--r--arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts111
-rw-r--r--arch/arm/boot/dts/renesas/r9a06g032.dtsi47
-rw-r--r--arch/arm64/boot/dts/renesas/ebisu.dtsi43
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77951.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77960.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77961.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77965.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77990.dtsi27
-rw-r--r--arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts5
-rw-r--r--arch/arm64/boot/dts/renesas/r8a78000.dtsi16
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g056.dtsi36
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts4
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g057.dtsi51
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g077.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g087.dtsi20
-rw-r--r--arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi2
-rw-r--r--arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi1
-rw-r--r--arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso1
-rw-r--r--arch/arm64/boot/dts/renesas/salvator-common.dtsi28
-rw-r--r--arch/arm64/boot/dts/renesas/ulcb-kf.dtsi21
-rw-r--r--arch/arm64/boot/dts/renesas/ulcb.dtsi13
22 files changed, 505 insertions, 53 deletions
diff --git a/arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts
index 04d24b6d8056..1d56bdef5453 100644
--- a/arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts
@@ -65,6 +65,17 @@
enable-active-high;
};
+ vcc_sdhi1: regulator-vcc-sdhi1 {
+ compatible = "regulator-fixed";
+
+ regulator-name = "SDHI1 Vcc";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&pfc 16 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
reg_5p0v: regulator-5p0v {
compatible = "regulator-fixed";
regulator-name = "fixed-5.0V";
@@ -228,6 +239,7 @@
pinctrl-0 = <&st1232_pins>;
pinctrl-names = "default";
gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
+ wakeup-source;
};
};
@@ -285,6 +297,11 @@
function = "sdhi0";
};
+ sdhi1_pins: sd1 {
+ groups = "sdhi1_data4", "sdhi1_ctrl", "sdhi1_cd", "sdhi1_wp";
+ function = "sdhi1";
+ };
+
fsia_pins: sounda {
groups = "fsia_sclk_in", "fsia_mclk_out",
"fsia_data_in_1", "fsia_data_out_0";
@@ -302,6 +319,12 @@
gpios = <176 0>;
output-high;
};
+
+ sdhi1-select-hog {
+ gpio-hog;
+ gpios = <6 0>;
+ input;
+ };
};
&tpu {
@@ -336,6 +359,15 @@
status = "okay";
};
+&sdhi1 {
+ pinctrl-0 = <&sdhi1_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&vcc_sdhi1>;
+ bus-width = <4>;
+ status = "okay";
+};
+
&sh_fsi2 {
pinctrl-0 = <&fsia_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts b/arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts
index 4a72aa7663f2..5626d7fd6c3e 100644
--- a/arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts
+++ b/arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts
@@ -185,6 +185,18 @@
};
};
+&gpioirqmux {
+ interrupt-map = <89 &gic GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, /* pin 147: phy@4 */
+ <91 &gic GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; /* pin 149: phy@5 */
+ status = "okay";
+};
+
+&gpio2 {
+ pinctrl-0 = <&pins_gpio2>;
+ pinctrl-names = "default";
+ status = "okay";
+};
+
&i2c2 {
pinctrl-0 = <&pins_i2c2>;
pinctrl-names = "default";
@@ -237,13 +249,13 @@
pinctrl-names = "default";
pinctrl-0 = <&pins_cpld>;
- pins_can0: pins_can0 {
+ pins_can0: pins-can0 {
pinmux = <RZN1_PINMUX(162, RZN1_FUNC_CAN)>, /* CAN0_TXD */
<RZN1_PINMUX(163, RZN1_FUNC_CAN)>; /* CAN0_RXD */
drive-strength = <6>;
};
- pins_can1: pins_can1 {
+ pins_can1: pins-can1 {
pinmux = <RZN1_PINMUX(109, RZN1_FUNC_CAN)>, /* CAN1_TXD */
<RZN1_PINMUX(110, RZN1_FUNC_CAN)>; /* CAN1_RXD */
drive-strength = <6>;
@@ -256,7 +268,7 @@
<RZN1_PINMUX(122, RZN1_FUNC_USB)>;
};
- pins_eth3: pins_eth3 {
+ pins_eth3: pins-eth3 {
pinmux = <RZN1_PINMUX(36, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
<RZN1_PINMUX(37, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
<RZN1_PINMUX(38, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
@@ -273,7 +285,7 @@
bias-disable;
};
- pins_eth4: pins_eth4 {
+ pins_eth4: pins-eth4 {
pinmux = <RZN1_PINMUX(48, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
<RZN1_PINMUX(49, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
<RZN1_PINMUX(50, RZN1_FUNC_CLK_ETH_MII_RGMII_RMII)>,
@@ -290,16 +302,101 @@
bias-disable;
};
- pins_i2c2: pins_i2c2 {
+ pins_gpio2: pins-gpio2 {
+ pinmux = <RZN1_PINMUX(147, RZN1_FUNC_GPIO)>,
+ <RZN1_PINMUX(149, RZN1_FUNC_GPIO)>;
+ drive-strength = <6>;
+ bias-pull-up;
+ };
+
+ pins_i2c2: pins-i2c2 {
pinmux = <RZN1_PINMUX(115, RZN1_FUNC_I2C)>,
<RZN1_PINMUX(116, RZN1_FUNC_I2C)>;
drive-strength = <12>;
};
- pins_mdio1: pins_mdio1 {
+ pins_mdio1: pins-mdio1 {
pinmux = <RZN1_PINMUX(152, RZN1_FUNC_MDIO1_SWITCH)>,
<RZN1_PINMUX(153, RZN1_FUNC_MDIO1_SWITCH)>;
};
+
+ pins_qspi0: pins-qspi0 {
+ pinmux = <RZN1_PINMUX(74, RZN1_FUNC_QSPI)>,
+ <RZN1_PINMUX(75, RZN1_FUNC_QSPI)>,
+ <RZN1_PINMUX(76, RZN1_FUNC_QSPI)>,
+ <RZN1_PINMUX(77, RZN1_FUNC_QSPI)>,
+ <RZN1_PINMUX(78, RZN1_FUNC_QSPI)>,
+ <RZN1_PINMUX(79, RZN1_FUNC_QSPI)>;
+ bias-disable;
+ };
+};
+
+&qspi0 {
+ pinctrl-0 = <&pins_qspi0>;
+ pinctrl-names = "default";
+ status = "okay";
+ bootph-all;
+
+ flash@0 {
+ reg = <0>;
+ compatible = "jedec,spi-nor";
+ spi-max-frequency = <62500000>;
+ spi-rx-bus-width = <4>;
+ spi-tx-bus-width = <4>;
+ cdns,read-delay = <1>;
+ cdns,tshsl-ns = <200>;
+ cdns,tsd2d-ns = <255>;
+ cdns,tchsh-ns = <20>;
+ cdns,tslch-ns = <20>;
+ bootph-all;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ /* 64KiB */
+ label = "spl";
+ reg = <0x0000000 0x00010000>;
+ };
+ partition@10000 {
+ /* 64KiB */
+ label = "pkgt";
+ reg = <0x0010000 0x00010000>;
+ };
+ partition@20000 {
+ /* 512KiB */
+ label = "u-boot";
+ reg = <0x0020000 0x00080000>;
+ };
+ partition@a0000 {
+ /* 64KiB */
+ label = "env";
+ reg = <0x00a0000 0x00010000>;
+ };
+ partition@b0000 {
+ /* 128KiB */
+ label = "dtb";
+ reg = <0x00b0000 0x00020000>;
+ };
+ partition@d0000 {
+ /* 1MiB */
+ label = "cm3";
+ reg = <0x00d0000 0x00100000>;
+ };
+ partition@1d0000 {
+ /* 6MiB */
+ label = "kernel";
+ reg = <0x01d0000 0x00600000>;
+ };
+ partition@7d0000 {
+ /* Remaining */
+ label = "data";
+ reg = <0x07d0000 0x1830000>;
+ };
+ };
+ };
};
&rtc0 {
@@ -323,11 +420,13 @@
switch0phy4: ethernet-phy@4 {
reg = <4>;
micrel,led-mode = <1>;
+ interrupts-extended = <&gpio2a 25 IRQ_TYPE_LEVEL_LOW>;
};
switch0phy5: ethernet-phy@5 {
reg = <5>;
micrel,led-mode = <1>;
+ interrupts-extended = <&gpio2a 27 IRQ_TYPE_LEVEL_LOW>;
};
};
};
diff --git a/arch/arm/boot/dts/renesas/r9a06g032.dtsi b/arch/arm/boot/dts/renesas/r9a06g032.dtsi
index f4f760aff28b..daa7d5de575d 100644
--- a/arch/arm/boot/dts/renesas/r9a06g032.dtsi
+++ b/arch/arm/boot/dts/renesas/r9a06g032.dtsi
@@ -15,6 +15,39 @@
#size-cells = <1>;
interrupt-parent = <&gic>;
+ /*
+ * The CPUs clock is based on the 'ref' clock (output of OPPDIV divisor)
+ * with x1, x2 or x4 ratio between the CPUs clock frequency and this
+ * 'ref' clock frequency.
+ *
+ * The table below is built on the assumption that the 'ref' clock
+ * frequency is set to 500MHz which is its default value.
+ *
+ * The table should be overridden in the board device-tree file based
+ * on the 'ref' clock frequency if this frequency value is not the
+ * default one.
+ */
+ cpu_opp_table: opp-table-cpu {
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ opp-125000000 {
+ opp-hz = /bits/ 64 <125000000>;
+ /* ~35 clocks cycles at 125mhz */
+ clock-latency-ns = <300>;
+ };
+
+ opp-250000000 {
+ opp-hz = /bits/ 64 <250000000>;
+ clock-latency-ns = <300>;
+ };
+
+ opp-500000000 {
+ opp-hz = /bits/ 64 <500000000>;
+ clock-latency-ns = <300>;
+ };
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -24,6 +57,7 @@
compatible = "arm,cortex-a7";
reg = <0>;
clocks = <&sysctrl R9A06G032_CLK_A7MP>;
+ operating-points-v2 = <&cpu_opp_table>;
};
cpu@1 {
@@ -33,6 +67,7 @@
clocks = <&sysctrl R9A06G032_CLK_A7MP>;
enable-method = "renesas,r9a06g032-smp";
cpu-release-addr = <0 0x4000c204>;
+ operating-points-v2 = <&cpu_opp_table>;
};
};
@@ -66,6 +101,18 @@
#size-cells = <1>;
ranges;
+ qspi0: spi@40005000 {
+ compatible = "renesas,r9a06g032-qspi", "renesas,rzn1-qspi";
+ reg = <0x40005000 0x1000>, <0x10000000 0x10000000>;
+ interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&sysctrl R9A06G032_CLK_QSPI0>, <&sysctrl R9A06G032_HCLK_QSPI0>,
+ <&sysctrl R9A06G032_HCLK_QSPI0>;
+ clock-names = "ref", "ahb", "apb";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
rtc0: rtc@40006000 {
compatible = "renesas,r9a06g032-rtc", "renesas,rzn1-rtc";
reg = <0x40006000 0x1000>;
diff --git a/arch/arm64/boot/dts/renesas/ebisu.dtsi b/arch/arm64/boot/dts/renesas/ebisu.dtsi
index 692a2b12aa03..aaedb1fb51ae 100644
--- a/arch/arm64/boot/dts/renesas/ebisu.dtsi
+++ b/arch/arm64/boot/dts/renesas/ebisu.dtsi
@@ -53,6 +53,12 @@
power-supply = <&reg_12p0v>;
};
+ pcie_usb_refclk: clk-x7 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <25000000>;
+ };
+
cvbs-in {
compatible = "composite-video-connector";
label = "CVBS IN";
@@ -439,6 +445,13 @@
};
};
+ pcie_usb_clk: clk@68 {
+ compatible = "renesas,9fgv0841";
+ reg = <0x68>;
+ clocks = <&pcie_usb_refclk>;
+ #clock-cells = <1>;
+ };
+
video-receiver@70 {
compatible = "adi,adv7482";
reg = <0x70>;
@@ -577,13 +590,30 @@
};
&pcie_bus_clk {
- clock-frequency = <100000000>;
+ status = "disabled";
};
&pciec0 {
+ clocks = <&cpg CPG_MOD 319>, <&pcie_usb_clk 1>;
status = "okay";
};
+&pciec0_rp {
+ /*
+ * This configuration is valid for SW49 in OFF position,
+ * which means the PCIe signals are routed to the PCIe slot
+ * and U11 9FGV0841 PCIe clock generator output 3 supplies
+ * clock to the PCIe slot.
+ *
+ * In case the SW49 is set to ON position, which means the
+ * PCIe signals are routed to the EX BT/WLAN expansion port,
+ * and U11 9FGV0841 PCIe clock generator output 4 supplies
+ * clock to the port, change clocks below to:
+ * clocks = <&pcie_usb_clk 4>;
+ */
+ clocks = <&pcie_usb_clk 3>;
+};
+
&pfc {
avb_pins: avb {
groups = "avb_link", "avb_mii";
@@ -871,7 +901,18 @@
status = "okay";
};
+&usb3_phy0 {
+ clocks = <&pcie_usb_clk 6>;
+ status = "okay";
+};
+
+&usb3s0_clk {
+ status = "disabled";
+};
+
&usb3_peri0 {
+ phys = <&usb3_phy0>;
+ phy-names = "usb";
companion = <&xhci0>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
index 607f62a448d8..59a0f2e1479d 100644
--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -2814,6 +2814,16 @@
iommu-map = <0 &ipmmu_hc 0 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec0_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
pciec1: pcie@ee800000 {
@@ -2843,6 +2853,16 @@
iommu-map = <0 &ipmmu_hc 1 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec1_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
pciec0_ep: pcie-ep@fe000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
index e64c7b1aebc4..ad36aa8e7543 100644
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
@@ -2619,6 +2619,16 @@
iommu-map = <0 &ipmmu_hc 0 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec0_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
pciec1: pcie@ee800000 {
@@ -2648,6 +2658,16 @@
iommu-map = <0 &ipmmu_hc 1 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec1_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
imr-lx4@fe860000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index 89f6c052c5e0..9d76e39eab72 100644
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -2499,6 +2499,16 @@
iommu-map = <0 &ipmmu_hc 0 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec0_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
pciec1: pcie@ee800000 {
@@ -2528,6 +2538,16 @@
iommu-map = <0 &ipmmu_hc 1 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec1_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
fcpf0: fcp@fe950000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 425561e658ca..611a9335c63a 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -2494,6 +2494,16 @@
iommu-map = <0 &ipmmu_hc 0 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec0_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
pciec1: pcie@ee800000 {
@@ -2523,6 +2533,16 @@
iommu-map = <0 &ipmmu_hc 1 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec1_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
fdp1@fe940000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index d3698f7e494d..fadb5f4effcf 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -1912,6 +1912,16 @@
iommu-map = <0 &ipmmu_hc 0 1>;
iommu-map-mask = <0>;
status = "disabled";
+
+ /* PCIe bridge, Root Port */
+ pciec0_rp: pci@0,0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ compatible = "pciclass,0604";
+ device_type = "pci";
+ ranges;
+ };
};
vspb0: vsp@fe960000 {
@@ -2180,4 +2190,21 @@
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
interrupt-names = "sec-phys", "phys", "virt", "hyp-phys";
};
+
+ /* External USB clock - to be overridden by boards that provide it */
+ usb3s0_clk: usb3s0-clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
+
+ usb3_phy0: usb-phy {
+ compatible = "usb-nop-xceiv";
+ clocks = <&usb3s0_clk>;
+ clock-names = "main_clk";
+ clock-frequency = <100000000>;
+ power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
};
diff --git a/arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts b/arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts
index ff07d984cbf2..3b47e3ce95d4 100644
--- a/arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts
@@ -536,6 +536,10 @@
};
};
+&otp {
+ bootph-all;
+};
+
/* Page 26 / 2230 Key M M.2 */
&pcie0_clkref {
status = "disabled";
@@ -620,6 +624,7 @@
hscif0_pins: hscif0 {
groups = "hscif0_data", "hscif0_ctrl";
function = "hscif0";
+ bootph-all;
};
/* Page 23 / DEBUG */
diff --git a/arch/arm64/boot/dts/renesas/r8a78000.dtsi b/arch/arm64/boot/dts/renesas/r8a78000.dtsi
index 4c97298fa763..3e1c98903cea 100644
--- a/arch/arm64/boot/dts/renesas/r8a78000.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a78000.dtsi
@@ -698,7 +698,7 @@
compatible = "renesas,scif-r8a78000",
"renesas,rcar-gen5-scif", "renesas,scif";
reg = <0 0xc0700000 0 0x40>;
- interrupts = <GIC_SPI 4074 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 10 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -708,7 +708,7 @@
compatible = "renesas,scif-r8a78000",
"renesas,rcar-gen5-scif", "renesas,scif";
reg = <0 0xc0704000 0 0x40>;
- interrupts = <GIC_SPI 4075 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -718,7 +718,7 @@
compatible = "renesas,scif-r8a78000",
"renesas,rcar-gen5-scif", "renesas,scif";
reg = <0 0xc0708000 0 0x40>;
- interrupts = <GIC_SPI 4076 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 12 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -728,7 +728,7 @@
compatible = "renesas,scif-r8a78000",
"renesas,rcar-gen5-scif", "renesas,scif";
reg = <0 0xc070c000 0 0x40>;
- interrupts = <GIC_SPI 4077 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 13 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -738,7 +738,7 @@
compatible = "renesas,hscif-r8a78000",
"renesas,rcar-gen5-hscif", "renesas,hscif";
reg = <0 0xc0710000 0 0x60>;
- interrupts = <GIC_SPI 4078 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -748,7 +748,7 @@
compatible = "renesas,hscif-r8a78000",
"renesas,rcar-gen5-hscif", "renesas,hscif";
reg = <0 0xc0714000 0 0x60>;
- interrupts = <GIC_SPI 4079 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -758,7 +758,7 @@
compatible = "renesas,hscif-r8a78000",
"renesas,rcar-gen5-hscif", "renesas,hscif";
reg = <0 0xc0718000 0 0x60>;
- interrupts = <GIC_SPI 4080 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
@@ -768,7 +768,7 @@
compatible = "renesas,hscif-r8a78000",
"renesas,rcar-gen5-hscif", "renesas,hscif";
reg = <0 0xc071c000 0 0x60>;
- interrupts = <GIC_SPI 4081 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_ESPI 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
status = "disabled";
diff --git a/arch/arm64/boot/dts/renesas/r9a09g056.dtsi b/arch/arm64/boot/dts/renesas/r9a09g056.dtsi
index 9fb15ca24984..9192c5bf7e59 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g056.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a09g056.dtsi
@@ -639,6 +639,21 @@
status = "disabled";
};
+ rtc: rtc@11c00800 {
+ compatible = "renesas,r9a09g056-rtca3", "renesas,rz-rtca3";
+ reg = <0 0x11c00800 0 0x400>;
+ interrupts = <GIC_SPI 524 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 525 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 526 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "alarm", "period", "carry";
+ clocks = <&cpg CPG_MOD 0x53>, <&rtxin_clk>;
+ clock-names = "bus", "counter";
+ power-domains = <&cpg>;
+ resets = <&cpg 0x79>, <&cpg 0x7a>;
+ reset-names = "rtc", "rtest";
+ status = "disabled";
+ };
+
scif: serial@11c01400 {
compatible = "renesas,scif-r9a09g056",
"renesas,scif-r9a09g057";
@@ -769,6 +784,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7b>, <&cpg 0x7c>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x448c>, <&dmac0 0x448d>,
+ <&dmac1 0x448c>, <&dmac1 0x448d>,
+ <&dmac2 0x448c>, <&dmac2 0x448d>,
+ <&dmac3 0x448c>, <&dmac3 0x448d>,
+ <&dmac4 0x448c>, <&dmac4 0x448d>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -790,6 +812,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7d>, <&cpg 0x7e>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x448e>, <&dmac0 0x448f>,
+ <&dmac1 0x448e>, <&dmac1 0x448f>,
+ <&dmac2 0x448e>, <&dmac2 0x448f>,
+ <&dmac3 0x448e>, <&dmac3 0x448f>,
+ <&dmac4 0x448e>, <&dmac4 0x448f>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -811,6 +840,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7f>, <&cpg 0x80>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x4490>, <&dmac0 0x4491>,
+ <&dmac1 0x4490>, <&dmac1 0x4491>,
+ <&dmac2 0x4490>, <&dmac2 0x4491>,
+ <&dmac3 0x4490>, <&dmac3 0x4491>,
+ <&dmac4 0x4490>, <&dmac4 0x4491>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts b/arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts
index 9af50198d2f1..c191ecb39713 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts
+++ b/arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts
@@ -446,6 +446,10 @@
clock-frequency = <24000000>;
};
+&rtc {
+ status = "okay";
+};
+
&rtxin_clk {
clock-frequency = <32768>;
};
diff --git a/arch/arm64/boot/dts/renesas/r9a09g057.dtsi b/arch/arm64/boot/dts/renesas/r9a09g057.dtsi
index 80cba9fcfe7b..9581af58024e 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g057.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a09g057.dtsi
@@ -581,16 +581,6 @@
status = "disabled";
};
- wdt0: watchdog@11c00400 {
- compatible = "renesas,r9a09g057-wdt";
- reg = <0 0x11c00400 0 0x400>;
- clocks = <&cpg CPG_MOD 0x4b>, <&cpg CPG_MOD 0x4c>;
- clock-names = "pclk", "oscclk";
- resets = <&cpg 0x75>;
- power-domains = <&cpg>;
- status = "disabled";
- };
-
wdt1: watchdog@14400000 {
compatible = "renesas,r9a09g057-wdt";
reg = <0 0x14400000 0 0x400>;
@@ -601,26 +591,6 @@
status = "disabled";
};
- wdt2: watchdog@13000000 {
- compatible = "renesas,r9a09g057-wdt";
- reg = <0 0x13000000 0 0x400>;
- clocks = <&cpg CPG_MOD 0x4f>, <&cpg CPG_MOD 0x50>;
- clock-names = "pclk", "oscclk";
- resets = <&cpg 0x77>;
- power-domains = <&cpg>;
- status = "disabled";
- };
-
- wdt3: watchdog@13000400 {
- compatible = "renesas,r9a09g057-wdt";
- reg = <0 0x13000400 0 0x400>;
- clocks = <&cpg CPG_MOD 0x51>, <&cpg CPG_MOD 0x52>;
- clock-names = "pclk", "oscclk";
- resets = <&cpg 0x78>;
- power-domains = <&cpg>;
- status = "disabled";
- };
-
rtc: rtc@11c00800 {
compatible = "renesas,r9a09g057-rtca3", "renesas,rz-rtca3";
reg = <0 0x11c00800 0 0x400>;
@@ -765,6 +735,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7b>, <&cpg 0x7c>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x448c>, <&dmac0 0x448d>,
+ <&dmac1 0x448c>, <&dmac1 0x448d>,
+ <&dmac2 0x448c>, <&dmac2 0x448d>,
+ <&dmac3 0x448c>, <&dmac3 0x448d>,
+ <&dmac4 0x448c>, <&dmac4 0x448d>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -786,6 +763,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7d>, <&cpg 0x7e>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x448e>, <&dmac0 0x448f>,
+ <&dmac1 0x448e>, <&dmac1 0x448f>,
+ <&dmac2 0x448e>, <&dmac2 0x448f>,
+ <&dmac3 0x448e>, <&dmac3 0x448f>,
+ <&dmac4 0x448e>, <&dmac4 0x448f>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -807,6 +791,13 @@
clock-names = "pclk", "pclk_sfr", "tclk";
resets = <&cpg 0x7f>, <&cpg 0x80>;
reset-names = "presetn", "tresetn";
+ dmas = <&dmac0 0x4490>, <&dmac0 0x4491>,
+ <&dmac1 0x4490>, <&dmac1 0x4491>,
+ <&dmac2 0x4490>, <&dmac2 0x4491>,
+ <&dmac3 0x4490>, <&dmac3 0x4491>,
+ <&dmac4 0x4490>, <&dmac4 0x4491>;
+ dma-names = "rx", "tx", "rx", "tx", "rx",
+ "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/renesas/r9a09g077.dtsi b/arch/arm64/boot/dts/renesas/r9a09g077.dtsi
index 14d7fb6f8952..81f6a36e6e72 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g077.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a09g077.dtsi
@@ -200,6 +200,10 @@
clocks = <&cpg CPG_CORE R9A09G077_CLK_PCLKM>,
<&cpg CPG_MOD 104>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x267a>, <&dmac0 0x267b>,
+ <&dmac1 0x267a>, <&dmac1 0x267b>,
+ <&dmac2 0x267a>, <&dmac2 0x267b>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -218,6 +222,10 @@
clocks = <&cpg CPG_CORE R9A09G077_CLK_PCLKM>,
<&cpg CPG_MOD 105>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x267f>, <&dmac0 0x2680>,
+ <&dmac1 0x267f>, <&dmac1 0x2680>,
+ <&dmac2 0x267f>, <&dmac2 0x2680>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -236,6 +244,10 @@
clocks = <&cpg CPG_CORE R9A09G077_CLK_PCLKM>,
<&cpg CPG_MOD 106>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x2684>, <&dmac0 0x2685>,
+ <&dmac1 0x2684>, <&dmac1 0x2685>,
+ <&dmac2 0x2684>, <&dmac2 0x2685>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -254,6 +266,10 @@
clocks = <&cpg CPG_CORE R9A09G077_CLK_PCLKM>,
<&cpg CPG_MOD 602>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x2689>, <&dmac0 0x268a>,
+ <&dmac1 0x2689>, <&dmac1 0x268a>,
+ <&dmac2 0x2689>, <&dmac2 0x268a>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -974,8 +990,8 @@
cpg: clock-controller@80280000 {
compatible = "renesas,r9a09g077-cpg-mssr";
- reg = <0 0x80280000 0 0x1000>,
- <0 0x81280000 0 0x9000>;
+ reg = <0 0x80280000 0 0x10000>,
+ <0 0x81280000 0 0x10000>;
clocks = <&extal_clk>;
clock-names = "extal";
#clock-cells = <2>;
diff --git a/arch/arm64/boot/dts/renesas/r9a09g087.dtsi b/arch/arm64/boot/dts/renesas/r9a09g087.dtsi
index 4a1339561332..6218cef2fca5 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g087.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a09g087.dtsi
@@ -200,6 +200,10 @@
clocks = <&cpg CPG_CORE R9A09G087_CLK_PCLKM>,
<&cpg CPG_MOD 104>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x267a>, <&dmac0 0x267b>,
+ <&dmac1 0x267a>, <&dmac1 0x267b>,
+ <&dmac2 0x267a>, <&dmac2 0x267b>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -218,6 +222,10 @@
clocks = <&cpg CPG_CORE R9A09G087_CLK_PCLKM>,
<&cpg CPG_MOD 105>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x267f>, <&dmac0 0x2680>,
+ <&dmac1 0x267f>, <&dmac1 0x2680>,
+ <&dmac2 0x267f>, <&dmac2 0x2680>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -236,6 +244,10 @@
clocks = <&cpg CPG_CORE R9A09G087_CLK_PCLKM>,
<&cpg CPG_MOD 106>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x2684>, <&dmac0 0x2685>,
+ <&dmac1 0x2684>, <&dmac1 0x2685>,
+ <&dmac2 0x2684>, <&dmac2 0x2685>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -254,6 +266,10 @@
clocks = <&cpg CPG_CORE R9A09G087_CLK_PCLKM>,
<&cpg CPG_MOD 602>;
clock-names = "pclk", "pclkspi";
+ dmas = <&dmac0 0x2689>, <&dmac0 0x268a>,
+ <&dmac1 0x2689>, <&dmac1 0x268a>,
+ <&dmac2 0x2689>, <&dmac2 0x268a>;
+ dma-names = "rx", "tx", "rx", "tx", "rx", "tx";
power-domains = <&cpg>;
#address-cells = <1>;
#size-cells = <0>;
@@ -977,8 +993,8 @@
cpg: clock-controller@80280000 {
compatible = "renesas,r9a09g087-cpg-mssr";
- reg = <0 0x80280000 0 0x1000>,
- <0 0x81280000 0 0x9000>;
+ reg = <0 0x80280000 0 0x10000>,
+ <0 0x81280000 0 0x10000>;
clocks = <&extal_clk>;
clock-names = "extal";
#clock-cells = <2>;
diff --git a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
index 982f17aafbc5..b45acfe6288a 100644
--- a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
@@ -162,7 +162,7 @@
<100000000>;
renesas,settings = [
80 00 11 19 4c 42 dc 2f 06 7d 20 1a 5f 1e f2 27
- 00 40 00 00 00 00 00 00 06 0c 19 02 3f f0 90 86
+ 00 40 00 00 00 00 00 00 06 0c 19 02 3b f0 90 86
a0 80 30 30 9c
];
};
diff --git a/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi b/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
index 510399febf29..f87c2492f414 100644
--- a/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-common.dtsi
@@ -53,6 +53,7 @@
regulator-max-microvolt = <3300000>;
gpios-states = <0>;
states = <3300000 0>, <1800000 1>;
+ regulator-ramp-delay = <60>;
};
#endif
diff --git a/arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso b/arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso
index 0af1e0a6c7f4..fc53c1aae3b5 100644
--- a/arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso
+++ b/arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso
@@ -25,6 +25,7 @@
regulator-max-microvolt = <3300000>;
gpios-states = <0>;
states = <3300000 0>, <1800000 1>;
+ regulator-ramp-delay = <60>;
};
};
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index d4a921bed4c3..e505161caa67 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -75,6 +75,12 @@
enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
};
+ pcie_usb_refclk: clk-x7 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <25000000>;
+ };
+
cvbs-in {
compatible = "composite-video-connector";
label = "CVBS IN";
@@ -523,6 +529,13 @@
#gpio-cells = <2>;
};
+ pcie_usb_clk: clk@68 {
+ compatible = "renesas,9fgv0841";
+ reg = <0x68>;
+ clocks = <&pcie_usb_refclk>;
+ #clock-cells = <1>;
+ };
+
video-receiver@70 {
compatible = "adi,adv7482";
reg = <0x70 0x71 0x72 0x73 0x74 0x75
@@ -640,17 +653,27 @@
};
&pcie_bus_clk {
- clock-frequency = <100000000>;
+ status = "disabled";
};
&pciec0 {
+ clocks = <&cpg CPG_MOD 319>, <&pcie_usb_clk 1>;
status = "okay";
};
+&pciec0_rp {
+ clocks = <&pcie_usb_clk 3>;
+};
+
&pciec1 {
+ clocks = <&cpg CPG_MOD 318>, <&pcie_usb_clk 2>;
status = "okay";
};
+&pciec1_rp {
+ clocks = <&pcie_usb_clk 4>;
+};
+
&pfc {
pinctrl-0 = <&scif_clk_pins>;
pinctrl-names = "default";
@@ -1038,11 +1061,12 @@
};
&usb3_phy0 {
+ clocks = <&cpg CPG_MOD 328>, <&pcie_usb_clk 6>, <&usb_extal_clk>;
status = "okay";
};
&usb3s0_clk {
- clock-frequency = <100000000>;
+ status = "disabled";
};
&vin0 {
diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 2a157d1efb3d..97014bcfbb1d 100644
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -351,20 +351,30 @@
};
&pcie_bus_clk {
- clock-frequency = <100000000>;
+ status = "disabled";
};
&pciec0 {
+ clocks = <&cpg CPG_MOD 319>, <&pcie_usb_clk 1>;
status = "okay";
};
+&pciec0_rp {
+ clocks = <&pcie_usb_clk 3>;
+};
+
&pciec1 {
+ clocks = <&cpg CPG_MOD 318>, <&pcie_usb_clk 2>;
status = "okay";
vpcie1v5-supply = <&pcie_1v5>;
vpcie3v3-supply = <&pcie_3v3>;
};
+&pciec1_rp {
+ clocks = <&pcie_usb_clk 4>;
+};
+
&pfc {
can0_pins: can0 {
groups = "can0_data_a";
@@ -475,6 +485,15 @@
status = "okay";
};
+&usb3_phy0 {
+ clocks = <&cpg CPG_MOD 328>, <&pcie_usb_clk 6>, <&usb_extal_clk>;
+ status = "okay";
+};
+
+&usb3s0_clk {
+ status = "disabled";
+};
+
&xhci0 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 241caf737abb..67fd6a65db89 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -47,6 +47,12 @@
clock-frequency = <12288000>;
};
+ pcie_usb_refclk: clk-x24 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <25000000>;
+ };
+
hdmi0-out {
compatible = "hdmi-connector";
type = "a";
@@ -232,6 +238,13 @@
clock-frequency = <400000>;
+ pcie_usb_clk: clk@68 {
+ compatible = "renesas,9fgv0841";
+ reg = <0x68>;
+ clocks = <&pcie_usb_refclk>;
+ #clock-cells = <1>;
+ };
+
versaclock5: clock-generator@6a {
compatible = "idt,5p49v5925";
reg = <0x6a>;