Commit c689300b authored Feb 27, 2020 by Olof Johansson

Merge tag 'renesas-fixes-for-v5.6-tag1' of...

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/20200226105236.18368-1-geert+renesas@glider.be


Signed-off-by: Olof Johansson <olof@lixom.net>

parents f1e4920f 21b388dc

arch/arm/boot/dts/r8a7779.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@
		};

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

arch/arm64/configs/defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ CONFIG_ARCH_R8A774A1=y
		CONFIG_ARCH_R8A774B1=y
		CONFIG_ARCH_R8A774C0=y
		CONFIG_ARCH_R8A7795=y
		CONFIG_ARCH_R8A7796=y
		CONFIG_ARCH_R8A77960=y
		CONFIG_ARCH_R8A77961=y
		CONFIG_ARCH_R8A77965=y
		CONFIG_ARCH_R8A77970=y

Admin message