Commit ccb1cfcb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc 

From Simon Horman:
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740: Enable PMU
  ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
  ARM: shmobile: r8a7779: add I2C driver support
  ARM: shmobile: r8a7779: add I2C clock support
  ARM: shmobile: r8a7779: add HSPI clock support
  ARM: shmobile: r8a7740: fixup DT machine desc name typo
  ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode
  ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode
  ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode
  ARM: shmobile: Remove SH7377 support
  ARM: shmobile: Remove SH7367 support
parents 4bddddf2 86bc52ef

arch/arm/boot/dts/sh7377.dtsi

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

 * Device Tree Source for the sh7377 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,sh7377";



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a8";

		};

	};

};

arch/arm/configs/armadillo800eva_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# 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

arch/arm/configs/marzen_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ CONFIG_SERIAL_SH_SCI=y 
CONFIG_SERIAL_SH_SCI_NR_UARTS=6

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_RCAR=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

arch/arm/mach-shmobile/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -2,18 +2,6 @@ if ARCH_SHMOBILE 


comment "SH-Mobile System Type"



config ARCH_SH7367

	bool "SH-Mobile G3 (SH7367)"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select CPU_V6

	select SH_CLK_CPG



config ARCH_SH7377

	bool "SH-Mobile G4 (SH7377)"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select CPU_V7

	select SH_CLK_CPG



config ARCH_SH7372

	bool "SH-Mobile AP4 (SH7372)"

	select ARCH_WANT_OPTIONAL_GPIOLIB

arch/arm/mach-shmobile/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
obj-y				:= timer.o console.o clock.o



# CPU objects

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o

obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o

obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o

obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o

obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
@@ -23,16 +21,12 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o 


# Pinmux setup

pfc-y				:=

pfc-$(CONFIG_ARCH_SH7367)	+= pfc-sh7367.o

pfc-$(CONFIG_ARCH_SH7377)	+= pfc-sh7377.o

pfc-$(CONFIG_ARCH_SH7372)	+= pfc-sh7372.o

pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o

pfc-$(CONFIG_ARCH_R8A7740)	+= pfc-r8a7740.o

pfc-$(CONFIG_ARCH_R8A7779)	+= pfc-r8a7779.o



# IRQ objects

obj-$(CONFIG_ARCH_SH7367)	+= entry-intc.o

obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o

obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE