Second round of Renesas ARM based SoC cleanups for v3.12
Subsystems (5)
cover Second round of Renesas ARM based SoC cleanups for v3.12
Hi Olof, Hi Arnd,
Please consider this second round of Renesas ARM based SoC cleanups for v3.12.
This pull-request is based on a merge of renesas-tpu-pwm-for-v3.12, renesas-backlight-for-v3.12 and renesas-soc-for-v3.12, each of which I have previously sent a pull-request for, in order to provide the pre-requisite code that that is being removed or cleaned up.
The following changes since commit 4431374926363df1d907d9c8783f473eb7facf42:
Merge branches 'tpu-pwm', 'backlight' and 'soc' into cleanup2-base (2013-07-24 16:35:12 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.12
for you to fetch changes up to 98724b7ec9d34d875fc193660c87d6dd0d17ceb7:
ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file (2013-07-30 14:21:43 +0900)
----------------------------------------------------------------
Second round of Renesas ARM based SoC cleanups for v3.12
* Remove mach/hardware.h which has no useful contents
* Remove ag5evm board support
* Remove kota2 board support
* Use pm-rmobile on sh7372 and r8a7740 SoCs only, it is otherwise unneeded
* Remove use of INTC header on r8a7779 and r8a7740 SoCs
* Cleanup registration of usb phy in r8a7779 SoC
* Remove '0x's from R8A7779 DTS file for r8a7779 SoC
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: r8a7779: cleanup registration of usb phy
Lee Jones (1):
ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file
Magnus Damm (10):
ARM: shmobile: Remove sh73a0 use of <mach/hardware.h>
ARM: shmobile: Remove sh7372 use of <mach/hardware.h>
ARM: shmobile: Remove EMEV2 use of <mach/hardware.h>
ARM: shmobile: Remove r8a7779 use of <mach/hardware.h>
ARM: shmobile: Remove Marzen use of <mach/hardware.h>
ARM: shmobile: Remove include <mach/hardware.h>
ARM: shmobile: r8a73a4: Remove ->init_machine() special case
ARM: shmobile: Use pm-rmobile on sh7372 and r8a7740 only
ARM: shmobile: No need to use INTC demux on r8a7740
ARM: shmobile: No need to use INTC header on r8a7779
Simon Horman (2):
ARCH: ARM: shmobile: Remove kota2 board support
ARCH: ARM: shmobile: Remove ag5evm board support
arch/arm/boot/dts/r8a7779.dtsi | 8 +- arch/arm/configs/ag5evm_defconfig | 83 ---- arch/arm/configs/kota2_defconfig | 121 ----- arch/arm/mach-shmobile/Kconfig | 13 - arch/arm/mach-shmobile/Makefile | 10 +- arch/arm/mach-shmobile/Makefile.boot | 2 - arch/arm/mach-shmobile/board-ag5evm.c | 639 ------------------------- arch/arm/mach-shmobile/board-kota2.c | 550 --------------------- arch/arm/mach-shmobile/board-marzen.c | 25 +- arch/arm/mach-shmobile/include/mach/hardware.h | 4 - arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 - arch/arm/mach-shmobile/intc-r8a7779.c | 1 - arch/arm/mach-shmobile/setup-emev2.c | 1 - arch/arm/mach-shmobile/setup-r8a73a4.c | 6 - arch/arm/mach-shmobile/setup-r8a7779.c | 19 - arch/arm/mach-shmobile/setup-sh7372.c | 1 - arch/arm/mach-shmobile/setup-sh73a0.c | 1 - 17 files changed, 29 insertions(+), 1457 deletions(-) delete mode 100644 arch/arm/configs/ag5evm_defconfig delete mode 100644 arch/arm/configs/kota2_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ag5evm.c delete mode 100644 arch/arm/mach-shmobile/board-kota2.c delete mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h
PATCH 1/14 ARCH: ARM: shmobile: Remove kota2 board support
Remove support for the sh73a0 based kota2 board.
The sh73a0 SoC is continued to be supported using
the kzm9g board.
--- arch/arm/configs/kota2_defconfig | 121 -------- arch/arm/mach-shmobile/Kconfig | 6 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-kota2.c | 550 ----------------------------------- 5 files changed, 679 deletions(-) delete mode 100644 arch/arm/configs/kota2_defconfig delete mode 100644 arch/arm/mach-shmobile/board-kota2.c
arch/arm/configs/kota2_defconfig deleted +0 -121
@@ -1,121 +0,0 @@ -# CONFIG_ARM_PATCH_PHYS_VIRT is not set -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CGROUPS=y -CONFIG_CPUSETS=y -CONFIG_NAMESPACES=y -# 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_SYSCTL_SYSCALL=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_KEYBOARD_GPIO_POLLED=y -CONFIG_ARCH_SH73A0=y -CONFIG_MACH_KOTA2=y -CONFIG_MEMORY_SIZE=0x1e000000 -# CONFIG_SH_TIMER_TMU is not set -# CONFIG_SWP_EMULATE is not set -CONFIG_CPU_BPREDICT_DISABLE=y -CONFIG_ARM_ERRATA_460075=y -CONFIG_ARM_ERRATA_742230=y -CONFIG_ARM_ERRATA_742231=y -CONFIG_PL310_ERRATA_588369=y -CONFIG_ARM_ERRATA_720789=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_ARM_ERRATA_743622=y -CONFIG_ARM_ERRATA_751472=y -CONFIG_PL310_ERRATA_753970=y -CONFIG_ARM_ERRATA_754322=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel" -CONFIG_CMDLINE_FORCE=y -CONFIG_KEXEC=y -CONFIG_CPU_IDLE=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=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_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_CFG80211=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_MAC80211=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_SMSC911X=y -# CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_B43=y -CONFIG_B43_PHY_N=y -CONFIG_B43_DEBUG=y -CONFIG_INPUT_SPARSEKMAP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_SH_KEYSC=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=9 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C_SH_MOBILE=y -# CONFIG_HWMON is not set -CONFIG_BCMA=y -CONFIG_BCMA_DEBUG=y -CONFIG_FB=y -CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_LCD_PLATFORM=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_MMC=y -CONFIG_MMC_SDHI=y -CONFIG_MMC_SH_MMCIF=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_RENESAS_TPU=y -CONFIG_LEDS_TRIGGERS=y -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_REDUCED=y -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y
arch/arm/mach-shmobile/Kconfig +0 -6
@@ -91,12 +91,6 @@ config MACH_MACKEREL select SND_SOC_AK4642 if SND_SIMPLE_CARD select USE_OF -config MACH_KOTA2 - bool "KOTA2 board" - depends on ARCH_SH73A0 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - config MACH_ARMADILLO800EVA bool "Armadillo-800 EVA board" depends on ARCH_R8A7740
arch/arm/mach-shmobile/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o -obj-$(CONFIG_MACH_KOTA2) += board-kota2.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -5,7 +5,6 @@ loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 -loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
arch/arm/mach-shmobile/board-kota2.c deleted +0 -550
550 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 2/14 ARCH: ARM: shmobile: Remove ag5evm board support
In reply to Simon HormanRemove support for the sh73a0 based ag5evm board.
The sh73a0 SoC is continued to be supported using
the kzm9g board.
--- arch/arm/configs/ag5evm_defconfig | 83 ----- arch/arm/mach-shmobile/Kconfig | 7 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ag5evm.c | 639 ---------------------------------- 5 files changed, 731 deletions(-) delete mode 100644 arch/arm/configs/ag5evm_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/configs/ag5evm_defconfig deleted +0 -83
@@ -1,83 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_NAMESPACES=y -# 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_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_EXPERT=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH73A0=y -CONFIG_MACH_AG5EVM=y -CONFIG_MEMORY_SIZE=0x10000000 -CONFIG_CPU_BPREDICT_DISABLE=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_458693=y -CONFIG_NO_HZ=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0 console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel" -CONFIG_CMDLINE_FORCE=y -CONFIG_KEXEC=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=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_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_BLK_DEV 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_SPARSEKMAP=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=9 -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_FB=y -CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_FTRACE is not set
arch/arm/mach-shmobile/Kconfig +0 -7
@@ -71,13 +71,6 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_AG5EVM - bool "AG5EVM board" - depends on ARCH_SH73A0 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SH_LCD_MIPI_DSI - config MACH_APE6EVM bool "APE6EVM board" depends on ARCH_R8A73A4
arch/arm/mach-shmobile/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects -obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -1,6 +1,5 @@ # per-board load address for uImage loadaddr-y := -loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
arch/arm/mach-shmobile/board-ag5evm.c deleted +0 -639
639 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 3/14 ARM: shmobile: Remove sh73a0 use of <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove unused <mach/hardware.h> on sh73a0.
--- arch/arm/mach-shmobile/setup-sh73a0.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/setup-sh73a0.c +0 -1
@@ -34,7 +34,6 @@#include <linux/platform_data/sh_ipmmu.h> #include <linux/platform_data/irq-renesas-intc-irqpin.h> #include <mach/dma-register.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/sh73a0.h> #include <mach/common.h>
Signature · 1 line
1.8.3.2
PATCH 4/14 ARM: shmobile: Remove sh7372 use of <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove unused <mach/hardware.h> on sh7372.
--- arch/arm/mach-shmobile/setup-sh7372.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/setup-sh7372.c +0 -1
@@ -35,7 +35,6 @@#include <linux/dma-mapping.h> #include <linux/platform_data/sh_ipmmu.h> #include <mach/dma-register.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/sh7372.h> #include <mach/common.h>
Signature · 1 line
1.8.3.2
PATCH 5/14 ARM: shmobile: Remove EMEV2 use of <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove unused <mach/hardware.h> on EMEV2.
--- arch/arm/mach-shmobile/setup-emev2.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/setup-emev2.c +0 -1
@@ -27,7 +27,6 @@#include <linux/input.h> #include <linux/io.h> #include <linux/irqchip/arm-gic.h> -#include <mach/hardware.h> #include <mach/common.h> #include <mach/emev2.h> #include <mach/irqs.h>
Signature · 1 line
1.8.3.2
PATCH 6/14 ARM: shmobile: Remove r8a7779 use of <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove unused <mach/hardware.h> on r8a7779.
--- arch/arm/mach-shmobile/setup-r8a7779.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/setup-r8a7779.c +0 -1
@@ -37,7 +37,6 @@#include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> #include <linux/pm_runtime.h> -#include <mach/hardware.h> #include <mach/irqs.h> #include <mach/r8a7779.h> #include <mach/common.h>
Signature · 1 line
1.8.3.2
PATCH 7/14 ARM: shmobile: Remove Marzen use of <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove unused <mach/hardware.h> on Marzen.
--- arch/arm/mach-shmobile/board-marzen.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/board-marzen.c +0 -1
@@ -37,7 +37,6 @@#include <linux/mmc/host.h> #include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mfd/tmio.h> -#include <mach/hardware.h> #include <mach/r8a7779.h> #include <mach/common.h> #include <mach/irqs.h>
Signature · 1 line
1.8.3.2
PATCH 8/14 ARM: shmobile: Remove include <mach/hardware.h>
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Now when no one is using this file, remove <mach/hardware.h>.
--- arch/arm/mach-shmobile/include/mach/hardware.h | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h
arch/arm/mach-shmobile/include/mach/hardware.h deleted +0 -4
@@ -1,4 +0,0 @@ -#ifndef __ASM_MACH_HARDWARE_H -#define __ASM_MACH_HARDWARE_H - -#endif /* __ASM_MACH_HARDWARE_H */
Signature · 1 line
1.8.3.2
PATCH 9/14 ARM: shmobile: r8a73a4: Remove ->init_machine() special case
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
No need to special case r8a73a4 ->init_machine(), so get rid of undesired cpufreq platform device from the generic long term r8a73a4 DT support code.
For short term support on APE6EVM the DT reference implementation already adds a "cpufreq-cpu0" platform device so that can be used for development.
Regarding more long term cpufreq support, perhaps it makes sense to adjust the cpufreq driver to check for DT information directly instead of using a platform device for software configuration and DT for hardware parameters.
--- arch/arm/mach-shmobile/setup-r8a73a4.c | 6 ------ 1 file changed, 6 deletions(-)
arch/arm/mach-shmobile/setup-r8a73a4.c +0 -6
@@ -210,11 +210,6 @@ void __init r8a73a4_init_delay(void) }#ifdef CONFIG_USE_OF -void __init r8a73a4_add_standard_devices_dt (void ) -{ -platform_device_register_simple ("cpufreq-cpu0" ,-1 ,NULL ,0 ); -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -}static const char *r8a73a4_boards_compat_dt[]__initdata = { "renesas,r8a73a4",
@@ -223,7 +218,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {DT_MACHINE_START (R8A73A4_DT ,"Generic R8A73A4 (Flattened Device Tree)" ) .init_early = r8a73a4_init_delay, - .init_machine = r8a73a4_add_standard_devices_dt, .init_time = shmobile_timer_init, .dt_compat = r8a73a4_boards_compat_dt,MACHINE_END
Signature · 1 line
1.8.3.2
PATCH 10/14 ARM: shmobile: Use pm-rmobile on sh7372 and r8a7740 only
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
The functions in pm-rmobile.c are only used on sh7372 and r8a7740, so adjust the Makefile to only link in that file in case those SoCs are selected.
--- arch/arm/mach-shmobile/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-shmobile/Makefile +3 -4
@@ -28,11 +28,10 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o -obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o -obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o -obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o +obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o +obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o +obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o # Board objects obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
Signature · 1 line
1.8.3.2
PATCH 11/14 ARM: shmobile: No need to use INTC demux on r8a7740
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Now when the r8a7740 code has been converted to make use of GIC instead of INTC for root interrupt controller it is possible to exclude the low level INTC demux function shmobile_handle_irq_intc from linking.
--- arch/arm/mach-shmobile/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-shmobile/Makefile +0 -1
@@ -23,7 +23,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o # IRQ objects obj-$(CONFIG_ARCH_SH7372) += entry-intc.o -obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o
Signature · 1 line
1.8.3.2
PATCH 12/14 ARM: shmobile: No need to use INTC header on r8a7779
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Now when the intc-irqpin driver is used for external IRQ pins on r8a7779 it possible to get rid of unused INTC headers mach/intc.h and linux/sh_intc.h.
--- arch/arm/mach-shmobile/intc-r8a7779.c | 1 - arch/arm/mach-shmobile/setup-r8a7779.c | 1 - 2 files changed, 2 deletions(-)
arch/arm/mach-shmobile/intc-r8a7779.c +0 -1
@@ -27,7 +27,6 @@#include <linux/platform_data/irq-renesas-intc-irqpin.h> #include <linux/irqchip.h> #include <mach/common.h> -#include <mach/intc.h> #include <mach/irqs.h> #include <mach/r8a7779.h> #include <asm/mach-types.h>
arch/arm/mach-shmobile/setup-r8a7779.c +0 -1
@@ -29,7 +29,6 @@#include <linux/input.h> #include <linux/io.h> #include <linux/serial_sci.h> -#include <linux/sh_intc.h> #include <linux/sh_timer.h> #include <linux/dma-mapping.h> #include <linux/usb/otg.h>
Signature · 1 line
1.8.3.2
PATCH 13/14 ARM: shmobile: r8a7779: cleanup registration of usb phy
In reply to Simon HormanFrom: Kuninori Morimoto <[email protected]>
usb phy driver which needs platform data at the time of registration is used from Marzen only.
Now, ARM/shmobile aims to support DT,
and the C code base board support will be removed if DT support is completed.
Current driver registration method which needs platform data and which is not shared complicates codes.
This means legacy C code cleanup after DT supporting will be more complicated
This patch registers it on board code as cleanup C code
--- arch/arm/mach-shmobile/board-marzen.c | 24 ++++++++++++++++++++++-- arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 -- arch/arm/mach-shmobile/setup-r8a7779.c | 17 ----------------- 3 files changed, 22 insertions(+), 21 deletions(-)
arch/arm/mach-shmobile/board-marzen.c +22 -2
@@ -29,6 +29,7 @@#include <linux/dma-mapping.h> #include <linux/pinctrl/machine.h> #include <linux/platform_data/gpio-rcar.h> +#include <linux/platform_data/usb-rcar-phy.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h>
@@ -56,7 +57,26 @@ static struct regulator_consumer_supply dummy_supplies[] = { REGULATOR_SUPPLY("vdd33a", "smsc911x"), }; -static struct rcar_phy_platform_data usb_phy_platform_data__initdata ; +/* USB PHY */ +static struct resource usb_phy_resources[] = { + [0 ] = { + .start =0xffe70800 , + .end =0xffe70900 -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct rcar_phy_platform_data usb_phy_platform_data; + +static struct platform_device usb_phy = { + .name ="rcar_usb_phy" , + .id =-1 , + .dev = { + .platform_data = &usb_phy_platform_data, + }, + .resource = usb_phy_resources, + .num_resources =ARRAY_SIZE (usb_phy_resources), +};/* SMSC LAN89218 */ static struct resource smsc911x_resources[] = {
@@ -183,6 +203,7 @@ static struct platform_device *marzen_devices[] __initdata = { &thermal_device, &hspi_device, &leds_device, + &usb_phy, }; static const struct pinctrl_map marzen_pinctrl_map[] = {
@@ -233,7 +254,6 @@ static void __init marzen_init(void)r8a7779_init_irq_extpin (1 );/* IRQ1 as individual interrupt */ r8a7779_add_standard_devices (); -r8a7779_add_usb_phy_device (&usb_phy_platform_data);platform_add_devices (marzen_devices,ARRAY_SIZE (marzen_devices)); }
arch/arm/mach-shmobile/include/mach/r8a7779.h +0 -2
@@ -4,7 +4,6 @@#include <linux/sh_clk.h> #include <linux/pm_domain.h> #include <linux/sh_eth.h> -#include <linux/platform_data/usb-rcar-phy.h> struct platform_device ;
@@ -34,7 +33,6 @@ extern void r8a7779_add_early_devices(void);extern void r8a7779_add_standard_devices (void );extern void r8a7779_add_standard_devices_dt (void );extern void r8a7779_add_ether_device (struct sh_eth_plat_data *pdata); -extern void r8a7779_add_usb_phy_device (struct rcar_phy_platform_data *pdata);extern void r8a7779_init_late (void );extern void r8a7779_clock_init (void );extern void r8a7779_pinmux_init (void );
arch/arm/mach-shmobile/setup-r8a7779.c +0 -17
@@ -386,15 +386,6 @@ static struct platform_device sata_device = { }, }; -/* USB PHY */ -static struct resource usb_phy_resources[]__initdata = { - [0 ] = { - .start =0xffe70800 , - .end =0xffe70900 -1 , - .flags =IORESOURCE_MEM , - }, -}; -/* USB */ static struct usb_phy *phy;
@@ -600,14 +591,6 @@ void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata) pdata, sizeof(*pdata)); } -void __init r8a7779_add_usb_phy_device (struct rcar_phy_platform_data *pdata) -{ -platform_device_register_resndata (&platform_bus,"rcar_usb_phy" ,-1 , - usb_phy_resources, -ARRAY_SIZE (usb_phy_resources), - pdata,sizeof (*pdata)); -} -/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ void __init __weak r8a7779_register_twd (void ) { }
Signature · 1 line
1.8.3.2
PATCH 14/14 ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file
In reply to Simon HormanFrom: Lee Jones <[email protected]>
--- arch/arm/boot/dts/r8a7779.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/r8a7779.dtsi +4 -4
@@ -65,7 +65,7 @@ sense-bitfield-width = <2>; }; - i2c0: i2c at 0xffc70000 { + i2c0: i2c at ffc70000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -74,7 +74,7 @@ interrupts = <0 79 0x4>; }; - i2c1: i2c at 0xffc71000 { + i2c1: i2c at ffc71000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -83,7 +83,7 @@ interrupts = <0 82 0x4>; }; - i2c2: i2c at 0xffc72000 { + i2c2: i2c at ffc72000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
@@ -92,7 +92,7 @@ interrupts = <0 80 0x4>; }; - i2c3: i2c at 0xffc73000 { + i2c3: i2c at ffc73000 { #address-cells = <1>; #size-cells = <0>; compatible = "renesas,rmobile-iic";
Signature · 1 line
1.8.3.2
cover Second round of Renesas ARM based SoC cleanups for v3.12
In reply to Simon HormanQuoted 9 lines · Simon Horman
Hi Olof, Hi Arnd,
Please consider this second round of Renesas ARM based SoC cleanups for v3.12.
This pull-request is based on a merge of renesas-tpu-pwm-for-v3.12, renesas-backlight-for-v3.12 and renesas-soc-for-v3.12, each of which I have previously sent a pull-request for, in order to provide the pre-requisite code that that is being removed or cleaned up.
Hm, I'm a little sad to see the added circular dependency here. It would have been very nice if the patches could be organized such that it would have been avoided.
I'll probably pull this in as a new next/* branch, but if you can avoid these next release cycle without it complicating things too much that'd be awesome.
-Olof
cover Second round of Renesas ARM based SoC cleanups for v3.12
In reply to Simon HormanQuoted 10 lines · Simon Horman
Hi Olof, Hi Arnd,
Please consider this second round of Renesas ARM based SoC cleanups for v3.12.
This pull-request is based on a merge of renesas-tpu-pwm-for-v3.12, renesas-backlight-for-v3.12 and renesas-soc-for-v3.12, each of which I have previously sent a pull-request for, in order to provide the pre-requisite code that that is being removed or cleaned up.
Quoted 8 lines
The following changes since commit
4431374926363df1d907d9c8783f473eb7facf42:Merge branches 'tpu-pwm', 'backlight' and 'soc' into cleanup2-base (2013-07-24 16:35:12 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.gittags/renesas-cleanup2-for-v3.12
Pulled.
Given that you have inversed the chain of dependencies, I'll just keep all the "late" (inverted and actual late) renesas branches in one topic now, since it's just busy work to create next/cleanup2, next/soc2, next/boards2, etc, just for renesas.
-Olof