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

Commit ea8d8a91 authored by Simon Horman's avatar Simon Horman
Browse files

Merge tag 'renesas-cleanup-for-v3.14' into boards-base 

Renesas ARM based SoC cleanups for v3.14

* Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
  sh7372 and sh73a0 SoCs.
* Tidy up camera-rcar header for r8a7779 SoC
* Tidy up registration of VIN on r8a7779 SoC
* Tidy up PFC registration on r8a7790 SoC
* Correct typo in clocks for r8a7790 SoC
* Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
* Don't use named resources for MMCIF and SDHI on ape6evm board
* Don't use named resources for MMCIF on lager board
* Tidy up device registration on lager board
* Tidy up headers for bockw board
parents fee05eb3 8af3f18b

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ static const struct sh_mmcif_plat_data mmcif0_pdata __initconst = { 
};

};





static const struct resource mmcif0_resources[] __initconst = {

static const struct resource mmcif0_resources[] __initconst = {

	DEFINE_RES_MEM_NAMED(0xee200000, 0x100, "MMCIF0"),

	DEFINE_RES_MEM(0xee200000, 0x100),

	DEFINE_RES_IRQ(gic_spi(169)),

	DEFINE_RES_IRQ(gic_spi(169)),

};

};
@@ -179,7 +179,7 @@ static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = { 
};

};





static const struct resource sdhi0_resources[] __initconst = {

static const struct resource sdhi0_resources[] __initconst = {

	DEFINE_RES_MEM_NAMED(0xee100000, 0x100, "SDHI0"),

	DEFINE_RES_MEM(0xee100000, 0x100),

	DEFINE_RES_IRQ(gic_spi(165)),

	DEFINE_RES_IRQ(gic_spi(165)),

};

};
@@ -191,7 +191,7 @@ static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = { 
};

};





static const struct resource sdhi1_resources[] __initconst = {

static const struct resource sdhi1_resources[] __initconst = {

	DEFINE_RES_MEM_NAMED(0xee120000, 0x100, "SDHI1"),

	DEFINE_RES_MEM(0xee120000, 0x100),

	DEFINE_RES_IRQ(gic_spi(166)),

	DEFINE_RES_IRQ(gic_spi(166)),

};

};

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
 */

 */





#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/r8a7778.h>

#include <mach/r8a7778.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

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

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




#include <linux/init.h>

#include <linux/init.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <mach/rcar-gen2.h>

#include <mach/r8a7790.h>

#include <mach/r8a7790.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>





static void __init lager_add_standard_devices(void)

static void __init lager_add_standard_devices(void)

{

{

	/* clocks are setup late during boot in the case of DT */

	r8a7790_clock_init();

	r8a7790_clock_init();



	r8a7790_add_dt_devices();

	r8a7790_add_dt_devices();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ static const struct sh_mmcif_plat_data mmcif1_pdata __initconst = { 
};

};





static const struct resource mmcif1_resources[] __initconst = {

static const struct resource mmcif1_resources[] __initconst = {

	DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),

	DEFINE_RES_MEM(0xee220000, 0x80),

	DEFINE_RES_IRQ(gic_spi(170)),

	DEFINE_RES_IRQ(gic_spi(170)),

};

};

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

+23 −2
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/leds.h>

#include <linux/leds.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/machine.h>

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

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

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

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

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

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

#include <linux/platform_data/usb-rcar-phy.h>
@@ -259,10 +260,30 @@ static struct platform_device leds_device = { 
	},

	},

};

};





/* VIN */

static struct rcar_vin_platform_data vin_platform_data __initdata = {

static struct rcar_vin_platform_data vin_platform_data __initdata = {

	.flags	= RCAR_VIN_BT656,

	.flags	= RCAR_VIN_BT656,

};

};





#define MARZEN_VIN(idx)						\

static struct resource vin##idx##_resources[] __initdata = {	\

	DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),	\

	DEFINE_RES_IRQ(gic_iid(0x5f + (idx))),			\

};								\

								\

static struct platform_device_info vin##idx##_info __initdata = { \

	.parent		= &platform_bus,			\

	.name		= "r8a7779-vin",			\

	.id		= idx,					\

	.res		= vin##idx##_resources,			\

	.num_res	= ARRAY_SIZE(vin##idx##_resources),	\

	.dma_mask	= DMA_BIT_MASK(32),			\

	.data		= &vin_platform_data,			\

	.size_data	= sizeof(vin_platform_data),		\

}

MARZEN_VIN(1);

MARZEN_VIN(3);



#define MARZEN_CAMERA(idx)					\

#define MARZEN_CAMERA(idx)					\

static struct i2c_board_info camera##idx##_info = {		\

static struct i2c_board_info camera##idx##_info = {		\

	I2C_BOARD_INFO("adv7180", 0x20 + (idx)),		\

	I2C_BOARD_INFO("adv7180", 0x20 + (idx)),		\
@@ -367,8 +388,8 @@ static void __init marzen_init(void) 
	r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */

	r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */





	r8a7779_add_standard_devices();

	r8a7779_add_standard_devices();

	r8a7779_add_vin_device(1, &vin_platform_data);

	platform_device_register_full(&vin1_info);

	r8a7779_add_vin_device(3, &vin_platform_data);

	platform_device_register_full(&vin3_info);

	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));

	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));

	marzen_add_du_device();

	marzen_add_du_device();

}

}