From 70f3b164a6e18f6702db06754129efe8284bc9fc Mon Sep 17 00:00:00 2001 From: Eugeniu Rosca Date: Tue, 9 Jul 2019 18:27:12 +0200 Subject: [PATCH] dt-bindings: Synchronize R-Car Gen3 headers with Linux 5.2 Backport and squash below Linux v5.2 commits: Commit id * Summary line da3e1c57caf93e [1] soc: renesas: r8a77970-sysc: Remove non-existent CR7 power domain b5eb730e031aca [1] soc: renesas: r8a77970-sysc: Correct names of A2DP/A2CN power domains 3961d355dfb512 dt-bindings: power: r8a77965: Remove non-existent A3IR power domain (*) Patch id mismatch between Linux and U-Boot commit [1] Dropped changes in drivers/soc/renesas/r8a77970-sysc.c, since the file doesn't exist in U-Boot. Signed-off-by: Eugeniu Rosca --- include/dt-bindings/power/r8a77965-sysc.h | 1 - include/dt-bindings/power/r8a77970-sysc.h | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/dt-bindings/power/r8a77965-sysc.h b/include/dt-bindings/power/r8a77965-sysc.h index 05a4b59..de82d8a 100644 --- a/include/dt-bindings/power/r8a77965-sysc.h +++ b/include/dt-bindings/power/r8a77965-sysc.h @@ -21,7 +21,6 @@ #define R8A77965_PD_A3VC 14 #define R8A77965_PD_3DG_A 17 #define R8A77965_PD_3DG_B 18 -#define R8A77965_PD_A3IR 24 #define R8A77965_PD_A2VC1 26 /* Always-on power area */ diff --git a/include/dt-bindings/power/r8a77970-sysc.h b/include/dt-bindings/power/r8a77970-sysc.h index bf54779..85cc5f2 100644 --- a/include/dt-bindings/power/r8a77970-sysc.h +++ b/include/dt-bindings/power/r8a77970-sysc.h @@ -16,13 +16,12 @@ #define R8A77970_PD_CA53_CPU0 5 #define R8A77970_PD_CA53_CPU1 6 -#define R8A77970_PD_CR7 13 #define R8A77970_PD_CA53_SCU 21 #define R8A77970_PD_A2IR0 23 -#define R8A77970_PD_A3IR 24 +#define R8A77970_PD_A3IR 24 #define R8A77970_PD_A2IR1 27 -#define R8A77970_PD_A2IR2 28 -#define R8A77970_PD_A2IR3 29 +#define R8A77970_PD_A2DP 28 +#define R8A77970_PD_A2CN 29 #define R8A77970_PD_A2SC0 30 #define R8A77970_PD_A2SC1 31 -- 2.7.4