ARM: shmobile: marzen: Remove legacy board code

Remove Marzen legacy board code written in C. Instead board support expressed in DT shall be used together with Multiplatform and shmobile_defconfig. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

ARM: shmobile: marzen: Remove legacy board code
Remove Marzen legacy board code written in C. Instead board support expressed in DT shall be used together with Multiplatform and shmobile_defconfig. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm · Simon Horman
1 parent 640780efdd
Showing 5 changed files with 0 additions and 357 deletions Side-by-side Diff
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/Makefile.boot
arch/arm/mach-shmobile/board-marzen.c
@@ -504,7 +504,6 @@
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
 	r8a7778-bockw-reference.dtb \
-	r8a7779-marzen.dtb \
 	sh73a0-kzm9g.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
 	emev2-kzm9d.dtb \
@@ -157,13 +157,6 @@
  
 	   This is intended to aid developers
  
-config MACH_MARZEN
-	bool "MARZEN board"
-	depends on ARCH_R8A7779
-	select ARCH_REQUIRE_GPIOLIB
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select USE_OF
-
 config MACH_KZM9G
 	bool "KZM-A9-GT board"
 	depends on ARCH_SH73A0
@@ -54,7 +54,6 @@
 ifndef CONFIG_ARCH_SHMOBILE_MULTI
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
-obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
 obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o intc-sh73a0.o
 endif
@@ -4,7 +4,6 @@
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
-loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
  
 __ZRELADDR	:= $(sort $(loadaddr-y))
    zreladdr-y   += $(__ZRELADDR)
-/*
- * marzen board support
- *
- * Copyright (C) 2011, 2013  Renesas Solutions Corp.
- * Copyright (C) 2011  Magnus Damm
- * Copyright (C) 2013  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
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/leds.h>
-#include <linux/dma-mapping.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/platform_data/camera-rcar.h>
-#include <linux/platform_data/gpio-rcar.h>
-#include <linux/platform_data/usb-rcar-phy.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/smsc911x.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/sh_hspi.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/mfd/tmio.h>
-
-#include <media/soc_camera.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/traps.h>
-
-#include "common.h"
-#include "irqs.h"
-#include "r8a7779.h"
-
-/* Fixed 3.3V regulator to be used by SDHI0 */
-static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
-	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
-	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
-};
-
-/* Dummy supplies, where voltage doesn't matter */
-static struct regulator_consumer_supply dummy_supplies[] = {
-	REGULATOR_SUPPLY("vddvario", "smsc911x"),
-	REGULATOR_SUPPLY("vdd33a", "smsc911x"),
-};
-
-/* USB PHY */
-static struct resource usb_phy_resources[] = {
-	[0] = {
-		.start		= 0xffe70800,
-		.end		= 0xffe70900 - 1,
-		.flags		= IORESOURCE_MEM,
-	},
-};
-
-static struct rcar_phy_platform_data usb_phy_platform_data;
-
-static struct platform_device usb_phy = {
-	.name		= "rcar_usb_phy",
-	.id		= -1,
-	.dev  = {
-		.platform_data = &usb_phy_platform_data,
-	},
-	.resource	= usb_phy_resources,
-	.num_resources	= ARRAY_SIZE(usb_phy_resources),
-};
-
-/* SMSC LAN89218 */
-static struct resource smsc911x_resources[] = {
-	[0] = {
-		.start		= 0x18000000, /* ExCS0 */
-		.end		= 0x180000ff, /* A1->A7 */
-		.flags		= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start		= irq_pin(1), /* IRQ 1 */
-		.flags		= IORESOURCE_IRQ,
-	},
-};
-
-static struct smsc911x_platform_config smsc911x_platdata = {
-	.flags		= SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */
-	.phy_interface	= PHY_INTERFACE_MODE_MII,
-	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,
-};
-
-static struct platform_device eth_device = {
-	.name		= "smsc911x",
-	.id		= -1,
-	.dev  = {
-		.platform_data = &smsc911x_platdata,
-	},
-	.resource	= smsc911x_resources,
-	.num_resources	= ARRAY_SIZE(smsc911x_resources),
-};
-
-static struct resource sdhi0_resources[] = {
-	[0] = {
-		.name	= "sdhi0",
-		.start	= 0xffe4c000,
-		.end	= 0xffe4c0ff,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= gic_iid(0x88),
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct tmio_mmc_data sdhi0_platform_data = {
-	.chan_priv_tx = (void *)HPBDMA_SLAVE_SDHI0_TX,
-	.chan_priv_rx = (void *)HPBDMA_SLAVE_SDHI0_RX,
-	.flags        = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
-	.capabilities = MMC_CAP_SD_HIGHSPEED,
-};
-
-static struct platform_device sdhi0_device = {
-	.name = "sh_mobile_sdhi",
-	.num_resources = ARRAY_SIZE(sdhi0_resources),
-	.resource = sdhi0_resources,
-	.id = 0,
-	.dev = {
-		.platform_data = &sdhi0_platform_data,
-	}
-};
-
-/* Thermal */
-static struct resource thermal_resources[] = {
-	[0] = {
-		.start		= 0xFFC48000,
-		.end		= 0xFFC48038 - 1,
-		.flags		= IORESOURCE_MEM,
-	},
-};
-
-static struct platform_device thermal_device = {
-	.name		= "rcar_thermal",
-	.resource	= thermal_resources,
-	.num_resources	= ARRAY_SIZE(thermal_resources),
-};
-
-/* HSPI */
-static struct resource hspi_resources[] = {
-	[0] = {
-		.start		= 0xFFFC7000,
-		.end		= 0xFFFC7018 - 1,
-		.flags		= IORESOURCE_MEM,
-	},
-};
-
-static struct platform_device hspi_device = {
-	.name	= "sh-hspi",
-	.id	= 0,
-	.resource	= hspi_resources,
-	.num_resources	= ARRAY_SIZE(hspi_resources),
-};
-
-/* LEDS */
-static struct gpio_led marzen_leds[] = {
-	{
-		.name		= "led2",
-		.gpio		= RCAR_GP_PIN(4, 29),
-		.default_state	= LEDS_GPIO_DEFSTATE_ON,
-	}, {
-		.name		= "led3",
-		.gpio		= RCAR_GP_PIN(4, 30),
-		.default_state	= LEDS_GPIO_DEFSTATE_ON,
-	}, {
-		.name		= "led4",
-		.gpio		= RCAR_GP_PIN(4, 31),
-		.default_state	= LEDS_GPIO_DEFSTATE_ON,
-	},
-};
-
-static struct gpio_led_platform_data marzen_leds_pdata = {
-	.leds		= marzen_leds,
-	.num_leds	= ARRAY_SIZE(marzen_leds),
-};
-
-static struct platform_device leds_device = {
-	.name	= "leds-gpio",
-	.id	= 0,
-	.dev	= {
-		.platform_data  = &marzen_leds_pdata,
-	},
-};
-
-/* VIN */
-static struct rcar_vin_platform_data vin_platform_data __initdata = {
-	.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 = { \
-	.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)					\
-static struct i2c_board_info camera##idx##_info = {		\
-	I2C_BOARD_INFO("adv7180", 0x20 + (idx)),		\
-};								\
-								\
-static struct soc_camera_link iclink##idx##_adv7180 = {		\
-	.bus_id		= 1 + 2 * (idx),			\
-	.i2c_adapter_id	= 0,					\
-	.board_info	= &camera##idx##_info,			\
-};								\
-								\
-static struct platform_device camera##idx##_device = {		\
-	.name	= "soc-camera-pdrv",				\
-	.id	= idx,						\
-	.dev	= {						\
-		.platform_data	= &iclink##idx##_adv7180,	\
-	},							\
-};
-
-MARZEN_CAMERA(0);
-MARZEN_CAMERA(1);
-
-static struct platform_device *marzen_devices[] __initdata = {
-	&eth_device,
-	&sdhi0_device,
-	&thermal_device,
-	&hspi_device,
-	&leds_device,
-	&usb_phy,
-	&camera0_device,
-	&camera1_device,
-};
-
-static const struct pinctrl_map marzen_pinctrl_map[] = {
-	/* DU (CN10: ARGB0, CN13: LVDS) */
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du0_rgb888", "du0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du0_sync_1", "du0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du0_clk_out_0", "du0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du1_rgb666", "du1"),
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du1_sync_1", "du1"),
-	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
-				  "du1_clk_out", "du1"),
-	/* HSPI0 */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
-				  "hspi0", "hspi0"),
-	/* SCIF2 (CN18: DEBUG0) */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
-				  "scif2_data_c", "scif2"),
-	/* SCIF4 (CN19: DEBUG1) */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
-				  "scif4_data", "scif4"),
-	/* SDHI0 */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-				  "sdhi0_data4", "sdhi0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-				  "sdhi0_ctrl", "sdhi0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-				  "sdhi0_cd", "sdhi0"),
-	/* SMSC */
-	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
-				  "intc_irq1_b", "intc"),
-	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
-				  "lbsc_ex_cs0", "lbsc"),
-	/* USB0 */
-	PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
-				  "usb0", "usb0"),
-	/* USB1 */
-	PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
-				  "usb1", "usb1"),
-	/* USB2 */
-	PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.1", "pfc-r8a7779",
-				  "usb2", "usb2"),
-	/* VIN1 */
-	PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
-				  "vin1_clk", "vin1"),
-	PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
-				  "vin1_data8", "vin1"),
-	/* VIN3 */
-	PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
-				  "vin3_clk", "vin3"),
-	PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
-				  "vin3_data8", "vin3"),
-};
-
-static void __init marzen_init(void)
-{
-	regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
-				ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
-	regulator_register_fixed(1, dummy_supplies,
-				ARRAY_SIZE(dummy_supplies));
-
-	pinctrl_register_mappings(marzen_pinctrl_map,
-				  ARRAY_SIZE(marzen_pinctrl_map));
-	r8a7779_pinmux_init();
-	r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
-
-	r8a7779_add_standard_devices();
-	platform_device_register_full(&vin1_info);
-	platform_device_register_full(&vin3_info);
-	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
-}
-
-static const char *marzen_boards_compat_dt[] __initdata = {
-        "renesas,marzen",
-        NULL,
-};
-
-DT_MACHINE_START(MARZEN, "marzen")
-	.smp		= smp_ops(r8a7779_smp_ops),
-	.map_io		= r8a7779_map_io,
-	.init_early	= r8a7779_add_early_devices,
-	.init_irq	= r8a7779_init_irq_dt,
-	.init_machine	= marzen_init,
-	.init_late	= r8a7779_init_late,
-	.dt_compat	= marzen_boards_compat_dt,
-	.init_time	= r8a7779_earlytimer_init,
-MACHINE_END
...	...	@@ -504,7 +504,6 @@
504	504	r8a7740-armadillo800eva.dtb \
505	505	r8a7778-bockw.dtb \
506	506	r8a7778-bockw-reference.dtb \
507		- r8a7779-marzen.dtb \
508	507	sh73a0-kzm9g.dtb
509	508	dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
510	509	emev2-kzm9d.dtb \
...	...	@@ -157,13 +157,6 @@
157	157
158	158	This is intended to aid developers
159	159
160		-config MACH_MARZEN
161		- bool "MARZEN board"
162		- depends on ARCH_R8A7779
163		- select ARCH_REQUIRE_GPIOLIB
164		- select REGULATOR_FIXED_VOLTAGE if REGULATOR
165		- select USE_OF
166		-
167	160	config MACH_KZM9G
168	161	bool "KZM-A9-GT board"
169	162	depends on ARCH_SH73A0
...	...	@@ -54,7 +54,6 @@
54	54	ifndef CONFIG_ARCH_SHMOBILE_MULTI
55	55	obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
56	56	obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
57		-obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
58	57	obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
59	58	obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o
60	59	endif
...	...	@@ -4,7 +4,6 @@
4	4	loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
5	5	loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
6	6	loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
7		-loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
8	7
9	8	__ZRELADDR := $(sort $(loadaddr-y))
10	9	zreladdr-y += $(__ZRELADDR)
1		-/*
2		- * marzen board support
3		- *
4		- * Copyright (C) 2011, 2013 Renesas Solutions Corp.
5		- * Copyright (C) 2011 Magnus Damm
6		- * Copyright (C) 2013 Cogent Embedded, Inc.
7		- *
8		- * This program is free software; you can redistribute it and/or modify
9		- * it under the terms of the GNU General Public License as published by
10		- * the Free Software Foundation; version 2 of the License.
11		- *
12		- * This program is distributed in the hope that it will be useful,
13		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15		- * GNU General Public License for more details.
16		- */
17		-
18		-#include <linux/kernel.h>
19		-#include <linux/init.h>
20		-#include <linux/interrupt.h>
21		-#include <linux/irq.h>
22		-#include <linux/platform_device.h>
23		-#include <linux/delay.h>
24		-#include <linux/io.h>
25		-#include <linux/leds.h>
26		-#include <linux/dma-mapping.h>
27		-#include <linux/pinctrl/machine.h>
28		-#include <linux/platform_data/camera-rcar.h>
29		-#include <linux/platform_data/gpio-rcar.h>
30		-#include <linux/platform_data/usb-rcar-phy.h>
31		-#include <linux/regulator/fixed.h>
32		-#include <linux/regulator/machine.h>
33		-#include <linux/smsc911x.h>
34		-#include <linux/spi/spi.h>
35		-#include <linux/spi/sh_hspi.h>
36		-#include <linux/mmc/host.h>
37		-#include <linux/mmc/sh_mobile_sdhi.h>
38		-#include <linux/mfd/tmio.h>
39		-
40		-#include <media/soc_camera.h>
41		-#include <asm/mach-types.h>
42		-#include <asm/mach/arch.h>
43		-#include <asm/traps.h>
44		-
45		-#include "common.h"
46		-#include "irqs.h"
47		-#include "r8a7779.h"
48		-
49		-/* Fixed 3.3V regulator to be used by SDHI0 */
50		-static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
51		- REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
52		- REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
53		-};
54		-
55		-/* Dummy supplies, where voltage doesn't matter */
56		-static struct regulator_consumer_supply dummy_supplies[] = {
57		- REGULATOR_SUPPLY("vddvario", "smsc911x"),
58		- REGULATOR_SUPPLY("vdd33a", "smsc911x"),
59		-};
60		-
61		-/* USB PHY */
62		-static struct resource usb_phy_resources[] = {
63		- [0] = {
64		- .start = 0xffe70800,
65		- .end = 0xffe70900 - 1,
66		- .flags = IORESOURCE_MEM,
67		- },
68		-};
69		-
70		-static struct rcar_phy_platform_data usb_phy_platform_data;
71		-
72		-static struct platform_device usb_phy = {
73		- .name = "rcar_usb_phy",
74		- .id = -1,
75		- .dev = {
76		- .platform_data = &usb_phy_platform_data,
77		- },
78		- .resource = usb_phy_resources,
79		- .num_resources = ARRAY_SIZE(usb_phy_resources),
80		-};
81		-
82		-/* SMSC LAN89218 */
83		-static struct resource smsc911x_resources[] = {
84		- [0] = {
85		- .start = 0x18000000, /* ExCS0 */
86		- .end = 0x180000ff, /* A1->A7 */
87		- .flags = IORESOURCE_MEM,
88		- },
89		- [1] = {
90		- .start = irq_pin(1), /* IRQ 1 */
91		- .flags = IORESOURCE_IRQ,
92		- },
93		-};
94		-
95		-static struct smsc911x_platform_config smsc911x_platdata = {
96		- .flags = SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */
97		- .phy_interface = PHY_INTERFACE_MODE_MII,
98		- .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
99		- .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
100		-};
101		-
102		-static struct platform_device eth_device = {
103		- .name = "smsc911x",
104		- .id = -1,
105		- .dev = {
106		- .platform_data = &smsc911x_platdata,
107		- },
108		- .resource = smsc911x_resources,
109		- .num_resources = ARRAY_SIZE(smsc911x_resources),
110		-};
111		-
112		-static struct resource sdhi0_resources[] = {
113		- [0] = {
114		- .name = "sdhi0",
115		- .start = 0xffe4c000,
116		- .end = 0xffe4c0ff,
117		- .flags = IORESOURCE_MEM,
118		- },
119		- [1] = {
120		- .start = gic_iid(0x88),
121		- .flags = IORESOURCE_IRQ,
122		- },
123		-};
124		-
125		-static struct tmio_mmc_data sdhi0_platform_data = {
126		- .chan_priv_tx = (void *)HPBDMA_SLAVE_SDHI0_TX,
127		- .chan_priv_rx = (void *)HPBDMA_SLAVE_SDHI0_RX,
128		- .flags = TMIO_MMC_WRPROTECT_DISABLE \| TMIO_MMC_HAS_IDLE_WAIT,
129		- .capabilities = MMC_CAP_SD_HIGHSPEED,
130		-};
131		-
132		-static struct platform_device sdhi0_device = {
133		- .name = "sh_mobile_sdhi",
134		- .num_resources = ARRAY_SIZE(sdhi0_resources),
135		- .resource = sdhi0_resources,
136		- .id = 0,
137		- .dev = {
138		- .platform_data = &sdhi0_platform_data,
139		- }
140		-};
141		-
142		-/* Thermal */
143		-static struct resource thermal_resources[] = {
144		- [0] = {
145		- .start = 0xFFC48000,
146		- .end = 0xFFC48038 - 1,
147		- .flags = IORESOURCE_MEM,
148		- },
149		-};
150		-
151		-static struct platform_device thermal_device = {
152		- .name = "rcar_thermal",
153		- .resource = thermal_resources,
154		- .num_resources = ARRAY_SIZE(thermal_resources),
155		-};
156		-
157		-/* HSPI */
158		-static struct resource hspi_resources[] = {
159		- [0] = {
160		- .start = 0xFFFC7000,
161		- .end = 0xFFFC7018 - 1,
162		- .flags = IORESOURCE_MEM,
163		- },
164		-};
165		-
166		-static struct platform_device hspi_device = {
167		- .name = "sh-hspi",
168		- .id = 0,
169		- .resource = hspi_resources,
170		- .num_resources = ARRAY_SIZE(hspi_resources),
171		-};
172		-
173		-/* LEDS */
174		-static struct gpio_led marzen_leds[] = {
175		- {
176		- .name = "led2",
177		- .gpio = RCAR_GP_PIN(4, 29),
178		- .default_state = LEDS_GPIO_DEFSTATE_ON,
179		- }, {
180		- .name = "led3",
181		- .gpio = RCAR_GP_PIN(4, 30),
182		- .default_state = LEDS_GPIO_DEFSTATE_ON,
183		- }, {
184		- .name = "led4",
185		- .gpio = RCAR_GP_PIN(4, 31),
186		- .default_state = LEDS_GPIO_DEFSTATE_ON,
187		- },
188		-};
189		-
190		-static struct gpio_led_platform_data marzen_leds_pdata = {
191		- .leds = marzen_leds,
192		- .num_leds = ARRAY_SIZE(marzen_leds),
193		-};
194		-
195		-static struct platform_device leds_device = {
196		- .name = "leds-gpio",
197		- .id = 0,
198		- .dev = {
199		- .platform_data = &marzen_leds_pdata,
200		- },
201		-};
202		-
203		-/* VIN */
204		-static struct rcar_vin_platform_data vin_platform_data __initdata = {
205		- .flags = RCAR_VIN_BT656,
206		-};
207		-
208		-#define MARZEN_VIN(idx) \
209		-static struct resource vin##idx##_resources[] __initdata = { \
210		- DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \
211		- DEFINE_RES_IRQ(gic_iid(0x5f + (idx))), \
212		-}; \
213		- \
214		-static struct platform_device_info vin##idx##_info __initdata = { \
215		- .name = "r8a7779-vin", \
216		- .id = idx, \
217		- .res = vin##idx##_resources, \
218		- .num_res = ARRAY_SIZE(vin##idx##_resources), \
219		- .dma_mask = DMA_BIT_MASK(32), \
220		- .data = &vin_platform_data, \
221		- .size_data = sizeof(vin_platform_data), \
222		-}
223		-MARZEN_VIN(1);
224		-MARZEN_VIN(3);
225		-
226		-#define MARZEN_CAMERA(idx) \
227		-static struct i2c_board_info camera##idx##_info = { \
228		- I2C_BOARD_INFO("adv7180", 0x20 + (idx)), \
229		-}; \
230		- \
231		-static struct soc_camera_link iclink##idx##_adv7180 = { \
232		- .bus_id = 1 + 2 * (idx), \
233		- .i2c_adapter_id = 0, \
234		- .board_info = &camera##idx##_info, \
235		-}; \
236		- \
237		-static struct platform_device camera##idx##_device = { \
238		- .name = "soc-camera-pdrv", \
239		- .id = idx, \
240		- .dev = { \
241		- .platform_data = &iclink##idx##_adv7180, \
242		- }, \
243		-};
244		-
245		-MARZEN_CAMERA(0);
246		-MARZEN_CAMERA(1);
247		-
248		-static struct platform_device *marzen_devices[] __initdata = {
249		- &eth_device,
250		- &sdhi0_device,
251		- &thermal_device,
252		- &hspi_device,
253		- &leds_device,
254		- &usb_phy,
255		- &camera0_device,
256		- &camera1_device,
257		-};
258		-
259		-static const struct pinctrl_map marzen_pinctrl_map[] = {
260		- /* DU (CN10: ARGB0, CN13: LVDS) */
261		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
262		- "du0_rgb888", "du0"),
263		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
264		- "du0_sync_1", "du0"),
265		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
266		- "du0_clk_out_0", "du0"),
267		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
268		- "du1_rgb666", "du1"),
269		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
270		- "du1_sync_1", "du1"),
271		- PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7779", "pfc-r8a7779",
272		- "du1_clk_out", "du1"),
273		- /* HSPI0 */
274		- PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
275		- "hspi0", "hspi0"),
276		- /* SCIF2 (CN18: DEBUG0) */
277		- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
278		- "scif2_data_c", "scif2"),
279		- /* SCIF4 (CN19: DEBUG1) */
280		- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
281		- "scif4_data", "scif4"),
282		- /* SDHI0 */
283		- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
284		- "sdhi0_data4", "sdhi0"),
285		- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
286		- "sdhi0_ctrl", "sdhi0"),
287		- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
288		- "sdhi0_cd", "sdhi0"),
289		- /* SMSC */
290		- PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
291		- "intc_irq1_b", "intc"),
292		- PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
293		- "lbsc_ex_cs0", "lbsc"),
294		- /* USB0 */
295		- PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
296		- "usb0", "usb0"),
297		- /* USB1 */
298		- PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
299		- "usb1", "usb1"),
300		- /* USB2 */
301		- PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.1", "pfc-r8a7779",
302		- "usb2", "usb2"),
303		- /* VIN1 */
304		- PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
305		- "vin1_clk", "vin1"),
306		- PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
307		- "vin1_data8", "vin1"),
308		- /* VIN3 */
309		- PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
310		- "vin3_clk", "vin3"),
311		- PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
312		- "vin3_data8", "vin3"),
313		-};
314		-
315		-static void __init marzen_init(void)
316		-{
317		- regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
318		- ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
319		- regulator_register_fixed(1, dummy_supplies,
320		- ARRAY_SIZE(dummy_supplies));
321		-
322		- pinctrl_register_mappings(marzen_pinctrl_map,
323		- ARRAY_SIZE(marzen_pinctrl_map));
324		- r8a7779_pinmux_init();
325		- r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
326		-
327		- r8a7779_add_standard_devices();
328		- platform_device_register_full(&vin1_info);
329		- platform_device_register_full(&vin3_info);
330		- platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
331		-}
332		-
333		-static const char *marzen_boards_compat_dt[] __initdata = {
334		- "renesas,marzen",
335		- NULL,
336		-};
337		-
338		-DT_MACHINE_START(MARZEN, "marzen")
339		- .smp = smp_ops(r8a7779_smp_ops),
340		- .map_io = r8a7779_map_io,
341		- .init_early = r8a7779_add_early_devices,
342		- .init_irq = r8a7779_init_irq_dt,
343		- .init_machine = marzen_init,
344		- .init_late = r8a7779_init_late,
345		- .dt_compat = marzen_boards_compat_dt,
346		- .init_time = r8a7779_earlytimer_init,
347		-MACHINE_END