3 files changed, 2 insertions, 62 deletions
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7795.h b/arch/arm/mach-rmobile/include/mach/r8a7795.h
deleted file mode 100644
index 23e4399479..0000000000
--- a/arch/arm/mach-rmobile/include/mach/r8a7795.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/arm/mach-rmobile/include/mach/r8a7795.h
- *	This file defines registers and value for r8a7795.
- *
- * Copyright (C) 2015 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __ASM_ARCH_R8A7795_H
-#define __ASM_ARCH_R8A7795_H
-
-#include "rcar-gen3-base.h"
-
-/* Module stop control/status register bits */
-#define MSTP0_BITS	0x00640800
-#define MSTP1_BITS	0xF3EE9390
-#define MSTP2_BITS	0x340FAFDC
-#define MSTP3_BITS	0xD80C7CDF
-#define MSTP4_BITS	0x80000184
-#define MSTP5_BITS	0x40BFFF46
-#define MSTP6_BITS	0xE5FBEECF
-#define MSTP7_BITS	0x39FFFF0E
-#define MSTP8_BITS	0x01F19FF4
-#define MSTP9_BITS	0xFFDFFFFF
-#define MSTP10_BITS	0xFFFEFFE0
-#define MSTP11_BITS	0x00000000
-
-#endif /* __ASM_ARCH_R8A7795_H */
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7796.h b/arch/arm/mach-rmobile/include/mach/r8a7796.h
deleted file mode 100644
index 67e24bcf98..0000000000
--- a/arch/arm/mach-rmobile/include/mach/r8a7796.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/arm/include/asm/arch-rcar_gen3/r8a7796.h
- *	This file defines registers and value for r8a7796.
- *
- * Copyright (C) 2016 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __ASM_ARCH_R8A7796_H
-#define __ASM_ARCH_R8A7796_H
-
-#include "rcar-gen3-base.h"
-
-/* Module stop control/status register bits */
-#define MSTP0_BITS	0x00200000
-#define MSTP1_BITS	0xFFFFFFFF
-#define MSTP2_BITS	0x340E2FDC
-#define MSTP3_BITS	0xFFFFFFDF
-#define MSTP4_BITS	0x80000184
-#define MSTP5_BITS	0xC3FFFFFF
-#define MSTP6_BITS	0xFFFFFFFF
-#define MSTP7_BITS	0xFFFFFFFF
-#define MSTP8_BITS	0x01F1FFF7
-#define MSTP9_BITS	0xFFFFFFFE
-#define MSTP10_BITS	0xFFFEFFE0
-#define MSTP11_BITS	0x000000B7
-
-#endif /* __ASM_ARCH_R8A7796_H */
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index 654349b0b3..5958eda1dd 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -16,10 +16,8 @@
 #include <asm/arch/r8a7793.h>
 #elif defined(CONFIG_R8A7794)
 #include <asm/arch/r8a7794.h>
-#elif defined(CONFIG_R8A7795)
-#include <asm/arch/r8a7795.h>
-#elif defined(CONFIG_R8A7796)
-#include <asm/arch/r8a7796.h>
+#elif defined(CONFIG_RCAR_GEN3)
+#include <asm/arch/rcar-gen3-base.h>
 #else
 #error "SOC Name not defined"
 #endif