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

Commit 9dd289a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'renesas/cleanup' into next/dt 

Dependency for renesas/dt
parents a362ec8f 04418c23

Documentation/devicetree/bindings/arm/shmobile.txt

+0 −6
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ Boards: 
    compatible = "renesas,armadillo800eva"

  - BOCK-W

    compatible = "renesas,bockw", "renesas,r8a7778"

  - BOCK-W - Reference Device Tree Implementation

    compatible = "renesas,bockw-reference", "renesas,r8a7778"

  - Genmai (RTK772100BC00000BR)

    compatible = "renesas,genmai", "renesas,r7s72100"

  - Gose
@@ -57,7 +55,3 @@ Boards: 
    compatible = "renesas,lager", "renesas,r8a7790"

  - Marzen

    compatible = "renesas,marzen", "renesas,r8a7779"
 


Note: Reference Device Tree Implementations are temporary implementations

      to ease the migration from platform devices to Device Tree, and are

      intended to be removed in the future.

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1496,8 +1496,6 @@ F: arch/arm/boot/dts/emev2* 
F:	arch/arm/boot/dts/r7s*

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

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

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/marzen_defconfig

F:	arch/arm/configs/shmobile_defconfig

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

F:	arch/arm/mach-shmobile/

arch/arm/Kconfig

+1 −25
Original line number Diff line number Diff line
@@ -621,28 +621,6 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_SHMOBILE_LEGACY

	bool "Renesas ARM SoCs (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT if MMU

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MULTI_IRQ_HANDLER

	select NO_IOPORT_MAP

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select SH_CLK_CPG

	select SPARSE_IRQ

	help

	  Support for Renesas ARM SoC platforms using a non-multiplatform

	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car

	  and RZ families.



config ARCH_RPC

	bool "RiscPC"

	select ARCH_ACORN
@@ -1534,7 +1512,6 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default 128 if SOC_AT91RM9200

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1752,8 +1729,7 @@ config ARM_MODULE_PLTS 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	int "Maximum zone order"

	default "12" if SOC_AM33XX

	default "9" if SA1111 || ARCH_EFM32

	default "11"

arch/arm/Kconfig.debug

+1 −2
Original line number Diff line number Diff line
@@ -1621,8 +1621,7 @@ config DEBUG_UNCOMPRESS 
config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \

					ARCH_SHMOBILE_LEGACY

					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/boot/dts/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -522,9 +522,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
	s5pv210-smdkc110.dtb \

	s5pv210-smdkv210.dtb \

	s5pv210-torbreck.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \

	emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \