From 83772e1b44231e2965d9375515e664fc3bc1247c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 11 Dec 2019 14:13:11 +0100 Subject: arm64: dts: renesas: Rename r8a7796* to r8a77960* CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit 39e57e14d7eaf818 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W"), to avoid confusion between R-Car M3-W (R8A77960) and R-Car M3-W+ (R8A77961). Rename the DTS files as well, for consistency. Note that DT binding headers, definitions, and compatible values were not renamed, to preserve backward compatibility. Signed-off-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20191211131311.23661-1-geert+renesas@glider.be Reviewed-by: Laurent Pinchart Reviewed-by: Eugeniu Rosca --- .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 83 ---------------------- 1 file changed, 83 deletions(-) delete mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts (limited to 'arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts') diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts deleted file mode 100644 index a1cbfef2053f..000000000000 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +++ /dev/null @@ -1,83 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the Salvator-X 2nd version board with R-Car M3-W - * - * Copyright (C) 2015-2017 Renesas Electronics Corp. - */ - -/dts-v1/; -#include "r8a7796.dtsi" -#include "salvator-xs.dtsi" - -/ { - model = "Renesas Salvator-X 2nd version board based on r8a7796"; - compatible = "renesas,salvator-xs", "renesas,r8a7796"; - - memory@48000000 { - device_type = "memory"; - /* first 128MB is reserved for secure area. */ - reg = <0x0 0x48000000 0x0 0x78000000>; - }; - - memory@600000000 { - device_type = "memory"; - reg = <0x6 0x00000000 0x0 0x80000000>; - }; -}; - -&du { - clocks = <&cpg CPG_MOD 724>, - <&cpg CPG_MOD 723>, - <&cpg CPG_MOD 722>, - <&versaclock6 1>, - <&x21_clk>, - <&versaclock6 2>; - clock-names = "du.0", "du.1", "du.2", - "dclkin.0", "dclkin.1", "dclkin.2"; -}; - -&hdmi0 { - status = "okay"; - - ports { - port@1 { - reg = <1>; - rcar_dw_hdmi0_out: endpoint { - remote-endpoint = <&hdmi0_con>; - }; - }; - port@2 { - reg = <2>; - dw_hdmi0_snd_in: endpoint { - remote-endpoint = <&rsnd_endpoint1>; - }; - }; - }; -}; - -&hdmi0_con { - remote-endpoint = <&rcar_dw_hdmi0_out>; -}; - -&rcar_sound { - ports { - /* rsnd_port0 is on salvator-common */ - 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 */ -}; -- cgit