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

Commit 70d4f2e5 authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'heads/soc2' into boards2-base

parents be0647d5 250d829f

arch/arm/mach-shmobile/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARCH_SHMOBILE_MULTI 
	select HAVE_SMP

	select ARM_GIC

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select NO_IOPORT

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB
@@ -111,6 +112,7 @@ config ARCH_R8A7790 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select RENESAS_IRQC
@@ -119,6 +121,7 @@ config ARCH_R8A7791 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select RENESAS_IRQC
@@ -127,6 +130,7 @@ config ARCH_EMEV2 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select USE_OF

	select AUTO_ZRELADDR
@@ -265,6 +269,7 @@ config MACH_KOELSCH 
	bool "Koelsch board"

	depends on ARCH_R8A7791

	select USE_OF

	select MICREL_PHY if SH_ETH



config MACH_KOELSCH_REFERENCE

	bool "Koelsch board - Reference Device Tree Implementation"

arch/arm/mach-shmobile/board-bockw.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mmc/sh_mmcif.h>

#include <linux/mtd/partitions.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/camera-rcar.h>

#include <linux/platform_data/usb-rcar-phy.h>

#include <linux/platform_device.h>

#include <linux/regulator/fixed.h>

arch/arm/mach-shmobile/clock-r7s72100.c

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]),

	CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),

};



void __init r7s72100_clock_init(void)

arch/arm/mach-shmobile/clock-r8a7790.c

+4 −0
Original line number Diff line number Diff line
@@ -292,9 +292,13 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),

	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),

	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),

	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),

	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),

	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),

	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),

	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),

	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

arch/arm/mach-shmobile/clock-r8a7791.c

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static struct clk *main_clks[] = { 


/* MSTP */

enum {

	MSTP813,

	MSTP726, MSTP724, MSTP723, MSTP721, MSTP720,

	MSTP719, MSTP718, MSTP715, MSTP714,

	MSTP522,
@@ -132,6 +133,7 @@ enum { 
};



static struct clk mstp_clks[MSTP_NR] = {

	[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */

	[MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */

	[MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */

	[MSTP723] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 23, 0), /* DU1 */
@@ -192,6 +194,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("r8a7791-ether", &mstp_clks[MSTP813]), /* Ether */

};



#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31)		\