Commit 65b108ec authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-boards-for-v3.15' of... 

Merge tag 'renesas-boards-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM based SoC Board Updates for v3.15" from Simon Horman:

* r8a7791 (R-Car M2) based Koelsch board
  - Fix error return code check from clk_get()
  - Add SATA0 support
  - Conditionally select MICREL_PHY for Multiplatform

* r8a7790 (R-Car H2) based Lager board
  - Add USBHS support
  - Fix error return code check from clk_get()
  - Add SATA support
  - Make spi_flash_data const
  - Add VIN1 SoC camera support
  - Conditionally select CONFIG_MICREL_PHY

* r8a7778 (R-Car M1) based Bock-W board
  - Add USB Func DMAEngine support
  - Use HPBIF DMAEngine for sound
  - Use SSI DMAEngine for sound

* emev2 (Emma Mobile EV2) based kzm9d board
  - Use common clock framework

* r8a773a0 (SH-Mobile AG5) based kzm9g board
  - Add zboot support

* Many boards
  - Conditionally select SMSC_PHY

* tag 'renesas-boards-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (21 commits)
  ARM: shmobile: Remove Lager USBHS UDC ifdefs
  ARM: shmobile: lager: Add USBHS support
  ARM: shmobile: koelsch: fix error return code check from clk_get()
  ARM: shmobile: lager: fix error return code check from clk_get()
  ARM: shmobile: marzen: Conditionally select SMSC_PHY
  ARM: shmobile: mackerel: Conditionally select SMSC_PHY
  ARM: shmobile: kzm9d: Conditionally select SMSC_PHY
  ARM: shmobile: bockw: Sort Kconfig node's selections
  ARM: shmobile: armadillo800eva: Conditionally select SMSC_PHY
  ARM: shmobile: ape6evm: Conditionally select SMSC_PHY
  ARM: shmobile: koelsch: Add SATA0 support
  ARM: shmobile: lager: Add SATA support
  ARM: shmobile: lager: Make spi_flash_data const
  ARM: shmobile: kzm9d: Use common clock framework
  ARM: shmobile: lager: Add VIN1 SoC camera support
  ARM: mach-shmobile: kzm9g: add zboot support
  ARM: shmobile: koelsch: Conditionally select MICREL_PHY for Multiplatform
  ARM: shmobile: bockw: add USB Func DMAEngine support
  ARM: shmobile: bockw: use HPBIF DMAEngine for sound
  ARM: shmobile: bockw: use SSI DMAEngine for sound
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d0abeca 235cda29

arch/arm/mach-shmobile/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -45,15 +45,18 @@ config MACH_GENMAI 
config MACH_KOELSCH

	bool "Koelsch board"

	depends on ARCH_R8A7791

	select MICREL_PHY if SH_ETH



config MACH_KZM9D

	bool "KZM9D board"

	depends on ARCH_EMEV2

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SMSC911X



config MACH_LAGER

	bool "Lager board"

	depends on ARCH_R8A7790

	select MICREL_PHY if SH_ETH



comment "Renesas ARM SoCs System Configuration"

endif
@@ -154,11 +157,13 @@ comment "Renesas ARM SoCs Board Type" 
config MACH_APE6EVM

	bool "APE6EVM board"

	depends on ARCH_R8A73A4

	select SMSC_PHY if SMSC911X

	select USE_OF



config MACH_APE6EVM_REFERENCE

	bool "APE6EVM board - Reference Device Tree Implementation"

	depends on ARCH_R8A73A4

	select SMSC_PHY if SMSC911X

	select USE_OF

	---help---

	   Use reference implementation of APE6EVM board support
@@ -172,6 +177,7 @@ config MACH_MACKEREL 
	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SMSC911X

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select USE_OF
@@ -180,6 +186,7 @@ config MACH_ARMADILLO800EVA 
	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SH_ETH

	select SND_SOC_WM8978 if SND_SIMPLE_CARD

	select USE_OF
@@ -188,6 +195,7 @@ config MACH_ARMADILLO800EVA_REFERENCE 
	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SH_ETH

	select SND_SOC_WM8978 if SND_SIMPLE_CARD

	select USE_OF

	---help---
@@ -201,11 +209,11 @@ config MACH_BOCKW 
	bool "BOCK-W platform"

	depends on ARCH_R8A7778

	select ARCH_REQUIRE_GPIOLIB

	select RENESAS_INTC_IRQPIN

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF

	select RENESAS_INTC_IRQPIN

	select SND_SOC_AK4554 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select USE_OF



config MACH_BOCKW_REFERENCE

	bool "BOCK-W  - Reference Device Tree Implementation"
@@ -242,6 +250,7 @@ config MACH_MARZEN 
	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SMSC911X

	select USE_OF



config MACH_MARZEN_REFERENCE
@@ -249,6 +258,7 @@ config MACH_MARZEN_REFERENCE 
	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SMSC911X

	select USE_OF

	---help---

	   Use reference implementation of Marzen board support
@@ -261,6 +271,7 @@ config MACH_LAGER 
	bool "Lager board"

	depends on ARCH_R8A7790

	select USE_OF

	select MICREL_PHY if SH_ETH



config MACH_KOELSCH

	bool "Koelsch board"

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

+17 −7
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ static struct renesas_usbhs_platform_info usbhs_info __initdata = { 
	},

	.driver_param = {

		.buswait_bwait	= 4,

		.d0_tx_id	= HPBDMA_SLAVE_USBFUNC_TX,

		.d1_rx_id	= HPBDMA_SLAVE_USBFUNC_RX,

	},

};
@@ -332,16 +334,24 @@ static struct rsnd_ssi_platform_info rsnd_ssi[] = { 
	RSND_SSI_UNUSED, /* SSI 0 */

	RSND_SSI_UNUSED, /* SSI 1 */

	RSND_SSI_UNUSED, /* SSI 2 */

	RSND_SSI_SET(1, 0, gic_iid(0x85), RSND_SSI_PLAY),

	RSND_SSI_SET(2, 0, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),

	RSND_SSI_SET(0, 0, gic_iid(0x86), RSND_SSI_PLAY),

	RSND_SSI_SET(0, 0, gic_iid(0x86), 0),

	RSND_SSI_SET(3, 0, gic_iid(0x86), RSND_SSI_PLAY),

	RSND_SSI_SET(4, 0, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),

	RSND_SSI_SET(1, HPBDMA_SLAVE_HPBIF3_TX, gic_iid(0x85), RSND_SSI_PLAY),

	RSND_SSI_SET(2, HPBDMA_SLAVE_HPBIF4_RX, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),

	RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF5_TX, gic_iid(0x86), RSND_SSI_PLAY),

	RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF6_RX, gic_iid(0x86), 0),

	RSND_SSI_SET(3, HPBDMA_SLAVE_HPBIF7_TX, gic_iid(0x86), RSND_SSI_PLAY),

	RSND_SSI_SET(4, HPBDMA_SLAVE_HPBIF8_RX, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),

};



static struct rsnd_scu_platform_info rsnd_scu[9] = {

	/* no member at this point */

	{ .flags = 0, }, /* SRU 0 */

	{ .flags = 0, }, /* SRU 1 */

	{ .flags = 0, }, /* SRU 2 */

	{ .flags = RSND_SCU_USE_HPBIF, },

	{ .flags = RSND_SCU_USE_HPBIF, },

	{ .flags = RSND_SCU_USE_HPBIF, },

	{ .flags = RSND_SCU_USE_HPBIF, },

	{ .flags = RSND_SCU_USE_HPBIF, },

	{ .flags = RSND_SCU_USE_HPBIF, },

};



enum {

arch/arm/mach-shmobile/board-koelsch-reference.c

+2 −2
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ static void __init koelsch_add_standard_devices(void) 


	for (i = 0; i < ARRAY_SIZE(scif_names); ++i) {

		clk = clk_get(NULL, scif_names[i]);

		if (clk) {

		if (!IS_ERR(clk)) {

			clk_register_clkdev(clk, NULL, "sh-sci.%u", i);

			clk_put(clk);

		}

	}



	clk = clk_get(NULL, "cmt0");

	if (clk) {

	if (!IS_ERR(clk)) {

		clk_register_clkdev(clk, NULL, "sh_cmt.0");

		clk_put(clk);

	}

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

+17 −0
Original line number Diff line number Diff line
@@ -148,6 +148,21 @@ static const struct gpio_keys_platform_data koelsch_keys_pdata __initconst = { 
	.nbuttons	= ARRAY_SIZE(gpio_buttons),

};



/* SATA0 */

static const struct resource sata0_resources[] __initconst = {

	DEFINE_RES_MEM(0xee300000, 0x2000),

	DEFINE_RES_IRQ(gic_spi(105)),

};



static const struct platform_device_info sata0_info __initconst = {

	.parent		= &platform_bus,

	.name		= "sata-r8a7791",

	.id		= 0,

	.res		= sata0_resources,

	.num_res	= ARRAY_SIZE(sata0_resources),

	.dma_mask	= DMA_BIT_MASK(32),

};



static const struct pinctrl_map koelsch_pinctrl_map[] = {

	/* DU */

	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
@@ -192,6 +207,8 @@ static void __init koelsch_add_standard_devices(void) 
				      sizeof(koelsch_keys_pdata));



	koelsch_add_du_device();



	platform_device_register_full(&sata0_info);

}



/*

arch/arm/mach-shmobile/board-kzm9d-reference.c

+2 −3
Original line number Diff line number Diff line
@@ -20,15 +20,14 @@ 


#include <linux/init.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>

#include <mach/emev2.h>

#include <mach/common.h>

#include <asm/mach/arch.h>



static void __init kzm9d_add_standard_devices(void)

{

	if (!IS_ENABLED(CONFIG_COMMON_CLK))

		emev2_clock_init();



	of_clk_init(NULL);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}