ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
Subsystems (9)
Magnus Damm
maintainerv2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from MAINTAINERS [PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentation
Here is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
---
Built on top of renesas-devel-20150123-v3.19-rc5
Documentation/Makefile | 2 Documentation/arm/Makefile | 1 Documentation/arm/SH-Mobile/Makefile | 7 Documentation/arm/SH-Mobile/vrl4.c | 170 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 Documentation/devicetree/bindings/arm/shmobile.txt | 4 Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 8 MAINTAINERS | 1 arch/arm/Kconfig | 29 arch/arm/Kconfig.debug | 7 arch/arm/boot/compressed/Makefile | 15 arch/arm/boot/compressed/head-shmobile.S | 30 arch/arm/boot/compressed/mmcif-sh7372.c | 88 arch/arm/boot/compressed/sdhi-sh7372.c | 95 arch/arm/boot/compressed/sdhi-shmobile.c | 449 - arch/arm/boot/compressed/sdhi-shmobile.h | 11 arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/sh7372-mackerel.dts | 26 arch/arm/boot/dts/sh7372.dtsi | 35 arch/arm/configs/mackerel_defconfig | 157 arch/arm/mach-shmobile/Kconfig | 16 arch/arm/mach-shmobile/Makefile | 6 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-mackerel.c | 1522 ----- arch/arm/mach-shmobile/clock-sh7372.c | 620 -- arch/arm/mach-shmobile/common.h | 1 arch/arm/mach-shmobile/entry-intc.S | 54 arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 93 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 arch/arm/mach-shmobile/include/mach/mmc.h | 16 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 arch/arm/mach-shmobile/include/mach/sdhi.h | 16 arch/arm/mach-shmobile/include/mach/zboot.h | 5 arch/arm/mach-shmobile/intc-sh7372.c | 672 -- arch/arm/mach-shmobile/pm-sh7372.c | 549 -- arch/arm/mach-shmobile/setup-sh7372.c | 1016 --- arch/arm/mach-shmobile/sh7372.h | 84 arch/arm/mach-shmobile/sleep-sh7372.S | 98 arch/arm/tools/mach-types | 1 drivers/pinctrl/sh-pfc/Kconfig | 5 drivers/pinctrl/sh-pfc/Makefile | 1 drivers/pinctrl/sh-pfc/core.c | 9 drivers/pinctrl/sh-pfc/core.h | 1 drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 ---------- 45 files changed, 8 insertions(+), 8689 deletions(-)
Magnus Damm
maintainerPATCH v2 1/14 ARM: shmobile: mackerel: Remove ZBOOT code
From: Magnus Damm <[email protected]>
Remove ZBOOT support code for Mackerel. With this patch in place it is no longer possible to boot a self-contained kernel directly from the reset vector. ZBOOT is still supported on kzm9g.
---
Changes since V1:
- Rebased and resolved conflicts
arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 93 ----------------- arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 ------ arch/arm/mach-shmobile/include/mach/mmc.h | 5 arch/arm/mach-shmobile/include/mach/zboot.h | 5 4 files changed, 1 insertion(+), 140 deletions(-)
arch/arm/mach-shmobile/include/mach/head-mackerel.txt deleted +0 -93
@@ -1,93 +0,0 @@ -LIST "partner-jet-setup.txt" -LIST "(C) Copyright 2010 Renesas Solutions Corp" -LIST "Kuninori Morimoto <[email protected]>" - -LIST "RWT Setting" -EW 0xE6020004, 0xA500 -EW 0xE6030004, 0xA500 - -LIST "GPIO Setting" -EB 0xE6051013, 0xA2 - -LIST "CPG" -ED 0xE61500C0, 0x00000002 - -WAIT 1, 0xFE40009C - -LIST "FRQCR" -ED 0xE6150000, 0x2D1305C3 -ED 0xE61500E0, 0x9E40358E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xE61500E4, 0x00002000 - -WAIT 1, 0xFE40009C - -LIST "PLL" -ED 0xE6150028, 0x00004000 - -WAIT 1, 0xFE40009C - -ED 0xE615002C, 0x93000040 - -WAIT 1, 0xFE40009C - -LIST "SUB/USBClk" -ED 0xE6150080, 0x00000180 - -LIST "BSC" -ED 0xFEC10000, 0x00E0001B - -LIST "SBSC1" -ED 0xFE400354, 0x01AD8000 -ED 0xFE400354, 0x01AD8001 - -WAIT 5, 0xFE40009C - -ED 0xFE400008, 0xBCC90151 -ED 0xFE400040, 0x41774113 -ED 0xFE400044, 0x2712E229 -ED 0xFE400048, 0x20C18505 -ED 0xFE40004C, 0x00110209 -ED 0xFE400010, 0x00000087 - -WAIT 30, 0xFE40009C - -ED 0xFE400084, 0x0000003F -EB 0xFE500000, 0x00 - -WAIT 5, 0xFE40009C - -ED 0xFE400084, 0x0000FF0A -EB 0xFE500000, 0x00 - -WAIT 1, 0xFE40009C - -ED 0xFE400084, 0x00002201 -EB 0xFE500000, 0x00 -ED 0xFE400084, 0x00000302 -EB 0xFE500000, 0x00 -EB 0xFE5C0000, 0x00 -ED 0xFE400008, 0xBCC90159 -ED 0xFE40008C, 0x88800004 -ED 0xFE400094, 0x00000004 -ED 0xFE400028, 0xA55A0032 -ED 0xFE40002C, 0xA55A000C -ED 0xFE400020, 0xA55A2048 -ED 0xFE400008, 0xBCC90959 - -LIST "Change CPGA setting" -ED 0xE61500E0, 0x9E40352E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xFE400354, 0x01AD8002 - -LIST "SCIF0 - Serial port for earlyprintk" -EB 0xE6053098, 0xe1 -EW 0xE6C40000, 0x0000 -EB 0xE6C40004, 0x19 -EW 0xE6C40008, 0x0030
arch/arm/mach-shmobile/include/mach/mmc-mackerel.h deleted +0 -38
@@ -1,38 +0,0 @@ -#ifndef MMC_MACKEREL_H -#define MMC_MACKEREL_H - -#define PORT0CR (void __iomem *)0xe6051000 -#define PORT1CR (void __iomem *)0xe6051001 -#define PORT2CR (void __iomem *)0xe6051002 -#define PORT159CR (void __iomem *)0xe605009f - -#define PORTR031_000DR (void __iomem *)0xe6055000 -#define PORTL159_128DR (void __iomem *)0xe6054010 - -static inline void mmc_init_progress (void ) -{ -/* Initialise LEDS0-3 -* registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) -* value: 0x10 - enable output -*/ -__raw_writeb (0x10 ,PORT0CR ); -__raw_writeb (0x10 ,PORT1CR ); -__raw_writeb (0x10 ,PORT2CR ); -__raw_writeb (0x10 ,PORT159CR ); -} - -static inline void mmc_update_progress (int n) -{ -unsigned a =0 , b =0 ; - -if (n <3 ) - a =1 << n; -else - b =1 <<31 ; - -__raw_writel ((__raw_readl (PORTR031_000DR ) & ~0x7 ) | a, -PORTR031_000DR ); -__raw_writel ((__raw_readl (PORTL159_128DR ) & ~(1 <<31 )) | b, -PORTL159_128DR ); -} -#endif /* MMC_MACKEREL_H */
arch/arm/mach-shmobile/include/mach/mmc.h +0 -5
@@ -7,10 +7,5 @@* **************************************************/ -#ifdef CONFIG_MACH_MACKEREL -#include "mach/mmc-mackerel.h" -#else #error "unsupported board." -#endif -#endif /* MMC_H */
arch/arm/mach-shmobile/include/mach/zboot.h +1 -4
@@ -9,10 +9,7 @@* **************************************************/ -#ifdef CONFIG_MACH_MACKEREL -#define MEMORY_START 0x40000000 -#include "mach/head-mackerel.txt" -#elif defined(CONFIG_MACH_KZM9G ) || defined(CONFIG_MACH_KZM9G_REFERENCE ) +#if defined(CONFIG_MACH_KZM9G ) || defined(CONFIG_MACH_KZM9G_REFERENCE )#define MEMORY_START 0x43000000#include "mach/head-kzm9g.txt" #else
Magnus Damm
maintainerPATCH v2 2/14 ARM: shmobile: mackerel: Remove Legacy C board code
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove legacy C code for the sh7372 Mackerel board. There is no DT multiplatform implementation available for the sh7372 SoC so simply phase out the board and SoC code support.
---
Changes since V1:
- Rebased and resolved conflicts
arch/arm/mach-shmobile/Kconfig | 9 arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-mackerel.c | 1522 ------------------------------- 4 files changed, 1533 deletions(-)
arch/arm/mach-shmobile/Kconfig +0 -9
@@ -159,15 +159,6 @@ config MACH_APE6EVM_REFERENCE This is intended to aid developers -config MACH_MACKEREL - bool "mackerel board" - depends on ARCH_SH7372 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X - select SND_SOC_AK4642 if SND_SIMPLE_CARD - select USE_OF - config MACH_ARMADILLO800EVA bool "Armadillo-800 EVA board" depends on ARCH_R8A7740
arch/arm/mach-shmobile/Makefile +0 -1
@@ -60,7 +60,6 @@ obj-$(CONFIG_MACH_MARZEN) += board-marze else obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o -obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -7,7 +7,6 @@ loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 -loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 __ZRELADDR := $(sort $(loadaddr-y))
arch/arm/mach-shmobile/board-mackerel.c deleted +0 -1522
1,522 lines not on this page · raw message
Magnus Damm
maintainerPATCH v2 3/14 ARM: shmobile: mackerel dts: Remove Legacy DTS file
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the DTS file for the no longer supported Mackerel board.
---
Changes since V1:
- Rebased and resolved conflicts
arch/arm/boot/dts/Makefile | 1 - arch/arm/boot/dts/sh7372-mackerel.dts | 26 -------------------------- 2 files changed, 27 deletions(-)
arch/arm/boot/dts/Makefile +0 -1
@@ -410,7 +410,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \ r8a7779-marzen.dtb \ - sh7372-mackerel.dtb \ sh73a0-kzm9g.dtb \ sh73a0-kzm9g-reference.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
arch/arm/boot/dts/sh7372-mackerel.dts deleted +0 -26
@@ -1,26 +0,0 @@ -/* - * Device Tree Source for the mackerel board - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -/dts-v1/; -#include "sh7372.dtsi" - -/ { - model = "Mackerel (AP4 EVM 2nd)"; - compatible = "renesas,mackerel"; - - chosen { - bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw"; - }; - - memory { - device_type = "memory"; - reg = <0x40000000 0x10000000>; - }; -};
Magnus Damm
maintainerPATCH v2 4/14 ARM: shmobile: mackerel: Remove DT binding documentation
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the DT compatibile string documentation for the no longer supported Mackerel board.
---
Changes since V1:
- None
Documentation/devicetree/bindings/arm/shmobile.txt | 2 -- 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/arm/shmobile.txt +0 -2
@@ -57,8 +57,6 @@ Boards: compatible = "renesas,kzm9g", "renesas,sh73a0" - Lager (RTP0RC7790SEB00010S) compatible = "renesas,lager", "renesas,r8a7790" - - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd) - compatible = "renesas,mackerel" - Marzen compatible = "renesas,marzen", "renesas,r8a7779"
PATCH v2 4/14 ARM: shmobile: mackerel: Remove DT binding documentation
Quoted 3 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the DT compatibile string documentation for the
I have taken the liberty of changing compatibile to compatible while queuing up this patch.
Quoted 28 lines
no longer supported Mackerel board.
Signed-off-by Magnus Damm <[email protected]>Acked-by Laurent Pinchart <[email protected]>---
Changes since V1:
- NoneDocumentation/devicetree/bindings/arm/shmobile.txt | 2 -- 1 file changed, 2 deletions(-)Documentation/devicetree/bindings/arm/shmobile.txt +0
-3@@ -57,8 +57,6 @@ Boards: compatible = "renesas,kzm9g", "renesas,sh73a0" - Lager (RTP0RC7790SEB00010S) compatible = "renesas,lager", "renesas,r8a7790" - - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd) - compatible = "renesas,mackerel" - Marzen compatible = "renesas,marzen", "renesas,r8a7779" --To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Magnus Damm
maintainerPATCH v2 5/14 ARM: shmobile: mackerel: Remove mach-type entry
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the mackerel entry from the mach-types file.
---
Changes since V1:
- None
arch/arm/tools/mach-types | 1 - 1 file changed, 1 deletion(-)
arch/arm/tools/mach-types +0 -1
@@ -526,7 +526,6 @@ ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 trimslice MACH_TRIMSLICE TRIMSLICE 3209 -mackerel MACH_MACKEREL MACKEREL 3211 kaen MACH_KAEN KAEN 3217 nokia_rm680 MACH_NOKIA_RM680 NOKIA_RM680 3220 msm8960_sim MACH_MSM8960_SIM MSM8960_SIM 3230
Magnus Damm
maintainerPATCH v2 6/14 ARM: shmobile: mackerel: Remove defconfig
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the defconfig for the no longer supported mackerel board.
---
Changes since V1:
- None (Suggested MAINTAINER change by Geert is in separate patch)
arch/arm/configs/mackerel_defconfig | 157 ----------------------------------- 1 file changed, 157 deletions(-)
arch/arm/configs/mackerel_defconfig deleted +0 -157
@@ -1,157 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE_LEGACY=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_MACKEREL=y -CONFIG_MEMORY_SIZE=0x10000000 -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_FORCE_MAX_ZONEORDER=15 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_KEXEC=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_SH_MOBILE=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -CONFIG_REGULATOR=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_FB_SH_MOBILE_HDMI=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -CONFIG_SND_SOC_SH4_FSI=y -CONFIG_USB=y -CONFIG_USB_RENESAS_USBHS_HCD=y -CONFIG_USB_RENESAS_USBHS=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_RENESAS_USBHS_UDC=y -CONFIG_MMC=y -CONFIG_MMC_SDHI=y -CONFIG_MMC_SH_MMCIF=y -CONFIG_DMADEVICES=y -CONFIG_SH_DMAE=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_DNOTIFY is not set -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_NFS_V4_1=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_UTF8=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_ARM_UNWIND is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ANSI_CPRNG=y
Magnus Damm
maintainerPATCH v2 7/14 ARM: shmobile: mackerel: Remove from MAINTAINERS
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the mackerel_defconfig from the MAINTAINERS file.
---
Changes since V1:
- New patch
MAINTAINERS | 1 - 1 file changed, 1 deletion(-)
MAINTAINERS +0 -1
@@ -1395,7 +1395,6 @@ F: arch/arm/configs/ape6evm_defconfig F: arch/arm/configs/armadillo800eva_defconfig F: arch/arm/configs/bockw_defconfig F: arch/arm/configs/kzm9g_defconfig -F: arch/arm/configs/mackerel_defconfig F: arch/arm/configs/marzen_defconfig F: arch/arm/configs/shmobile_defconfig F: arch/arm/include/debug/renesas-scif.S
Magnus Damm
maintainerPATCH v2 8/14 ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the sh7372 implementation and the shared ZBOOT MMC and SDHI support code from the compressed ARM boot loader.
With this in place it is no longer possible to boot any self-contained kernel for sh7372 directly from Mask ROM via SDHI and MMCIF hardware.
---
Changes since V1:
- None
arch/arm/Kconfig | 29 - arch/arm/boot/compressed/Makefile | 15 arch/arm/boot/compressed/head-shmobile.S | 30 - arch/arm/boot/compressed/mmcif-sh7372.c | 88 ---- arch/arm/boot/compressed/sdhi-sh7372.c | 95 ---- arch/arm/boot/compressed/sdhi-shmobile.c | 449 --------------------- arch/arm/boot/compressed/sdhi-shmobile.h | 11 arch/arm/mach-shmobile/include/mach/mmc.h | 11 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 arch/arm/mach-shmobile/include/mach/sdhi.h | 16 10 files changed, 765 deletions(-)
arch/arm/Kconfig +0 -29
@@ -1840,35 +1840,6 @@ config ZBOOT_ROM Say Y here if you intend to execute your compressed kernel image (zImage) directly from ROM or flash. If unsure, say N. -choice - prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)" - depends on ZBOOT_ROM && ARCH_SH7372 - default ZBOOT_ROM_NONE - help - Include experimental SD/MMC loading code in the ROM-able zImage. - With this enabled it is possible to write the ROM-able zImage - kernel image to an MMC or SD card and boot the kernel straight - from the reset vector. At reset the processor Mask ROM will load - the first part of the ROM-able zImage which in turn loads the - rest the kernel image to RAM. - -config ZBOOT_ROM_NONE - bool "No SD/MMC loader in zImage (EXPERIMENTAL)" - help - Do not load image from SD or MMC - -config ZBOOT_ROM_MMCIF - bool "Include MMCIF loader in zImage (EXPERIMENTAL)" - help - Load image from MMCIF hardware block. - -config ZBOOT_ROM_SH_MOBILE_SDHI - bool "Include SuperH Mobile SDHI loader in zImage (EXPERIMENTAL)" - help - Load image from SDHI hardware block - -endchoice - config ARM_APPENDED_DTB bool "Use appended device tree blob to zImage (EXPERIMENTAL)" depends on OF
arch/arm/boot/compressed/Makefile +0 -15
@@ -6,21 +6,6 @@ OBJS = -# Ensure that MMCIF loader code appears early in the image -# to minimise that number of bocks that have to be read in -# order to load it. -ifeq ($(CONFIG_ZBOOT_ROM_MMCIF),y) -OBJS += mmcif-sh7372.o -endif - -# Ensure that SDHI loader code appears early in the image -# to minimise that number of bocks that have to be read in -# order to load it. -ifeq ($(CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI),y) -OBJS += sdhi-shmobile.o -OBJS += sdhi-sh7372.o -endif - AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET) HEAD = head.o OBJS += misc.o decompress.o
arch/arm/boot/compressed/head-shmobile.S +0 -30
@@ -25,36 +25,6 @@ /* load board-specific initialization code */ #include <mach/zboot.h> -#if defined(CONFIG_ZBOOT_ROM_MMCIF) || defined(CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI) - /* Load image from MMC/SD */ - adr sp, __tmp_stack + 256 - ldr r0, __image_start - ldr r1, __image_end - subs r1, r1, r0 - ldr r0, __load_base - bl mmc_loader - - /* Jump to loaded code */ - ldr r0, __loaded - ldr r1, __image_start - sub r0, r0, r1 - ldr r1, __load_base - add pc, r0, r1 - -__image_start: - .long _start -__image_end: - .long _got_end -__load_base: - .long MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM -__loaded: - .long __continue - .align -__tmp_stack: - .space 256 -__continue: -#endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */ - adr r0, dtb_info ldmia r0, {r1, r3, r4, r5, r7}
arch/arm/boot/compressed/mmcif-sh7372.c deleted +0 -88
88 lines not on this page · raw message
arch/arm/boot/compressed/sdhi-sh7372.c deleted +0 -95
95 lines not on this page · raw message
arch/arm/boot/compressed/sdhi-shmobile.c deleted +0 -449
449 lines not on this page · raw message
arch/arm/boot/compressed/sdhi-shmobile.h deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef SDHI_MOBILE_H -#define SDHI_MOBILE_H - -#include <linux/compiler.h> - -int sdhi_boot_do_read (void __iomem *base,int high_capacity, -unsigned long offset,unsigned short count, -unsigned short *buf); -int sdhi_boot_init (void __iomem *base); - -#endif
arch/arm/mach-shmobile/include/mach/mmc.h deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef MMC_H -#define MMC_H - -/************************************************** -* -* board specific settings -* -**************************************************/ - -#error "unsupported board." -#endif /* MMC_H */
arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h deleted +0 -21
@@ -1,21 +0,0 @@ -#ifndef SDHI_SH7372_H -#define SDHI_SH7372_H - -#define SDGENCNTA 0xfe40009c - -/* The countdown of SDGENCNTA is controlled by -* ZB3D2CLK which runs at 149.5MHz. -* That is 149.5ticks/us. Approximate this as 150ticks/us. -*/ -static void udelay (int us) -{ -__raw_writel (us *150 ,SDGENCNTA ); -while (__raw_readl (SDGENCNTA )) ; -} - -static void msleep (int ms) -{ -udelay (ms *1000 ); -} - -#endif
arch/arm/mach-shmobile/include/mach/sdhi.h deleted +0 -16
@@ -1,16 +0,0 @@ -#ifndef SDHI_H -#define SDHI_H - -/************************************************** -* -* CPU specific settings -* -**************************************************/ - -#ifdef CONFIG_ARCH_SH7372 -#include "mach/sdhi-sh7372.h" -#else -#error "unsupported CPU." -#endif - -#endif /* SDHI_H */
Magnus Damm
maintainerPATCH v2 9/14 ARM: shmobile: sh7372: Remove Legacy C SoC code
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove support for the legacy Cortex-A8 based sh7372 SoC.
The Linux kernel still lacks DT bindings for the sh7372 INTC interrupt controller so DT multiplatform support is not possibile.
Also, the sh7372 SoC never went into mass production anyway so to aid migration to DT multiplatform simply get rid of sh7372 support.
---
Changes since V1:
- None
arch/arm/Kconfig.debug | 7 arch/arm/mach-shmobile/Kconfig | 7 arch/arm/mach-shmobile/Makefile | 5 arch/arm/mach-shmobile/clock-sh7372.c | 620 -------------------- arch/arm/mach-shmobile/common.h | 1 arch/arm/mach-shmobile/entry-intc.S | 54 - arch/arm/mach-shmobile/intc-sh7372.c | 672 --------------------- arch/arm/mach-shmobile/pm-sh7372.c | 549 ----------------- arch/arm/mach-shmobile/setup-sh7372.c | 1016 --------------------------------- arch/arm/mach-shmobile/sh7372.h | 84 -- arch/arm/mach-shmobile/sleep-sh7372.S | 98 --- 11 files changed, 3 insertions(+), 3110 deletions(-)
arch/arm/Kconfig.debug +3 -4
@@ -722,12 +722,11 @@ choice via SCIF2 on Renesas R-Car E2 (R8A7794). config DEBUG_RMOBILE_SCIFA0 - bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4/SH7372" - depends on ARCH_R8A73A4 || ARCH_SH7372 + bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4" + depends on ARCH_R8A73A4 help Say Y here if you want kernel low-level debugging support - via SCIFA0 on Renesas R-Mobile APE6 (R8A73A4) or SH-Mobile - AP4 (SH7372). + via SCIFA0 on Renesas R-Mobile APE6 (R8A73A4). config DEBUG_RMOBILE_SCIFA1 bool "Kernel low-level debugging messages via SCIFA1 on R8A7740"
arch/arm/mach-shmobile/Kconfig +0 -7
@@ -97,13 +97,6 @@ if ARCH_SHMOBILE_LEGACY comment "Renesas ARM SoCs System Type" -config ARCH_SH7372 - bool "SH-Mobile AP4 (SH7372)" - select ARCH_RMOBILE - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_CPU_SUSPEND if PM || CPU_IDLE - select SH_INTC - config ARCH_SH73A0 bool "SH-Mobile AG5 (R8A73A00)" select ARCH_RMOBILE
arch/arm/mach-shmobile/Makefile +0 -5
@@ -6,7 +6,6 @@ obj-y := timer.o console.o # CPU objects -obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o
@@ -21,7 +20,6 @@ obj-$(CONFIG_ARCH_R7S72100) += setup-r7s # Clock objects ifndef CONFIG_COMMON_CLK obj-y += clock.o -obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o
@@ -50,9 +48,6 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_PM_RCAR) += pm-rcar.o obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o -# special sh7372 handling for IRQ objects and low level sleep code -obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o - # Board objects ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
arch/arm/mach-shmobile/clock-sh7372.c deleted +0 -620
620 lines not on this page · raw message
arch/arm/mach-shmobile/common.h +0 -1
@@ -21,7 +21,6 @@ extern void shmobile_smp_scu_cpu_die(unsextern int shmobile_smp_scu_cpu_kill (unsigned int cpu);struct clk ;extern int shmobile_clk_init (void ); -extern void shmobile_handle_irq_intc (struct pt_regs *);extern struct platform_suspend_ops shmobile_suspend_ops;struct cpuidle_driver ;extern void shmobile_cpuidle_set_driver (struct cpuidle_driver *drv);
arch/arm/mach-shmobile/entry-intc.S deleted +0 -54
54 lines not on this page · raw message
arch/arm/mach-shmobile/intc-sh7372.c deleted +0 -672
672 lines not on this page · raw message
arch/arm/mach-shmobile/pm-sh7372.c deleted +0 -549
549 lines not on this page · raw message
arch/arm/mach-shmobile/setup-sh7372.c deleted +0 -1016
1,016 lines not on this page · raw message
arch/arm/mach-shmobile/sh7372.h deleted +0 -84
31 lines not on this page · raw message
arch/arm/mach-shmobile/sleep-sh7372.S deleted +0 -98
98 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Magnus Damm
maintainerPATCH v2 10/14 ARM: shmobile: sh7372: Remove DT binding documentation
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove DT compatible string documentation for the now removed sh7372 SoC.
---
Changes since V1:
- None
Documentation/devicetree/bindings/arm/shmobile.txt | 2 -- 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/arm/shmobile.txt +0 -2
@@ -7,8 +7,6 @@ SoCs: compatible = "renesas,emev2" - RZ/A1H (R7S72100) compatible = "renesas,r7s72100" - - SH-Mobile AP4 (R8A73720/SH7372) - compatible = "renesas,sh7372" - SH-Mobile AG5 (R8A73A00/SH73A0) compatible = "renesas,sh73a0" - R-Mobile APE6 (R8A73A40)
Magnus Damm
maintainerPATCH v2 11/14 ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the sh7372 DTSI file for the now unsupported sh7372 SoC.
---
Changes since V1:
- None
arch/arm/boot/dts/sh7372.dtsi | 35 ----------------------------------- 1 file changed, 35 deletions(-)
arch/arm/boot/dts/sh7372.dtsi deleted +0 -35
@@ -1,35 +0,0 @@ -/* - * Device Tree Source for the sh7372 SoC - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -/include/ "skeleton.dtsi" - -/ { - compatible = "renesas,sh7372"; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu at 0 { - compatible = "arm,cortex-a8"; - device_type = "cpu"; - reg = <0x0>; - clock-frequency = <800000000>; - }; - }; - - pfc: pfc at e6050000 { - compatible = "renesas,pfc-sh7372"; - reg = <0xe6050000 0x8000>, - <0xe605801c 0x1c>; - gpio-controller; - #gpio-cells = <2>; - }; -};
Magnus Damm
maintainerPATCH v2 12/14 Documentation: Remove ZBOOT MMC/SDHI utility and docs
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove ZBOOT MMC/SDHI Documentation for sh7372 together wit the vrl4 utility. Without sh7372 and Mackerel support these files are no longer useful.
---
Changes since V1:
- Removed Documentation/arm/Makefile, thanks Geert!
Documentation/Makefile | 2 Documentation/arm/Makefile | 1 Documentation/arm/SH-Mobile/Makefile | 7 Documentation/arm/SH-Mobile/vrl4.c | 170 ----------------------- Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 --- Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 ----- 6 files changed, 1 insertion(+), 250 deletions(-)
Documentation/Makefile +1 -1
@@ -1,4 +1,4 @@ -subdir-y := accounting arm auxdisplay blackfin connector \ +subdir-y := accounting auxdisplay blackfin connector \ filesystems filesystems ia64 laptops mic misc-devices \ networking pcmcia prctl ptp spi timers vDSO video4linux \ watchdog
Documentation/arm/Makefile deleted +0 -1
@@ -1 +0,0 @@ -subdir-y := SH-Mobile
Documentation/arm/SH-Mobile/Makefile deleted +0 -7
@@ -1,7 +0,0 @@ -# List of programs to build -hostprogs-y := vrl4 - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include -I$(srctree)/tools/include
Documentation/arm/SH-Mobile/vrl4.c deleted +0 -170
170 lines not on this page · raw message
Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt deleted +0 -29
@@ -1,29 +0,0 @@ -ROM-able zImage boot from MMC ------------------------------ - -An ROM-able zImage compiled with ZBOOT_ROM_MMCIF may be written to MMC and -SuperH Mobile ARM will to boot directly from the MMCIF hardware block. - -This is achieved by the mask ROM loading the first portion of the image into -MERAM and then jumping to it. This portion contains loader code which -copies the entire image to SDRAM and jumps to it. From there the zImage -boot code proceeds as normal, uncompressing the image into its final -location and then jumping to it. - -This code has been tested on an AP4EB board using the developer 1A eMMC -boot mode which is configured using the following jumper settings. -The board used for testing required a patched mask ROM in order for -this mode to function. - - 8 7 6 5 4 3 2 1 - x|x|x|x|x| |x| -S4 -+-+-+-+-+-+-+- - | | | | |x| |x on - -The zImage must be written to the MMC card at sector 1 (512 bytes) in -vrl4 format. A utility vrl4 is supplied to accomplish this. - -e.g. - vrl4 < zImage | dd of=/dev/sdX bs=512 seek=1 - -A dual-voltage MMC 4.0 card was used for testing.
Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt deleted +0 -42
42 lines not on this page · raw message
PATCH v2 12/14 Documentation: Remove ZBOOT MMC/SDHI utility and docs
Hi Magnus,
Thank you for the patch.
Quoted 7 lines · On Monday 26 January 2015 15:19:51 Magnus Damm wrote:
From: Magnus Damm <[email protected]>
Remove ZBOOT MMC/SDHI Documentation for sh7372 together wit the vrl4 utility. Without sh7372 and Mackerel support these files are no longer useful.
Signed-off-by Magnus Damm <[email protected]>
Quoted 284 lines
---
Changes since V1:
- RemovedDocumentation/arm/Makefile, thanks Geert!Documentation/Makefile | 2 Documentation/arm/Makefile | 1 Documentation/arm/SH-Mobile/Makefile | 7 Documentation/arm/SH-Mobile/vrl4.c | 170 -------------------- Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 --- Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 ----- 6 files changed, 1 insertion(+), 250 deletions(-)Documentation/Makefile +1
-1@@ -1,4 +1,4 @@ -subdir-y := accounting arm auxdisplay blackfin connector \ +subdir-y := accounting auxdisplay blackfin connector \ filesystems filesystems ia64 laptops mic misc-devices \ networking pcmcia prctl ptp spi timers vDSO video4linux \ watchdogDocumentation/arm/Makefile deleted +0
-1@@ -1 +0,0 @@ -subdir-y := SH-MobileDocumentation/arm/SH-Mobile/Makefile deleted +0
-7@@ -1,7 +0,0 @@ -# List of programs to build -hostprogs-y := vrl4 - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include -I$(srctree)/tools/includeDocumentation/arm/SH-Mobile/vrl4.c deleted +0
-6@@ -1,170 +0,0 @@ -/* -* vrl4 format generator -* -* Copyright (C) 2010 Simon Horman -* -* 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.
- */Documentation/arm/SH-Mobile/vrl4.c deleted +0
-14- -/* -* usage: vrl4 < zImage > out -* dd if=out of=/dev/sdx bs=512 seek=1 # Write the image to sector 1 -* -* Reads a zImage from stdin and writes a vrl4 image to stdout. -* In practice this means writing a padded vrl4 header to stdout followed -* by the zImage. -* -* The padding places the zImage at ALIGN bytes into the output. -* The vrl4 uses ALIGN + START_BASE as the start_address. -* This is where the mask ROM will jump to after verifying the header. -* -* The header sets copy_size to min(sizeof(zImage), MAX_BOOT_PROG_LEN) + ALIGN. - * That is, the mask ROM will load the padded header (ALIGN bytes)
- * And thenMAX_BOOT_PROG_LENbytes of the image, or the entire image, - * whichever is smaller.
- *
- * The zImage is not modified in any way.
- */Documentation/arm/SH-Mobile/vrl4.c deleted +0
-39- -#define _BSD_SOURCE -#include <endian.h> -#include <unistd.h> -#include <stdint.h> -#include <stdio.h> -#include <errno.h> -#include <tools/endian.h> - -struct hdr { -uint32_t magic1; -uint32_t reserved1; -uint32_t magic2; -uint32_t reserved2; -uint16_t copy_size; -uint16_t boot_options; -uint32_t reserved3; -uint32_t start_address; -uint32_t reserved4; -uint32_t reserved5; -char reserved6[308 ]; -}; - -#define DECLARE_HDR (h) \ - struct hdr (h) = { \ - .magic1 = htole32(0xea000000), \ - .reserved1 = htole32(0x56), \ - .magic2 = htole32(0xe59ff008), \ - .reserved3 = htole16(0x1) } - -/* Align to 512 bytes, the MMCIF sector size */ -#define ALIGN_BITS 9 -#define ALIGN (1 << ALIGN_BITS) - -#define START_BASE 0xe55b0000 - -/* -* With an alignment of 512 the header uses the first sector. -* There is a 128 sector (64kbyte) limit on the data loaded by the mask ROM. - * So there are 127 sectors left for the boot programme. But in practice - * Only a small portion of a zImage is needed, 16 sectors should be more - * than enough.
- *
- * Note that this sets how much of the zImage is copied by the mask ROM.
- * The entire zImage is present after the header and is loaded
- * by the code in the boot program (which is the first portion of the zImage). - */Documentation/arm/SH-Mobile/vrl4.c deleted +0
-94-#define MAX_BOOT_PROG_LEN (16 * 512) - -#define ROUND_UP (x) ((x + ALIGN - 1) & ~(ALIGN - 1)) - -static ssize_t do_read (int fd,void *buf,size_t count) -{ -size_t offset =0 ; -ssize_t l; - -while (offset < count) { - l =read (fd, buf + offset, count - offset); -if (!l) -break ; -if (l <0 ) { -if (errno ==EAGAIN || errno ==EWOULDBLOCK ) -continue ; -perror ("read" ); -return -1 ; - } - offset += l; - } - -return offset; -} - -static ssize_t do_write (int fd,const void *buf,size_t count) -{ -size_t offset =0 ; -ssize_t l; - -while (offset < count) { - l =write (fd, buf + offset, count - offset); -if (l <0 ) { -if (errno ==EAGAIN || errno ==EWOULDBLOCK ) -continue ; -perror ("write" ); -return -1 ; - } - offset += l; - } - -return offset; -} - -static ssize_t write_zero (int fd,size_t len) -{ -size_t i = len; - -while (i--) { -const char x =0 ; -if (do_write (fd, &x,1 ) <0 ) -return -1 ; - } - -return len; -} - -int main (void ) -{ -DECLARE_HDR (hdr); -char boot_program[MAX_BOOT_PROG_LEN ]; -size_t aligned_hdr_len, alligned_prog_len; -ssize_t prog_len; - - prog_len =do_read (0 , boot_program,sizeof (boot_program)); -if (prog_len <=0 ) -return -1 ; - - aligned_hdr_len =ROUND_UP (sizeof (hdr)); - hdr.start_address =htole32 (START_BASE + aligned_hdr_len); - alligned_prog_len =ROUND_UP (prog_len); - hdr.copy_size =htole16 (aligned_hdr_len + alligned_prog_len); - -if (do_write (1 , &hdr,sizeof (hdr)) <0 ) -return -1 ; -if (write_zero (1 , aligned_hdr_len -sizeof (hdr)) <0 ) -return -1 ; - -if (do_write (1 , boot_program, prog_len) <0 ) -return 1 ; - -/* Write out the rest of the kernel */ -while (1 ) { - prog_len =do_read (0 , boot_program,sizeof (boot_program)); -if (prog_len <0 ) -return 1 ; -if (prog_len ==0 ) -break ; -if (do_write (1 , boot_program, prog_len) <0 ) -return 1 ; - } - -return 0 ; -}Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt deleted +0
-7@@ -1,29 +0,0 @@ -ROM-able zImage boot from MMC ------------------------------ - -An ROM-able zImage compiled with ZBOOT_ROM_MMCIF may be written to MMC and -SuperH Mobile ARM will to boot directly from the MMCIF hardware block. - -This is achieved by the mask ROM loading the first portion of the imageinto -MERAM and then jumping to it. This portion contains loader code which
Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt deleted +0
-21-copies the entire image to SDRAM and jumps to it. From there the zImage -boot code proceeds as normal, uncompressing the image into its final -location and then jumping to it. - -This code has been tested on an AP4EB board using the developer 1A eMMC -boot mode which is configured using the following jumper settings. -The board used for testing required a patched mask ROM in order for -this mode to function. - - 8 7 6 5 4 3 2 1 - x|x|x|x|x| |x| -S4 -+-+-+-+-+-+-+- - | | | | |x| |x on - -The zImage must be written to the MMC card at sector 1 (512 bytes) in -vrl4 format. A utility vrl4 is supplied to accomplish this. - -e.g. - vrl4 < zImage | dd of=/dev/sdX bs=512 seek=1 - -A dual-voltage MMC 4.0 card was used for testing.Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt deleted +0
-7@@ -1,42 +0,0 @@ -ROM-able zImage boot from eSD ------------------------------ - -An ROM-able zImage compiled with ZBOOT_ROM_SDHI may be written to eSD and -SuperH Mobile ARM will to boot directly from the SDHI hardware block. - -This is achieved by the mask ROM loading the first portion of the imageinto -MERAM and then jumping to it. This portion contains loader code which
Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt deleted +0
-33-copies the entire image to SDRAM and jumps to it. From there the zImage -boot code proceeds as normal, uncompressing the image into its final -location and then jumping to it. - -This code has been tested on an mackerel board using the developer 1A eSD -boot mode which is configured using the following jumper settings. - - 8 7 6 5 4 3 2 1 - x|x|x|x| |x|x| -S4 -+-+-+-+-+-+-+- - | | | |x| | |x on - -The eSD card needs to be present in SDHI slot 1 (CN7). -As such S1 and S33 also need to be configured as per -the notes in arch/arm/mach-shmobile/board-mackerel.c. - -A partial zImage must be written to physical partition #1 (boot) -of the eSD at sector 0 in vrl4 format. A utility vrl4 is supplied to -accomplish this. - -e.g. - vrl4 < zImage | dd of=/dev/sdX bs=512 count=17 - -A full copy of _the same_ zImage should be written to physical partition #1 -(boot) of the eSD at sector 0. This should _not_ be in vrl4 format. - - vrl4 < zImage | dd of=/dev/sdX bs=512 - -Note: The commands above assume that the physical partition has been -switched. No such facility currently exists in the Linux Kernel. - -Physical partitions are described in the eSD specification. At the time of -writing they are not the same as partitions that are typically configured -using fdisk and visible through /proc/partitions
Signature · 3 lines
Regards, Laurent Pinchart
Magnus Damm
maintainerPATCH v2 13/14 pinctrl: sh-pfc: sh7372: Remove PFC support
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove sh7372 PFC support as part of the sh7372 and Mackerel legacy code removal.
---
Changes since V1:
- Removed entry in core.h, thanks Laurent!
drivers/pinctrl/sh-pfc/Kconfig | 5 drivers/pinctrl/sh-pfc/Makefile | 1 drivers/pinctrl/sh-pfc/core.c | 9 drivers/pinctrl/sh-pfc/core.h | 1 drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 ----------------------------------- 5 files changed, 2661 deletions(-)
drivers/pinctrl/sh-pfc/Kconfig +0 -5
@@ -68,11 +68,6 @@ config PINCTRL_PFC_SH7269 depends on GPIOLIB select PINCTRL_SH_PFC -config PINCTRL_PFC_SH7372 - def_bool y - depends on ARCH_SH7372 - select PINCTRL_SH_PFC - config PINCTRL_PFC_SH73A0 def_bool y depends on ARCH_SH73A0
drivers/pinctrl/sh-pfc/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7791) += pfc obj-$(CONFIG_PINCTRL_PFC_SH7203) += pfc-sh7203.o obj-$(CONFIG_PINCTRL_PFC_SH7264) += pfc-sh7264.o obj-$(CONFIG_PINCTRL_PFC_SH7269) += pfc-sh7269.o -obj-$(CONFIG_PINCTRL_PFC_SH7372) += pfc-sh7372.o obj-$(CONFIG_PINCTRL_PFC_SH73A0) += pfc-sh73a0.o obj-$(CONFIG_PINCTRL_PFC_SH7720) += pfc-sh7720.o obj-$(CONFIG_PINCTRL_PFC_SH7722) += pfc-sh7722.o
drivers/pinctrl/sh-pfc/core.c +0 -9
@@ -475,12 +475,6 @@ static const struct of_device_id sh_pfc_ .data = &r8a7791_pinmux_info, },#endif -#ifdef CONFIG_PINCTRL_PFC_SH7372 - { - .compatible = "renesas,pfc-sh7372", - .data = &sh7372_pinmux_info, - }, -#endif#ifdef CONFIG_PINCTRL_PFC_SH73A0 { .compatible = "renesas,pfc-sh73a0",
@@ -606,9 +600,6 @@ static const struct platform_device_id s #ifdef CONFIG_PINCTRL_PFC_SH7269 { "pfc-sh7269", (kernel_ulong_t)&sh7269_pinmux_info }, #endif -#ifdef CONFIG_PINCTRL_PFC_SH7372 - { "pfc-sh7372", (kernel_ulong_t)&sh7372_pinmux_info }, -#endif #ifdef CONFIG_PINCTRL_PFC_SH73A0 { "pfc-sh73a0", (kernel_ulong_t)&sh73a0_pinmux_info }, #endif
drivers/pinctrl/sh-pfc/core.h +0 -1
@@ -74,7 +74,6 @@ extern const struct sh_pfc_soc_info r8a7extern const struct sh_pfc_soc_info sh7203_pinmux_info;extern const struct sh_pfc_soc_info sh7264_pinmux_info;extern const struct sh_pfc_soc_info sh7269_pinmux_info; -extern const struct sh_pfc_soc_info sh7372_pinmux_info;extern const struct sh_pfc_soc_info sh73a0_pinmux_info;extern const struct sh_pfc_soc_info sh7720_pinmux_info;extern const struct sh_pfc_soc_info sh7722_pinmux_info;
drivers/pinctrl/sh-pfc/pfc-sh7372.c deleted +0 -2645
2,645 lines not on this page · raw message
PATCH v2 13/14 pinctrl: sh-pfc: sh7372: Remove PFC support
Quoted 11 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove sh7372 PFC support as part of the sh7372 and Mackerel legacy code removal.
Signed-off-by Magnus Damm <[email protected]>Acked-by Laurent Pinchart <[email protected]>---
Changes since V1:
- Removed entry incore.h, thanks Laurent!
Patch applied. Thanks for shrinking stuff!
Yours,
Linus Walleij
Magnus Damm
maintainerPATCH v2 14/14 pinctrl: sh-pfc: sh7372: Remove DT binding documentation
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Remove the DT compatible string entry for the now unsupported sh7372 SoC.
---
Changes since V1:
- None
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt +3 -5
@@ -1,7 +1,7 @@ * Renesas Pin Function Controller (GPIO and Pin Mux/Config) -The Pin Function Controller (PFC) is a Pin Mux/Config controller. On SH7372, -SH73A0, R8A73A4 and R8A7740 it also acts as a GPIO controller. +The Pin Function Controller (PFC) is a Pin Mux/Config controller. On SH73A0, +R8A73A4 and R8A7740 it also acts as a GPIO controller. Pin Control
@@ -16,7 +16,6 @@ Required Properties: - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller. - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller. - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2) compatible pin-controller. - - "renesas,pfc-sh7372": for SH7372 (SH-Mobile AP4) compatible pin-controller. - "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller. - reg: Base address and length of each memory resource used by the pin
@@ -75,8 +74,7 @@ bias-disable, bias-pull-up and bias-pull GPIO ---- -On SH7372, SH73A0, R8A73A4 and R8A7740 the PFC node is also a GPIO controller -node. +On SH73A0, R8A73A4 and R8A7740 the PFC node is also a GPIO controller node. Required Properties:
PATCH v2 14/14 pinctrl: sh-pfc: sh7372: Remove DT binding documentation
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the DT compatible string entry for the now unsupported sh7372 SoC.
Signed-off-by Magnus Damm <[email protected]>Acked-by Laurent Pinchart <[email protected]>
Patch applied.
Yours,
Linus Walleij
v2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
In reply to Magnus DammQuoted 28 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
Quoted 6 lines
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Signed-off-by Magnus Damm <[email protected]>
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
v2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
In reply to Magnus DammQuoted 24 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
Quoted 8 lines
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Sad to see all our hard work being deleted. But at the same time its nice to be able to reduce our footprint by 8681 lines!
I have queued up the first 12 patches of this series, that is the non-pfc patches. They are queued up in a new sh7372-soc-removal-for-v3.21 branch which I intend to push as part of renesas-devel-20150127-v3.19-rc6 a little later today.
With regards to the PFC patches, the last two patches in the series, I have spoken with Laurent about this and my understanding is that his feeling is that they could be merged independently by the pinctl maintainer, Linus Walleij.
Laurent, if that is correct could see about working with Linus towards that goal? If not, please let me know and we can work out another plan.
Quoted 56 lines
Signed-off-by Magnus Damm <[email protected]>---
Built on top of renesas-devel-20150123-v3.19-rc5
Documentation/Makefile | 2 Documentation/arm/Makefile | 1 Documentation/arm/SH-Mobile/Makefile | 7 Documentation/arm/SH-Mobile/vrl4.c | 170 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 Documentation/devicetree/bindings/arm/shmobile.txt | 4 Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 8 MAINTAINERS | 1 arch/arm/Kconfig | 29 arch/arm/Kconfig.debug | 7 arch/arm/boot/compressed/Makefile | 15 arch/arm/boot/compressed/head-shmobile.S | 30 arch/arm/boot/compressed/mmcif-sh7372.c | 88 arch/arm/boot/compressed/sdhi-sh7372.c | 95 arch/arm/boot/compressed/sdhi-shmobile.c | 449 - arch/arm/boot/compressed/sdhi-shmobile.h | 11 arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/sh7372-mackerel.dts | 26 arch/arm/boot/dts/sh7372.dtsi | 35 arch/arm/configs/mackerel_defconfig | 157 arch/arm/mach-shmobile/Kconfig | 16 arch/arm/mach-shmobile/Makefile | 6 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-mackerel.c | 1522 ----- arch/arm/mach-shmobile/clock-sh7372.c | 620 -- arch/arm/mach-shmobile/common.h | 1 arch/arm/mach-shmobile/entry-intc.S | 54 arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 93 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 arch/arm/mach-shmobile/include/mach/mmc.h | 16 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 arch/arm/mach-shmobile/include/mach/sdhi.h | 16 arch/arm/mach-shmobile/include/mach/zboot.h | 5 arch/arm/mach-shmobile/intc-sh7372.c | 672 -- arch/arm/mach-shmobile/pm-sh7372.c | 549 -- arch/arm/mach-shmobile/setup-sh7372.c | 1016 --- arch/arm/mach-shmobile/sh7372.h | 84 arch/arm/mach-shmobile/sleep-sh7372.S | 98 arch/arm/tools/mach-types | 1 drivers/pinctrl/sh-pfc/Kconfig | 5 drivers/pinctrl/sh-pfc/Makefile | 1 drivers/pinctrl/sh-pfc/core.c | 9 drivers/pinctrl/sh-pfc/core.h | 1 drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 ---------- 45 files changed, 8 insertions(+), 8689 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
v2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
Quoted 34 lines · Simon Horman
Quoted 24 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
Quoted 8 lines
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Quoted 7 lines
Sad to see all our hard work being deleted. But at the same time its nice to be able to reduce our footprint by 8681 lines!
I have queued up the first 12 patches of this series, that is the non-pfc patches. They are queued up in a new sh7372-soc-removal-for-v3.21 branch which I intend to push as part of renesas-devel-20150127-v3.19-rc6 a little later today.
BTW, could you check that I queued up things correctly?
Quoted 69 lines
With regards to the PFC patches, the last two patches in the series, I have spoken with Laurent about this and my understanding is that his feeling is that they could be merged independently by the pinctl maintainer, Linus Walleij.
Laurent, if that is correct could see about working with Linus towards that goal? If not, please let me know and we can work out another plan.
Quoted 51 lines
Signed-off-by Magnus Damm <[email protected]>---
Built on top of renesas-devel-20150123-v3.19-rc5
Documentation/Makefile | 2 Documentation/arm/Makefile | 1 Documentation/arm/SH-Mobile/Makefile | 7 Documentation/arm/SH-Mobile/vrl4.c | 170 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 Documentation/devicetree/bindings/arm/shmobile.txt | 4 Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 8 MAINTAINERS | 1 arch/arm/Kconfig | 29 arch/arm/Kconfig.debug | 7 arch/arm/boot/compressed/Makefile | 15 arch/arm/boot/compressed/head-shmobile.S | 30 arch/arm/boot/compressed/mmcif-sh7372.c | 88 arch/arm/boot/compressed/sdhi-sh7372.c | 95 arch/arm/boot/compressed/sdhi-shmobile.c | 449 - arch/arm/boot/compressed/sdhi-shmobile.h | 11 arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/sh7372-mackerel.dts | 26 arch/arm/boot/dts/sh7372.dtsi | 35 arch/arm/configs/mackerel_defconfig | 157 arch/arm/mach-shmobile/Kconfig | 16 arch/arm/mach-shmobile/Makefile | 6 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-mackerel.c | 1522 ----- arch/arm/mach-shmobile/clock-sh7372.c | 620 -- arch/arm/mach-shmobile/common.h | 1 arch/arm/mach-shmobile/entry-intc.S | 54 arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 93 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 arch/arm/mach-shmobile/include/mach/mmc.h | 16 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 arch/arm/mach-shmobile/include/mach/sdhi.h | 16 arch/arm/mach-shmobile/include/mach/zboot.h | 5 arch/arm/mach-shmobile/intc-sh7372.c | 672 -- arch/arm/mach-shmobile/pm-sh7372.c | 549 -- arch/arm/mach-shmobile/setup-sh7372.c | 1016 --- arch/arm/mach-shmobile/sh7372.h | 84 arch/arm/mach-shmobile/sleep-sh7372.S | 98 arch/arm/tools/mach-types | 1 drivers/pinctrl/sh-pfc/Kconfig | 5 drivers/pinctrl/sh-pfc/Makefile | 1 drivers/pinctrl/sh-pfc/core.c | 9 drivers/pinctrl/sh-pfc/core.h | 1 drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 ---------- 45 files changed, 8 insertions(+), 8689 deletions(-)Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Magnus Damm
maintainerv2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
Hi Simon,
Quoted 38 lines · Simon Horman
Quoted 37 lines · Simon Horman
Quoted 24 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
Quoted 8 lines
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Sad to see all our hard work being deleted. But at the same time its nice to be able to reduce our footprint by 8681 lines!
Quoted 6 lines
Quoted 4 lines
I have queued up the first 12 patches of this series, that is the non-pfc patches. They are queued up in a new sh7372-soc-removal-for-v3.21 branch which I intend to push as part of renesas-devel-20150127-v3.19-rc6 a little later today.
BTW, could you check that I queued up things correctly?
It looks fine to me. Thanks for your help!
/ magnus
v2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
Quoted 41 lines · Magnus Damm
Hi Simon,
Quoted 38 lines · Simon Horman
Quoted 37 lines · Simon Horman
Quoted 24 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
Quoted 8 lines
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Sad to see all our hard work being deleted. But at the same time its nice to be able to reduce our footprint by 8681 lines!
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
I have queued up the first 12 patches of this series, that is the non-pfc patches. They are queued up in a new sh7372-soc-removal-for-v3.21 branch which I intend to push as part of renesas-devel-20150127-v3.19-rc6 a little later today.
BTW, could you check that I queued up things correctly?
It looks fine to me. Thanks for your help!
Thanks, for checking.
v2 cover ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
In reply to Simon HormanHi Linus,
Quoted 42 lines · On Tuesday 27 January 2015 10:17:09 Simon Horman wrote:
Quoted 24 lines · Magnus Damm
ARM: shmobile: Remove sh7372/Mackerel and ZBOOT MMC/SDHI support V2
[PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code [PATCH 02/14 v2] ARM: shmobile: mackerel: Remove Legacy C board code [PATCH 03/14 v2] ARM: shmobile: mackerel dts: Remove Legacy DTS file [PATCH 04/14 v2] ARM: shmobile: mackerel: Remove DT binding documentation [PATCH 05/14 v2] ARM: shmobile: mackerel: Remove mach-type entry [PATCH 06/14 v2] ARM: shmobile: mackerel: Remove defconfig [PATCH 07/14 v2] ARM: shmobile: mackerel: Remove from
MAINTAINERS[PATCH 08/14 v2] ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support [PATCH 09/14 v2] ARM: shmobile: sh7372: Remove Legacy C SoC code [PATCH 10/14 v2] ARM: shmobile: sh7372: Remove DT binding documentation [PATCH 11/14 v2] ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file [PATCH 12/14 v2] Documentation: Remove ZBOOT MMC/SDHI utility and docs [PATCH 13/14 v2] pinctrl: sh-pfc: sh7372: Remove PFC support [PATCH 14/14 v2] pinctrl: sh-pfc: sh7372: Remove DT binding documentationHere is my latest attempt (V2) of legacy board and SoC support removal for Mackerel and sh7372. Both the ARM mach-shmobile code base and the PINCTRL subsystem is affected.
Also get rid of the remaining ZBOOT MMC/SDHI code, documentation and utility that has no user once sh7372 is gone.
Quoted 8 lines
The Cortex-A8 based sh7372 SoC is rather old and never went into mass production anyway, so these patches that remove SoC and board support will only affect a few selected developers.
I wish we had some way to make use of the ZBOOT MMC/SDHI code, but without any board or SoC code it makes little sense to keep it.
Thanks to Laurent and Geert for review!
Sad to see all our hard work being deleted. But at the same time its nice to be able to reduce our footprint by 8681 lines!
I have queued up the first 12 patches of this series, that is the non-pfc patches. They are queued up in a new sh7372-soc-removal-for-v3.21 branch which I intend to push as part of renesas-devel-20150127-v3.19-rc6 a little later today.
Quoted 7 lines
With regards to the PFC patches, the last two patches in the series, I have spoken with Laurent about this and my understanding is that his feeling is that they could be merged independently by the pinctl maintainer, Linus Walleij.
Laurent, if that is correct could see about working with Linus towards that goal? If not, please let me know and we can work out another plan.
The following changes since commit 4d1216ba80e8e6269e56dc043364b661ee0a7c23:
Merge branch 'devel' into for-next (2015-01-27 09:57:36 +0100)
are available in the git repository at:
git://linuxtv.org/pinchartl/fbdev.git pinmux/next/pfc
for you to fetch changes up to 1f35f33e117303ca450ce4be67a7fb6ec9cb90f8:
pinctrl: sh-pfc: sh7372: Remove DT binding documentation (2015-01-27
21:41:59 +0200)
----------------------------------------------------------------
Magnus Damm (2):
pinctrl: sh-pfc: sh7372: Remove PFC support
pinctrl: sh-pfc: sh7372: Remove DT binding documentation
.../devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 8 +- drivers/pinctrl/sh-pfc/Kconfig | 5 - drivers/pinctrl/sh-pfc/Makefile | 1 - drivers/pinctrl/sh-pfc/core.c | 9 - drivers/pinctrl/sh-pfc/core.h | 1 - drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 -------------- 6 files changed, 3 insertions(+), 2666 deletions(-) delete mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7372.c
Signature · 3 lines
Regards, Laurent Pinchart