Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63f34693 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-cleanup-for-v4.3' of... 

Merge tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Cleanup for v4.3" from Simon Horman:

* Remove non-multiplatform code from timer
* Remove CONFIG_ARCH_SHMOBILE_MULTI check in setup-rcar-gen2.c
  as it is always true
* Remove legacy (non-multiplatform) support for both sh73a0/kzm9g and
  r8a7740/armadillo800eva
* Move to_rmobile_pd from header to source file where it is used
* Use BIT() macro instead of open coding in r-mobile PM code
* r8a7779: Remove usage of GENPD_FLAG_PM_CLK flag which has no effect

* tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
  ARM: shmobile: R-Car Gen2: CONFIG_ARCH_SHMOBILE_MULTI is always set
  ARM: shmobile: Remove obsolete zboot support
  ARM: shmobile: R-Mobile: Remove legacy PM Domain code
  ARM: shmobile: Remove unused dma-register.h
  ARM: shmobile: Remove legacy SoC code for R-Mobile A1
  ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
  ARM: shmobile: Remove legacy armadillo800eva_defconfig
  ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
  ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
  ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
  ARM: shmobile: Remove legacy kzm9g_defconfig
  ARM: shmobile: Remove legacy board code for KZM-A9-GT
  ARM: shmobile: r8a7779: Remove GENPD_FLAG_PM_CLK flag
  ARM: shmobile: R-Mobile: Use BIT() macro instead of open coding
  ARM: shmobile: R-Mobile: Move to_rmobile_pd from header to source file

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bc0195aa 20834a40

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1464,9 +1464,7 @@ F: arch/arm/boot/dts/emev2* 
F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/sh*

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/kzm9g_defconfig

F:	arch/arm/configs/marzen_defconfig

F:	arch/arm/configs/shmobile_defconfig

F:	arch/arm/include/debug/renesas-scif.S

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif



#

# We now have a PIC decompressor implementation.  Decompressors running

# from RAM should not define ZTEXTADDR.  Decompressors running directly

arch/arm/boot/compressed/head-shmobile.S

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/*

 * The head-file for SH-Mobile ARM platforms

 *

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 * Simon Horman <horms@verge.net.au>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#ifdef CONFIG_ZBOOT_ROM



	.section	".start", "ax"



	/* load board-specific initialization code */

#include <mach/zboot.h>



	adr	r0, dtb_info

	ldmia	r0, {r1, r3, r4, r5, r7}



	sub	r0, r0, r1		@ calculate the delta offset

	add	r5, r5, r0		@ _edata



	ldr	lr, [r5, #0]		@ check if valid DTB is present

	cmp	lr, r3

	bne	0f



	add	r9, r7, #31		@ rounded up to a multiple

	bic	r9, r9, #31		@ ... of 32 bytes



	add	r6, r9, r5		@ copy from _edata

	add	r9, r9, r4		@ to MEMORY_START



1:	ldmdb	r6!, {r0 - r3, r10 - r12, lr}

	cmp	r6, r5

	stmdb	r9!, {r0 - r3, r10 - r12, lr}

	bhi	1b



	/* Success: Zero board ID, pointer to start of memory for atag/dtb */

	mov	r7, #0

	mov	r8, r4

	b	2f



	.align	2

dtb_info:

	.word	dtb_info

#ifndef __ARMEB__

	.word	0xedfe0dd0		@ sig is 0xd00dfeed big endian

#else

	.word	0xd00dfeed

#endif

	.word	MEMORY_START

	.word	_edata

	.word	0x4000			@ maximum DTB size

0:

	/* Failure: Zero board ID, NULL atag/dtb */

	mov 	r7, #0

	mov	r8, #0			@ pass null pointer as atag

2 :



#endif /* CONFIG_ZBOOT_ROM */

arch/arm/boot/dts/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -501,11 +501,9 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
	s5pv210-smdkv210.dtb \

	s5pv210-torbreck.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7779-marzen.dtb \

	sh73a0-kzm9g.dtb

	r8a7779-marzen.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \

	emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

arch/arm/configs/armadillo800eva_defconfig

deleted100644 → 0
+0 −162
Original line number Diff line number Diff line 
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_PID_NS is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_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_R8A7740=y

CONFIG_MACH_ARMADILLO800EVA=y

# CONFIG_SH_TIMER_TMU is not set

CONFIG_ARM_THUMB=y

CONFIG_CACHE_L2X0=y

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_ARM_ERRATA_460075=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_ARM_ERRATA_775420=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_KEXEC=y

CONFIG_VFP=y

CONFIG_NEON=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_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_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CIRRUS 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_SH_ETH=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

# CONFIG_SERIO 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=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9T112=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_HDMI=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 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_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y

CONFIG_USB_ETH=m

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_RTC_CLASS=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

CONFIG_PWM=y

CONFIG_PWM_RENESAS_TPU=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_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=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_CBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_XZ_DEC=y