diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2025-05-14 13:31:15 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2025-05-14 13:31:15 +0200 |
| commit | de219001e8b31a49be8a75ddd9c9f79d5b8bb52d (patch) | |
| tree | 656e69e93c470a87a64f4708a76ec1ff0e1fb91c | |
| parent | 73c8af6a66fb0a6e98b768c10bc0347a0de8e464 (diff) | |
| parent | 1064013303c6dd59f1586656f853765c6e870f8b (diff) | |
| download | renesas-devel-next.tar.gz | |
Merge branch 'renesas-dts-for-v6.16' into renesas-nextrenesas-next-2025-05-14-v6.15-rc1next
| -rw-r--r-- | arch/arm64/boot/dts/renesas/Makefile | 1 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index b24dddee3827c7..aa7f996c0546c8 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -94,6 +94,7 @@ dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g2-white-hawk-single.dtb r8a779g2-white-hawk-single-ard-audio-da7212-dtbs := r8a779g2-white-hawk-single.dtb white-hawk-ard-audio-da7212.dtbo dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g2-white-hawk-single-ard-audio-da7212.dtb +DTC_FLAGS_r8a779g3-sparrow-hawk += -Wno-spi_bus_bridge dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g3-sparrow-hawk.dtb r8a779g3-sparrow-hawk-fan-pwm-dtbs := r8a779g3-sparrow-hawk.dtb r8a779g3-sparrow-hawk-fan-pwm.dtbo dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g3-sparrow-hawk-fan-pwm.dtb diff --git a/arch/riscv/boot/dts/renesas/r9a07g043f.dtsi b/arch/riscv/boot/dts/renesas/r9a07g043f.dtsi index e0ddf8f602c79b..a8bcb26f427006 100644 --- a/arch/riscv/boot/dts/renesas/r9a07g043f.dtsi +++ b/arch/riscv/boot/dts/renesas/r9a07g043f.dtsi @@ -143,7 +143,8 @@ }; l2cache: cache-controller@13400000 { - compatible = "andestech,ax45mp-cache", "cache"; + compatible = "renesas,r9a07g043f-ax45mp-cache", "andestech,ax45mp-cache", + "cache"; reg = <0x0 0x13400000 0x0 0x100000>; interrupts = <SOC_PERIPHERAL_IRQ(476) IRQ_TYPE_LEVEL_HIGH>; cache-size = <0x40000>; |