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

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

Merge tag 'renesas-lager-board-removal-for-v3.20' of... 

Merge tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Lager Board Removal for v3.20" from Simon Horman:

"The serial port rename changes are not strictly related to lager board
removal from a feature point of view. But the lager portion of this change
depends on board removal to avoid a regression of booting using that code,
And thus it seems to make sense to put here. And it seems best to put the
koelsch and lager serial port rename changes in the same branch.

Likewise the removal of bootargs from lager DT depends on removing lager
board code to avoid a regression when using it and thus I have included
it in the same branch."

* Remove legacy r8a7790 SoC and its Lager board code
* Update serial port names on koelsch and lager boards
* Remove console bootargs parameter from lager DT

* tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: lager dts: Drop console= bootargs parameter
  ARM: shmobile: koelsch: Rename SCIF[01] serial ports to ttySC[01]
  ARM: shmobile: lager: Rename SCIFA[01] serial ports to ttySC[01]
  ARM: shmobile: r8a7790: Remove legacy code
  ARM: shmobile: lager: Remove legacy board support
  ARM: shmobile: lager-reference: DTS-only board support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eaa27f34 569dd56c

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -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/lager_defconfig

F:	arch/arm/configs/mackerel_defconfig

F:	arch/arm/configs/marzen_defconfig

F:	arch/arm/configs/shmobile_defconfig

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ 
	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7790-lager.dtb \

	sh7372-mackerel.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb

arch/arm/boot/dts/r8a7790-lager.dts

+3 −3
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ 
	compatible = "renesas,lager", "renesas,r8a7790";



	aliases {

		serial6 = &scifa0;

		serial7 = &scifa1;

		serial0 = &scifa0;

		serial1 = &scifa1;

	};



	chosen {

		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = &scifa0;

	};

arch/arm/boot/dts/r8a7791-koelsch.dts

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
	compatible = "renesas,koelsch", "renesas,r8a7791";



	aliases {

		serial6 = &scif0;

		serial7 = &scif1;

		serial0 = &scif0;

		serial1 = &scif1;

	};



	chosen {

arch/arm/configs/lager_defconfig

deleted100644 → 0
+0 −150
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

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

CONFIG_MACH_LAGER=y

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_EM_TIMER_STI is not set

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PCI=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_HAVE_ARM_ARCH_TIMER=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_AUTO_ZRELADDR=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_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_RCAR=y

CONFIG_NETDEVICES=y

# CONFIG_NET_CORE is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM 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_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET 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_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=10

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_GPIO=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_RSPI=y

CONFIG_SPI_SH_MSIOF=y

CONFIG_GPIO_SH_PFC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_RCAR=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_VIDEO_RCAR_VIN=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_ADV7180=y

CONFIG_DRM=y

CONFIG_DRM_RCAR_DU=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_RCAR=y

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

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=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_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set