ARM: shmobile: Remove legacy sh73a0/kzm9g and r8a7740/armadillo

Hi Simon, Magnus,

The KZM-A9-GT and Armadillo-800 EVA boards are now sufficiently supported by DT-based and board-less SH-Mobile AG5 (sh73a0) and R-Mobile A1 (r8a7740) multi-platform kernels.

Lacking areas are:
- USB (it does't work in legacy, neither),
- HDMI on armadillo (it doesn't work in legacy, neither),
- Camera on armadillo (we don't care),
- LCDC:
- on armadillo, this is supported by the board staging code,
- on kzm9g, the LCDC is wired to the legacy INTC, which is not planned to be supported with DT,
- DMAC/IPMMU (no DT bindings are planned).

Hence this patch series removes legacy board and SoC code for sh73a0/kzm9g and r8a7740/armadillo.

It consists of 4 parts:
- Patches 1-4 remove legacy support for kzm9g (board code, defconfig,

    dtb) and sh73a0,
  - Patches 5-8 remove legacy support for armadillo (board code,
    defconfig, dtb) and r8a7740,

- Patches 9-11 remove generic shmobile support code (dma-register.h, legacy PM Domains, zboot) that became unused by the removal of legacy sh73a0/kzm9g and r8a7740/armadillo,
- Patches 12-15 remove legacy sh73a0 and r8a7740 support in the pinctrl drivers.

Dependencies:
- This is against next-20150617,
- To keep up with existing LCDC functionality for armadillo-legacy, the r8a7740/armadillo part (and later parts) depends on "[PATCH v2 0/7] staging: board: armadillo800eva: Board staging for sh_mobile_lcdc_fb" (https://lkml.org/lkml/2015/6/17/115).
However, it can be applied as-is now, and board staging can he handled in parallel (if at all).

Thanks for applying!

Geert Uytterhoeven (15):
ARM: shmobile: Remove legacy board code for KZM-A9-GT
ARM: shmobile: Remove legacy kzm9g_defconfig
ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
ARM: shmobile: Remove legacy armadillo800eva_defconfig
ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
ARM: shmobile: Remove legacy SoC code for R-Mobile A1
ARM: shmobile: Remove unused dma-register.h
ARM: shmobile: R-Mobile: Remove legacy PM Domain code
ARM: shmobile: Remove obsolete zboot support
pinctrl: sh-pfc: sh73a0: Remove obsolete multi-platform check
pinctrl: sh-pfc: Remove obsolete sh73a0 platform_device_id entry
pinctrl: sh-pfc: r8a7740: Remove obsolete multi-platform check
pinctrl: sh-pfc: Remove obsolete r8a7740 platform_device_id entry

 MAINTAINERS                                        |    2 -
 arch/arm/boot/compressed/Makefile                  |    4 -
 arch/arm/boot/compressed/head-shmobile.S           |   71 -
 arch/arm/boot/dts/Makefile                         |    4 +-
 arch/arm/configs/armadillo800eva_defconfig         |  162 ---
 arch/arm/configs/kzm9g_defconfig                   |  154 ---
 arch/arm/mach-shmobile/Kconfig                     |   33 -
 arch/arm/mach-shmobile/Makefile                    |    8 +-
 arch/arm/mach-shmobile/Makefile.boot               |    2 -
 arch/arm/mach-shmobile/board-armadillo800eva.c     | 1365 --------------------
 arch/arm/mach-shmobile/board-kzm9g.c               |  916 -------------
 arch/arm/mach-shmobile/clock-r8a7740.c             |  675 ----------
 arch/arm/mach-shmobile/clock-sh73a0.c              |  752 -----------
 arch/arm/mach-shmobile/dma-register.h              |   84 --
 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt |  410 ------
 arch/arm/mach-shmobile/include/mach/zboot.h        |   19 -
 arch/arm/mach-shmobile/include/mach/zboot_macros.h |  108 --
 arch/arm/mach-shmobile/intc-sh73a0.c               |  337 -----
 arch/arm/mach-shmobile/pm-r8a7740.c                |  129 --
 arch/arm/mach-shmobile/pm-rmobile.c                |   39 -
 arch/arm/mach-shmobile/pm-rmobile.h                |   24 -
 arch/arm/mach-shmobile/pm-sh73a0.c                 |   32 -
 arch/arm/mach-shmobile/r8a7740.h                   |   58 -
 arch/arm/mach-shmobile/setup-r8a7740.c             |  732 +----------
 arch/arm/mach-shmobile/setup-sh73a0.c              |  739 +----------
 arch/arm/mach-shmobile/sh73a0.h                    |   83 --
 arch/arm/mach-shmobile/smp-sh73a0.c                |    8 -
 drivers/pinctrl/sh-pfc/core.c                      |    6 -
 drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |    4 -
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |    4 -
 30 files changed, 7 insertions(+), 6957 deletions(-)
 delete mode 100644 arch/arm/boot/compressed/head-shmobile.S
 delete mode 100644 arch/arm/configs/armadillo800eva_defconfig
 delete mode 100644 arch/arm/configs/kzm9g_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c
 delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c
 delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c
 delete mode 100644 arch/arm/mach-shmobile/dma-register.h
 delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
 delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h
 delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h
 delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c
 delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c
 delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c
 delete mode 100644 arch/arm/mach-shmobile/r8a7740.h

1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

The KZM-A9-GT board is sufficiently supported by DT-based and board-less SH-Mobile AG5 (sh73a0) multiplatform kernels. Hence remove the legacy board code to reduce maintenance effort.

Lacking areas are:
- USB (it does't work in legacy, neither),
- LCDC (the LCDC is wired to the legacy INTC, which is not planned to be supported with DT).
- DMAC/IPMMU (no DT bindings are planned).

---
 arch/arm/mach-shmobile/Kconfig                     |   8 -
 arch/arm/mach-shmobile/Makefile                    |   1 -
 arch/arm/mach-shmobile/Makefile.boot               |   1 -
 arch/arm/mach-shmobile/board-kzm9g.c               | 916 ---------------------
 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 ---------
 arch/arm/mach-shmobile/include/mach/zboot.h        |   5 -
 arch/arm/mach-shmobile/intc-sh73a0.c               | 337 --------
 7 files changed, 1678 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c
 delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
 delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c

index 429157d437f518c4..2a4d8348b6299dff 100644
@@ -176,14 +176,6 @@ config MACH_MARZEN
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select USE_OF
 
-config MACH_KZM9G
-	bool "KZM-A9-GT board"
-	depends on ARCH_SH73A0
-	select ARCH_REQUIRE_GPIOLIB
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select SND_SOC_AK4642 if SND_SIMPLE_CARD
-	select USE_OF
-
 comment "Renesas ARM SoCs System Configuration"
 
 config CPU_HAS_INTEVT

index def7a093d99cfaf9..9bdb8a11acb10c4e 100644
@@ -60,7 +60,6 @@ obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
-obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o intc-sh73a0.o
 endif
 
 # Framework support

index e1ef19cef89c7f34..2269b1c3c30b108a 100644
@@ -3,7 +3,6 @@ loadaddr-y	:=
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
-loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
 
 __ZRELADDR	:= $(sort $(loadaddr-y))

index 175ee05465da19eb..80f599f4b5ab5733 100644
@@ -9,11 +9,6 @@
  *
  **************************************************/
 
-#ifdef CONFIG_MACH_KZM9G
-#define MEMORY_START	0x43000000
-#include "mach/head-kzm9g.txt"
-#else
 #error "unsupported board."
-#endif
 
 #endif /* ZBOOT_H */

1.9.1

The legacy board code for KZM-A9-GT has been removed.

---
 MAINTAINERS                      |   1 -
 arch/arm/configs/kzm9g_defconfig | 154 ---------------------------------------
 2 files changed, 155 deletions(-)
 delete mode 100644 arch/arm/configs/kzm9g_defconfig

index eaadc4a87d38bf64..f1fe0cc0dadee9df 100644
@@ -1457,7 +1457,6 @@ F:	arch/arm/boot/dts/r8a*
 F:	arch/arm/boot/dts/sh*
 F:	arch/arm/configs/armadillo800eva_defconfig
 F:	arch/arm/configs/bockw_defconfig
-F:	arch/arm/configs/kzm9g_defconfig
 F:	arch/arm/configs/marzen_defconfig
 F:	arch/arm/configs/shmobile_defconfig
 F:	arch/arm/include/debug/renesas-scif.S

1.9.1

The legacy board code for KZM-A9-GT has been removed.

---
 arch/arm/boot/dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

index 679d7cc2f57c4981..e9eed01d48c5ccb5 100644
@@ -504,8 +504,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
-	r8a7779-marzen.dtb \
-	sh73a0-kzm9g.dtb
+	r8a7779-marzen.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
 	emev2-kzm9d.dtb \
 	r7s72100-genmai.dtb \

1.9.1

The last user of the SH-Mobile AG5 (sh73a0) legacy SoC code was the KZM-A9-GT legacy board code, which has been removed.

---
 arch/arm/mach-shmobile/Kconfig        |   9 -
 arch/arm/mach-shmobile/Makefile       |   3 +-
 arch/arm/mach-shmobile/clock-sh73a0.c | 752 ----------------------------------
 arch/arm/mach-shmobile/pm-sh73a0.c    |  32 --
 arch/arm/mach-shmobile/setup-sh73a0.c | 739 +--------------------------------
 arch/arm/mach-shmobile/sh73a0.h       |  83 ----
 arch/arm/mach-shmobile/smp-sh73a0.c   |   8 -
 7 files changed, 2 insertions(+), 1624 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c
 delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c

index 2a4d8348b6299dff..bc8e2f60fe505ee2 100644
@@ -108,15 +108,6 @@ if ARCH_SHMOBILE_LEGACY
 
 comment "Renesas ARM SoCs System Type"
 
-config ARCH_SH73A0
-	bool "SH-Mobile AG5 (R8A73A00)"
-	select ARCH_RMOBILE
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select ARM_GIC
-	select I2C
-	select SH_INTC
-	select RENESAS_INTC_IRQPIN
-
 config ARCH_R8A7740
 	bool "R-Mobile A1 (R8A77400)"
 	select ARCH_RMOBILE

index 9bdb8a11acb10c4e..7e20ab3021be0ff2 100644
@@ -6,7 +6,7 @@
 obj-y				:= timer.o console.o
 
 # CPU objects
-obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o pm-sh73a0.o
+obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
 obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o pm-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

@@ -21,7 +21,6 @@ obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o
 # Clock objects
 ifndef CONFIG_COMMON_CLK
 obj-y				+= clock.o
-obj-$(CONFIG_ARCH_SH73A0)	+= clock-sh73a0.o
 obj-$(CONFIG_ARCH_R8A7740)	+= clock-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o

deleted file mode 100644
index a7e466817965e3b8..0000000000000000
@@ -1,32 +0,0 @@
-/*
- * sh73a0 Power management support
- *
- *  Copyright (C) 2012 Bastian Hecht <[email protected]>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/suspend.h>
-#include "common.h"
-
-#ifdef CONFIG_SUSPEND
-static int sh73a0_enter_suspend(suspend_state_t suspend_state)
-{
-	cpu_do_idle();
-	return 0;
-}
-
-static void sh73a0_suspend_init(void)
-{
-	shmobile_suspend_ops.enter = sh73a0_enter_suspend;
-}
-#else
-static void sh73a0_suspend_init(void) {}
-#endif
-
-void __init sh73a0_pm_init(void)
-{
-	sh73a0_suspend_init();
-}

index 2106d6b76a069392..d03aa11fb46dad19 100644
@@ -33,14 +33,6 @@
 
 #define SH73A0_SCU_BASE 0xf0000000
 
-#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM)
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, SH73A0_SCU_BASE + 0x600, 29);
-void __init sh73a0_register_twd(void)
-{
-	twd_local_timer_register(&twd_local_timer);
-}
-#endif
-
 static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
 	unsigned int lcpu = cpu_logical_map(cpu);

1.9.1

The Armadillo-800 EVA board is sufficiently supported by DT-based and board-less R-Mobile A1 (r8a7740) multiplatform kernels, and board staging code. Hence remove the legacy board code to reduce maintenance effort.

Lacking areas are:
- USB (it doesn't work in legacy, neither),
- HDMI (it doesn't work in legacy, neither),
- Camera (we don't care),
- DMAC/IPMMU (no DT bindings are planned).

---
 arch/arm/mach-shmobile/Kconfig                 |    9 -
 arch/arm/mach-shmobile/Makefile                |    1 -
 arch/arm/mach-shmobile/Makefile.boot           |    1 -
 arch/arm/mach-shmobile/board-armadillo800eva.c | 1365 ------------------------
 4 files changed, 1376 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c

index bc8e2f60fe505ee2..e256c6b664710099 100644
@@ -129,15 +129,6 @@ config ARCH_R8A7779
 
 comment "Renesas ARM SoCs Board Type"
 
-config MACH_ARMADILLO800EVA
-	bool "Armadillo-800 EVA board"
-	depends on ARCH_R8A7740
-	select ARCH_REQUIRE_GPIOLIB
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select SMSC_PHY if SH_ETH
-	select SND_SOC_WM8978 if SND_SIMPLE_CARD && I2C
-	select USE_OF
-
 config MACH_BOCKW
 	bool "BOCK-W platform"
 	depends on ARCH_R8A7778

index 7e20ab3021be0ff2..4ffd7428353b53f9 100644
@@ -58,7 +58,6 @@ else
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
-obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
 endif
 
 # Framework support

index 2269b1c3c30b108a..14cdfc0ed0755a59 100644
@@ -1,6 +1,5 @@
 # per-board load address for uImage
 loadaddr-y	:=
-loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000

1.9.1

The legacy board code for Armadillo-800 EVA has been removed.

---
 MAINTAINERS                                |   1 -
 arch/arm/configs/armadillo800eva_defconfig | 162 -----------------------------
 2 files changed, 163 deletions(-)
 delete mode 100644 arch/arm/configs/armadillo800eva_defconfig

index f1fe0cc0dadee9df..32ee18a233b6db80 100644
@@ -1455,7 +1455,6 @@ F:	arch/arm/boot/dts/emev2*
 F:	arch/arm/boot/dts/r7s*
 F:	arch/arm/boot/dts/r8a*
 F:	arch/arm/boot/dts/sh*
-F:	arch/arm/configs/armadillo800eva_defconfig
 F:	arch/arm/configs/bockw_defconfig
 F:	arch/arm/configs/marzen_defconfig
 F:	arch/arm/configs/shmobile_defconfig

1.9.1

The legacy board code for Armadillo-800 EVA has been removed.

---
 arch/arm/boot/dts/Makefile | 1 -
 1 file changed, 1 deletion(-)

index e9eed01d48c5ccb5..332e9b1ed7a02c8f 100644
@@ -501,7 +501,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
 	s5pv210-smdkv210.dtb \
 	s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
-	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
 	r8a7779-marzen.dtb

1.9.1

The last user of the R-Mobile A1 (r8a7740) legacy SoC code was the Armadillo-800 EVA legacy board code, which has been removed.

---
 arch/arm/mach-shmobile/Kconfig         |   7 -
 arch/arm/mach-shmobile/Makefile        |   3 +-
 arch/arm/mach-shmobile/clock-r8a7740.c | 675 ------------------------------
 arch/arm/mach-shmobile/pm-r8a7740.c    | 129 ------
 arch/arm/mach-shmobile/r8a7740.h       |  58 ---
 arch/arm/mach-shmobile/setup-r8a7740.c | 732 +--------------------------------
 6 files changed, 4 insertions(+), 1600 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c
 delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c
 delete mode 100644 arch/arm/mach-shmobile/r8a7740.h

index e256c6b664710099..050bcd504458f6f0 100644
@@ -108,13 +108,6 @@ if ARCH_SHMOBILE_LEGACY
 
 comment "Renesas ARM SoCs System Type"
 
-config ARCH_R8A7740
-	bool "R-Mobile A1 (R8A77400)"
-	select ARCH_RMOBILE
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select ARM_GIC
-	select RENESAS_INTC_IRQPIN
-
 config ARCH_R8A7778
 	bool "R-Car M1A (R8A77781)"
 	select ARCH_RCAR_GEN1

index 4ffd7428353b53f9..6cb095107f905d02 100644
@@ -8,7 +8,7 @@ obj-y				:= timer.o console.o
 # CPU objects
 obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o pm-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

@@ -21,7 +21,6 @@ obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o
 # Clock objects
 ifndef CONFIG_COMMON_CLK
 obj-y				+= clock.o
-obj-$(CONFIG_ARCH_R8A7740)	+= clock-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o
 endif

1.9.1

The last users of "dma-register.h" were the sh73a0 and r8a7740 legacy SoC code, which have been removed.

---
 arch/arm/mach-shmobile/dma-register.h | 84 -----------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/dma-register.h

deleted file mode 100644
index 52a2f66e600f2995..0000000000000000
@@ -1,84 +0,0 @@
-/*
- * SH-ARM CPU-specific DMA definitions, used by both DMA drivers
- *
- * Copyright (C) 2012 Renesas Solutions Corp
- *
- * Kuninori Morimoto <[email protected]>
- *
- * Based on arch/sh/include/cpu-sh4/cpu/dma-register.h
- * Copyright (C) 2010 Guennadi Liakhovetski <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef DMA_REGISTER_H
-#define DMA_REGISTER_H
-
-/*
- *		Direct Memory Access Controller
- */
-
-/* Transmit sizes and respective CHCR register values */
-enum {
-	XMIT_SZ_8BIT		= 0,
-	XMIT_SZ_16BIT		= 1,
-	XMIT_SZ_32BIT		= 2,
-	XMIT_SZ_64BIT		= 7,
-	XMIT_SZ_128BIT		= 3,
-	XMIT_SZ_256BIT		= 4,
-	XMIT_SZ_512BIT		= 5,
-};
-
-/* log2(size / 8) - used to calculate number of transfers */
-static const unsigned int dma_ts_shift[] = {
-	[XMIT_SZ_8BIT]		= 0,
-	[XMIT_SZ_16BIT]		= 1,
-	[XMIT_SZ_32BIT]		= 2,
-	[XMIT_SZ_64BIT]		= 3,
-	[XMIT_SZ_128BIT]	= 4,
-	[XMIT_SZ_256BIT]	= 5,
-	[XMIT_SZ_512BIT]	= 6,
-};
-
-#define TS_LOW_BIT	0x3 /* --xx */
-#define TS_HI_BIT	0xc /* xx-- */
-
-#define TS_LOW_SHIFT	(3)
-#define TS_HI_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
-
-#define TS_INDEX2VAL(i) \
-	((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\
-	 (((i) & TS_HI_BIT)  << TS_HI_SHIFT))
-
-#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL((xmit_sz)))
-#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL((xmit_sz)))
-
-
-/*
- *		USB High-Speed DMAC
- */
-/* Transmit sizes and respective CHCR register values */
-enum {
-	USBTS_XMIT_SZ_8BYTE		= 0,
-	USBTS_XMIT_SZ_16BYTE		= 1,
-	USBTS_XMIT_SZ_32BYTE		= 2,
-};
-
-/* log2(size / 8) - used to calculate number of transfers */
-static const unsigned int dma_usbts_shift[] = {
-	[USBTS_XMIT_SZ_8BYTE]	= 3,
-	[USBTS_XMIT_SZ_16BYTE]	= 4,
-	[USBTS_XMIT_SZ_32BYTE]	= 5,
-};
-
-#define USBTS_LOW_BIT	0x3 /* --xx */
-#define USBTS_HI_BIT	0x0 /* ---- */
-
-#define USBTS_LOW_SHIFT	6
-#define USBTS_HI_SHIFT	0
-
-#define USBTS_INDEX2VAL(i) (((i) & 3) << 6)
-
-#endif /* DMA_REGISTER_H */

1.9.1

The last user of the legacy R-Mobile PM Domain code was the r8a7740 legacy SoC code, which has been removed.

---
 arch/arm/mach-shmobile/pm-rmobile.c | 39 -------------------------------------
 arch/arm/mach-shmobile/pm-rmobile.h | 24 -----------------------
 2 files changed, 63 deletions(-)

index b9b494f5ca99fc7c..a5b96b990aea8dfc 100644
@@ -169,43 +169,6 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
 	__rmobile_pd_power_up(rmobile_pd, false);
 }
 
-#ifdef CONFIG_ARCH_SHMOBILE_LEGACY
-
-void rmobile_init_domains(struct rmobile_pm_domain domains[], int num)
-{
-	int j;
-
-	for (j = 0; j < num; j++)
-		rmobile_init_pm_domain(&domains[j]);
-}
-
-void rmobile_add_device_to_domain_td(const char *domain_name,
-				     struct platform_device *pdev,
-				     struct gpd_timing_data *td)
-{
-	struct device *dev = &pdev->dev;
-
-	__pm_genpd_name_add_device(domain_name, dev, td);
-}
-
-void rmobile_add_devices_to_domains(struct pm_domain_device data[],
-				    int size)
-{
-	struct gpd_timing_data latencies = {
-		.stop_latency_ns = DEFAULT_DEV_LATENCY_NS,
-		.start_latency_ns = DEFAULT_DEV_LATENCY_NS,
-		.save_state_latency_ns = DEFAULT_DEV_LATENCY_NS,
-		.restore_state_latency_ns = DEFAULT_DEV_LATENCY_NS,
-	};
-	int j;
-
-	for (j = 0; j < size; j++)
-		rmobile_add_device_to_domain_td(data[j].domain_name,
-						data[j].pdev, &latencies);
-}
-
-#else /* !CONFIG_ARCH_SHMOBILE_LEGACY */
-
 static int rmobile_pd_suspend_busy(void)
 {
 	/*

@@ -436,5 +399,3 @@ static int __init rmobile_init_pm_domains(void)
 }
 
 core_initcall(rmobile_init_pm_domains);
-
-#endif /* !CONFIG_ARCH_SHMOBILE_LEGACY */

index 3992b619c1278dcc..30a4a421ee315b98 100644
@@ -31,28 +31,4 @@ struct pm_domain_device {
 	struct platform_device *pdev;
 };
 
-#if defined(CONFIG_PM_RMOBILE) && defined(CONFIG_ARCH_SHMOBILE_LEGACY)
-extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
-extern void rmobile_add_device_to_domain_td(const char *domain_name,
-					    struct platform_device *pdev,
-					    struct gpd_timing_data *td);
-
-static inline void rmobile_add_device_to_domain(const char *domain_name,
-						struct platform_device *pdev)
-{
-	rmobile_add_device_to_domain_td(domain_name, pdev, NULL);
-}
-
-extern void rmobile_add_devices_to_domains(struct pm_domain_device data[],
-					   int size);
-#else
-
-#define rmobile_init_domains(domains, num) do { } while (0)
-#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0)
-#define rmobile_add_device_to_domain(name, pdev) do { } while (0)
-
-static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[],
-						  int size) {}
-#endif /* CONFIG_PM_RMOBILE */
-
 #endif /* PM_RMOBILE_H */

1.9.1

The last user of the zboot code was the KZM-A9-GT legacy board code, which has been removed.

---
 arch/arm/boot/compressed/Makefile                  |   4 -
 arch/arm/boot/compressed/head-shmobile.S           |  71 --------------
 arch/arm/mach-shmobile/include/mach/zboot.h        |  14 ---
 arch/arm/mach-shmobile/include/mach/zboot_macros.h | 108 ---------------------
 4 files changed, 197 deletions(-)
 delete mode 100644 arch/arm/boot/compressed/head-shmobile.S
 delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h
 delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h

index 7a13aebacf81d47c..3f9a9ebc77c389bb 100644
@@ -51,10 +51,6 @@ else
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
-OBJS		+= head-shmobile.o
-endif
-
 #
 # We now have a PIC decompressor implementation.  Decompressors running
 # from RAM should not define ZTEXTADDR.  Decompressors running directly

deleted file mode 100644
index 80f599f4b5ab5733..0000000000000000
@@ -1,14 +0,0 @@
-#ifndef ZBOOT_H
-#define ZBOOT_H
-
-#include <mach/zboot_macros.h>
-
-/**************************************************
- *
- *		board specific settings
- *
- **************************************************/
-
-#error "unsupported board."
-
-#endif /* ZBOOT_H */

1.9.1

Since the removal of the sh73a0 legacy board code, sh73a0 is only supported in generic ARM multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, and the check can be removed.

---
Please do not apply until the legacy sh73a0 SoC code has been removed. Or just provide an ack, so Simon can apply it when appropriate.

---
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 ----
 1 file changed, 4 deletions(-)

index d2efbfb776ac57d6..097526576f88181f 100644
@@ -26,10 +26,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/slab.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 

1.9.1

Since the removal of the sh73a0 legacy board code, sh73a0 is only supported in generic DT-only ARM multi-platform builds. The driver doesn't need to match platform devices by name anymore, hence remove the corresponding platform_device_id entry.

---
Please do not apply until the legacy sh73a0 SoC code has been removed. Or just provide an ack, so Simon can apply it when appropriate.

---
 drivers/pinctrl/sh-pfc/core.c | 3 ---
 1 file changed, 3 deletions(-)

index 96556362b28f2caa..3ff523e58c38d123 100644
@@ -603,9 +603,6 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_SH7269
 	{ "pfc-sh7269", (kernel_ulong_t)&sh7269_pinmux_info },
 #endif
-#ifdef CONFIG_PINCTRL_PFC_SH73A0
-	{ "pfc-sh73a0", (kernel_ulong_t)&sh73a0_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_SH7720
 	{ "pfc-sh7720", (kernel_ulong_t)&sh7720_pinmux_info },
 #endif

1.9.1

Since the removal of the r8a7740 legacy board code, r8a7740 is only supported in generic ARM multi-platform builds. Hence CONFIG_ARCH_MULTIPLATFORM is always set, and the check can be removed.

---
Please do not apply until the legacy r8a7740 SoC code has been removed. Or just provide an ack, so Simon can apply it when appropriate.

---
 drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 4 ----
 1 file changed, 4 deletions(-)

index d0bb1459783a16d2..82ef1862dd1ba808 100644
@@ -22,10 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 

1.9.1

Since the removal of the r8a7740 legacy board code, r8a7740 is only supported in generic DT-only ARM multi-platform builds. The driver doesn't need to match platform devices by name anymore, hence remove the corresponding platform_device_id entry.

---
Please do not apply until the legacy r8a7740 SoC code has been removed. Or just provide an ack, so Simon can apply it when appropriate.

---
 drivers/pinctrl/sh-pfc/core.c | 3 ---
 1 file changed, 3 deletions(-)

index 3ff523e58c38d123..aeeeb76327c0684e 100644
@@ -585,9 +585,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
 }
 
 static const struct platform_device_id sh_pfc_id_table[] = {
-#ifdef CONFIG_PINCTRL_PFC_R8A7740
-	{ "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_R8A7778
 	{ "pfc-r8a7778", (kernel_ulong_t)&r8a7778_pinmux_info },
 #endif

1.9.1

[ CC Linus, Laurent, linux-gpio ]

I have queued up the above patches for v4.3.

As the above patches are sh-pfc patches they would typically be steered through Linus's tree via Laurent. If they wish to take that path then I'm happy for this to be attached:

FWIW the above path is the one that the removal of mackerel/sh7372 took.

Alternatively, I am happy to take the above sh-pfc patches through my tree but I would like to do so with an Ack from at least Linus.

Thanks!

I didn't CC Linus and linux-gpio at this stage yet, to prevent the pfc patches from getting applied prematurely.
But things have gone more smoothly (esp. w.r.t. board staging) than expected, which is always pleasant.

I can resend later, I have a few more areas of sh73a0/r8a7740 cleanup outside arch/arm/mach-shmobile waiting anyway...

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

I'm happy with whatever timing you think is best.

I would prefer to take these four into the pin control tree when you consider them finished as there is obviously more PFC stuff coming for this next kernel cycle and I want to avoid collisions and keep things together. Will you send them to me separately?

Yours,
Linus Walleij

Hi Linus,

OK, I will send them your way.

I think at this point we're quite sure the sh73a0/r8a7740 removal will hit v4.3. This does mean sh73a0/r8a7740-legacy will be broken in pinctrl/for-next, but we don't care, as the support is gone in -next anyway.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Hi Simon,

And

I'm fine with both. I think it would be easier to applied them through your tree if Linus is fine with that. Those patches shouldn't generate any conflict.

Regards,

Laurent Pinchart