Skip to content

Commit c689300

Browse files
committed
Merge tag 'renesas-fixes-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes
Renesas Fixes for v5.6 - Restore R-Car M3-W support, - Drop deprecated compatible value to ease DT binding conversion to json-schema. * tag 'renesas-fixes-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: dts: r8a7779: Remove deprecated "renesas, rcar-sata" compatible value arm64: defconfig: Replace ARCH_R8A7796 by ARCH_R8A77960 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents f1e4920 + 21b388d commit c689300

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/boot/dts/r8a7779.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
};
378378

379379
sata: sata@fc600000 {
380-
compatible = "renesas,sata-r8a7779", "renesas,rcar-sata";
380+
compatible = "renesas,sata-r8a7779";
381381
reg = <0xfc600000 0x200000>;
382382
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
383383
clocks = <&mstp1_clks R8A7779_CLK_SATA>;

arch/arm64/configs/defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ CONFIG_ARCH_R8A774A1=y
773773
CONFIG_ARCH_R8A774B1=y
774774
CONFIG_ARCH_R8A774C0=y
775775
CONFIG_ARCH_R8A7795=y
776-
CONFIG_ARCH_R8A7796=y
776+
CONFIG_ARCH_R8A77960=y
777777
CONFIG_ARCH_R8A77961=y
778778
CONFIG_ARCH_R8A77965=y
779779
CONFIG_ARCH_R8A77970=y

0 commit comments

Comments
 (0)