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

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

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

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

Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from
Simon Horman:

* r7s72100 SoC (RZ/A1H) based Genmai board
  - Set proper DMA masks for Ether device

* r8a7791 (R-Car M2) based Koelsch board
  - Remove Koelsch DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add DU device to koelsch-reference
  - Refactor clock lookup hack in koelsch-reference
  - Add SDHI devices

* r8a7790 (R-Car H2) based Lager board
  - Remove Lager DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add internal USB PCI support
  - Add QSPI pinmux
  - Sdd SDHI0/2 support

* emev2 (Emma Mobile EV2) based kzm9d board
  - Remove KZM9D board code

* r8a7778 (R-Car M1) based bock-w board
  - Set proper DMA masks for Ether device

* r8a7740 (R-Mobile A1) based Armadillo 800 EVA board
  - Set proper DMA masks for Ether device

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

:
  ARM: shmobile: Remove Lager DT reference legacy clock bits
  ARM: shmobile: Remove Koelsch DT reference legacy clock bits
  ARM: shmobile: Remove KZM9D board code
  ARM: shmobile: Genmai: set proper DMA masks for Ether device
  ARM: shmobile: Koelsch: set proper DMA masks for Ether device
  ARM: shmobile: Lager: set proper DMA masks for Ether device
  ARM: shmobile: BOCK-W: set proper DMA masks for Ether device
  ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device
  ARM: shmobile: koelsch-reference: Add DU device
  ARM: shmobile: koelsch-reference: Refactor clock lookup hack
  ARM: shmobile: lager-reference: Add DU device
  ARM: shmobile: lager-reference: Refactor clock lookup hack
  ARM: shmobile: lager: Add internal USB PCI support
  ARM: shmobile: lager legacy: Add QSPI pinmux
  ARM: shmobile: lager: add SDHI0/2 support
  ARM: shmobile: Add SDHI devices for legacy Koelsch

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 79c37662 6197c08a

arch/arm/mach-shmobile/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ config MACH_KOELSCH 
	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

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o 
ifdef CONFIG_ARCH_SHMOBILE_MULTI

obj-$(CONFIG_MACH_GENMAI)	+= board-genmai-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch-reference.o

obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d-reference.o

obj-$(CONFIG_MACH_LAGER)	+= board-lager-reference.o

else

obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o

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

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ static struct platform_device sh_eth_device = { 
	.id = -1,

	.dev = {

		.platform_data = &sh_eth_platdata,

		.dma_mask = &sh_eth_device.dev.coherent_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource = sh_eth_resources,

	.num_resources = ARRAY_SIZE(sh_eth_resources),

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

+14 −7
Original line number Diff line number Diff line 
/*

 * Bock-W board support

 *

 * Copyright (C) 2013  Renesas Solutions Corp.

 * Copyright (C) 2013-2014  Renesas Solutions Corp.

 * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 * Copyright (C) 2013  Cogent Embedded, Inc.

 * Copyright (C) 2013-2014  Cogent Embedded, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -235,6 +235,17 @@ static struct sh_eth_plat_data ether_platform_data __initdata = { 
	.no_ether_link	= 1,

};



static struct platform_device_info ether_info __initdata = {

	.parent		= &platform_bus,

	.name		= "r8a777x-ether",

	.id		= -1,

	.res		= ether_resources,

	.num_res	= ARRAY_SIZE(ether_resources),

	.data		= &ether_platform_data,

	.size_data	= sizeof(ether_platform_data),

	.dma_mask	= DMA_BIT_MASK(32),

};



/* I2C */

static struct i2c_board_info i2c0_devices[] = {

	{
@@ -592,11 +603,7 @@ static void __init bockw_init(void) 
	r8a7778_init_irq_extpin(1);

	r8a7778_add_standard_devices();



	platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,

					  ether_resources,

					  ARRAY_SIZE(ether_resources),

					  &ether_platform_data,

					  sizeof(ether_platform_data));

	platform_device_register_full(&ether_info);



	platform_device_register_full(&vin0_info);

	/* VIN1 has a pin conflict with Ether */

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

+14 −5
Original line number Diff line number Diff line 
/*

 * Genmai board support

 *

 * Copyright (C) 2013  Renesas Solutions Corp.

 * Copyright (C) 2013-2014  Renesas Solutions Corp.

 * Copyright (C) 2013  Magnus Damm

 * Copyright (C) 2014  Cogent Embedded, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -43,6 +44,17 @@ static const struct resource ether_resources[] __initconst = { 
	DEFINE_RES_IRQ(gic_iid(359)),

};



static const struct platform_device_info ether_info __initconst = {

	.parent		= &platform_bus,

	.name		= "r7s72100-ether",

	.id		= -1,

	.res		= ether_resources,

	.num_res	= ARRAY_SIZE(ether_resources),

	.data		= &ether_pdata,

	.size_data	= sizeof(ether_pdata),

	.dma_mask	= DMA_BIT_MASK(32),

};



/* RSPI */

#define RSPI_RESOURCE(idx, baseaddr, irq)				\

static const struct resource rspi##idx##_resources[] __initconst = {	\
@@ -82,10 +94,7 @@ static void __init genmai_add_standard_devices(void) 
	r7s72100_clock_init();

	r7s72100_add_dt_devices();



	platform_device_register_resndata(&platform_bus, "r7s72100-ether", -1,

					  ether_resources,

					  ARRAY_SIZE(ether_resources),

					  &ether_pdata, sizeof(ether_pdata));

	platform_device_register_full(&ether_info);



	r7s72100_register_rspi(0);

	r7s72100_register_rspi(1);