Skip to content

L
linux
Commit ea8d8a91 authored by Simon Horman's avatar Simon Horman
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 93 deletions
arch/arm/mach-shmobile/board-ape6evm.c
View file @ ea8d8a91
...@@ -168,7 +168,7 @@ static const struct sh_mmcif_plat_data mmcif0_pdata __initconst = { ...@@ -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 = { ...@@ -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 = { ...@@ -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
View file @ ea8d8a91
...@@ -19,7 +19,6 @@ ...@@ -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
View file @ ea8d8a91
...@@ -20,16 +20,15 @@ ...@@ -20,16 +20,15 @@
#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);
} }
static const char *lager_boards_compat_dt[] __initdata = { static const char *lager_boards_compat_dt[] __initdata = {
......
arch/arm/mach-shmobile/board-lager.c
View file @ ea8d8a91
...@@ -148,7 +148,7 @@ static const struct sh_mmcif_plat_data mmcif1_pdata __initconst = { ...@@ -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
View file @ ea8d8a91
...@@ -29,6 +29,7 @@ ...@@ -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 = { ...@@ -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) ...@@ -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();
} }
......
arch/arm/mach-shmobile/clock-r7s72100.c
View file @ ea8d8a91
...@@ -170,6 +170,9 @@ static struct clk_lookup lookups[] = { ...@@ -170,6 +170,9 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
/* MSTP clocks */ /* MSTP clocks */
CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),
/* ICK */
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]), CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]),
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]), CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]),
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]), CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]),
......
arch/arm/mach-shmobile/clock-r8a7790.c
View file @ ea8d8a91
...@@ -78,7 +78,7 @@ static struct sh_clk_ops followparent_clk_ops = { ...@@ -78,7 +78,7 @@ static struct sh_clk_ops followparent_clk_ops = {
}; };
static struct clk main_clk = { static struct clk main_clk = {
/* .parent will be set r8a73a4_clock_init */ /* .parent will be set r8a7790_clock_init */
.ops = &followparent_clk_ops, .ops = &followparent_clk_ops,
}; };
......
arch/arm/mach-shmobile/clock-sh7372.c
View file @ ea8d8a91
...@@ -504,10 +504,6 @@ static struct clk_lookup lookups[] = { ...@@ -504,10 +504,6 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_SPU]), CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_SPU]),
CLKDEV_CON_ID("vou_clk", &div6_clks[DIV6_VOU]), CLKDEV_CON_ID("vou_clk", &div6_clks[DIV6_VOU]),
CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]), CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
/* MSTP32 clocks */ /* MSTP32 clocks */
CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */ CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */
...@@ -574,6 +570,11 @@ static struct clk_lookup lookups[] = { ...@@ -574,6 +570,11 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */ CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */
CLKDEV_DEV_ID("sh_cmt.2", &mstp_clks[MSTP400]), /* CMT2 */ CLKDEV_DEV_ID("sh_cmt.2", &mstp_clks[MSTP400]), /* CMT2 */
/* ICK */
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
CLKDEV_ICK_ID("hdmi", "sh_mobile_lcdc_fb.1", CLKDEV_ICK_ID("hdmi", "sh_mobile_lcdc_fb.1",
&div6_reparent_clks[DIV6_HDMI]), &div6_reparent_clks[DIV6_HDMI]),
CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]),
......
arch/arm/mach-shmobile/clock-sh73a0.c
View file @ ea8d8a91
...@@ -625,12 +625,6 @@ static struct clk_lookup lookups[] = { ...@@ -625,12 +625,6 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("sdhi0_clk", &div6_clks[DIV6_SDHI0]), CLKDEV_CON_ID("sdhi0_clk", &div6_clks[DIV6_SDHI0]),
CLKDEV_CON_ID("sdhi1_clk", &div6_clks[DIV6_SDHI1]), CLKDEV_CON_ID("sdhi1_clk", &div6_clks[DIV6_SDHI1]),
CLKDEV_CON_ID("sdhi2_clk", &div6_clks[DIV6_SDHI2]), CLKDEV_CON_ID("sdhi2_clk", &div6_clks[DIV6_SDHI2]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.0", &dsi0phy_clk),
CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.1", &dsi1phy_clk),
/* MSTP32 clocks */ /* MSTP32 clocks */
CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */ CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */
...@@ -680,6 +674,14 @@ static struct clk_lookup lookups[] = { ...@@ -680,6 +674,14 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* I2C4 */ CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* I2C4 */
CLKDEV_DEV_ID("e6828000.i2c", &mstp_clks[MSTP410]), /* I2C4 */ CLKDEV_DEV_ID("e6828000.i2c", &mstp_clks[MSTP410]), /* I2C4 */
CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */ CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */
/* ICK */
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.0", &dsi0phy_clk),
CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.1", &dsi1phy_clk),
}; };
void __init sh73a0_clock_init(void) void __init sh73a0_clock_init(void)
......
arch/arm/mach-shmobile/include/mach/r8a7779.h
View file @ ea8d8a91
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#include <linux/sh_clk.h> #include <linux/sh_clk.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/sh_eth.h>
#include <linux/platform_data/camera-rcar.h>
/* HPB-DMA slave IDs */ /* HPB-DMA slave IDs */
enum { enum {
...@@ -40,9 +38,6 @@ extern void r8a7779_earlytimer_init(void); ...@@ -40,9 +38,6 @@ extern void r8a7779_earlytimer_init(void);
extern void r8a7779_add_early_devices(void); extern void r8a7779_add_early_devices(void);
extern void r8a7779_add_standard_devices(void); extern void r8a7779_add_standard_devices(void);
extern void r8a7779_add_standard_devices_dt(void); extern void r8a7779_add_standard_devices_dt(void);
extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata);
extern void r8a7779_add_vin_device(int idx,
struct rcar_vin_platform_data *pdata);
extern void r8a7779_init_late(void); extern void r8a7779_init_late(void);
extern void r8a7779_clock_init(void); extern void r8a7779_clock_init(void);
extern void r8a7779_pinmux_init(void); extern void r8a7779_pinmux_init(void);
......
arch/arm/mach-shmobile/setup-r8a7779.c
View file @ ea8d8a91
...@@ -598,45 +598,6 @@ static struct platform_device ohci1_device = { ...@@ -598,45 +598,6 @@ static struct platform_device ohci1_device = {
.resource = ohci1_resources, .resource = ohci1_resources,
}; };
/* Ether */
static struct resource ether_resources[] __initdata = {
{
.start = 0xfde00000,
.end = 0xfde003ff,
.flags = IORESOURCE_MEM,
}, {
.start = gic_iid(0xb4),
.flags = IORESOURCE_IRQ,
},
};
#define R8A7779_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), \
}
R8A7779_VIN(0);
R8A7779_VIN(1);
R8A7779_VIN(2);
R8A7779_VIN(3);
static struct platform_device_info *vin_info_table[] __initdata = {
&vin0_info,
&vin1_info,
&vin2_info,
&vin3_info,
};
/* HPB-DMA */ /* HPB-DMA */
/* Asynchronous mode register bits */ /* Asynchronous mode register bits */
...@@ -825,24 +786,6 @@ void __init r8a7779_add_standard_devices(void) ...@@ -825,24 +786,6 @@ void __init r8a7779_add_standard_devices(void)
r8a7779_register_hpb_dmae(); r8a7779_register_hpb_dmae();
} }
void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
{
platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
ether_resources,
ARRAY_SIZE(ether_resources),
pdata, sizeof(*pdata));
}
void __init r8a7779_add_vin_device(int id, struct rcar_vin_platform_data *pdata)
{
BUG_ON(id < 0 || id > 3);
vin_info_table[id]->data = pdata;
vin_info_table[id]->size_data = sizeof(*pdata);
platform_device_register_full(vin_info_table[id]);
}
/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
void __init __weak r8a7779_register_twd(void) { } void __init __weak r8a7779_register_twd(void) { }
......
arch/arm/mach-shmobile/setup-r8a7790.c
View file @ ea8d8a91
...@@ -34,6 +34,10 @@ static const struct resource pfc_resources[] __initconst = { ...@@ -34,6 +34,10 @@ static const struct resource pfc_resources[] __initconst = {
DEFINE_RES_MEM(0xe6060000, 0x250), DEFINE_RES_MEM(0xe6060000, 0x250),
}; };
#define r8a7790_register_pfc() \
platform_device_register_simple("pfc-r8a7790", -1, pfc_resources, \
ARRAY_SIZE(pfc_resources))
#define R8A7790_GPIO(idx) \ #define R8A7790_GPIO(idx) \
static const struct resource r8a7790_gpio##idx##_resources[] __initconst = { \ static const struct resource r8a7790_gpio##idx##_resources[] __initconst = { \
DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50), \ DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50), \
...@@ -65,8 +69,7 @@ R8A7790_GPIO(5); ...@@ -65,8 +69,7 @@ R8A7790_GPIO(5);
void __init r8a7790_pinmux_init(void) void __init r8a7790_pinmux_init(void)
{ {
platform_device_register_simple("pfc-r8a7790", -1, pfc_resources, r8a7790_register_pfc();
ARRAY_SIZE(pfc_resources));
r8a7790_register_gpio(0); r8a7790_register_gpio(0);
r8a7790_register_gpio(1); r8a7790_register_gpio(1);
r8a7790_register_gpio(2); r8a7790_register_gpio(2);
......
arch/arm/mach-shmobile/setup-sh73a0.c
View file @ ea8d8a91
...@@ -273,7 +273,7 @@ static struct sh_timer_config tmu00_platform_data = { ...@@ -273,7 +273,7 @@ static struct sh_timer_config tmu00_platform_data = {
}; };
static struct resource tmu00_resources[] = { static struct resource tmu00_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xfff60008, 0xc, "TMU00"), [0] = DEFINE_RES_MEM(0xfff60008, 0xc),
[1] = { [1] = {
.start = intcs_evt2irq(0x0e80), /* TMU0_TUNI00 */ .start = intcs_evt2irq(0x0e80), /* TMU0_TUNI00 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
...@@ -298,7 +298,7 @@ static struct sh_timer_config tmu01_platform_data = { ...@@ -298,7 +298,7 @@ static struct sh_timer_config tmu01_platform_data = {
}; };
static struct resource tmu01_resources[] = { static struct resource tmu01_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xfff60014, 0xc, "TMU00"), [0] = DEFINE_RES_MEM(0xfff60014, 0xc),
[1] = { [1] = {
.start = intcs_evt2irq(0x0ea0), /* TMU0_TUNI01 */ .start = intcs_evt2irq(0x0ea0), /* TMU0_TUNI01 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
...@@ -316,7 +316,7 @@ static struct platform_device tmu01_device = { ...@@ -316,7 +316,7 @@ static struct platform_device tmu01_device = {
}; };
static struct resource i2c0_resources[] = { static struct resource i2c0_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xe6820000, 0x426, "IIC0"), [0] = DEFINE_RES_MEM(0xe6820000, 0x426),
[1] = { [1] = {
.start = gic_spi(167), .start = gic_spi(167),
.end = gic_spi(170), .end = gic_spi(170),
...@@ -325,7 +325,7 @@ static struct resource i2c0_resources[] = { ...@@ -325,7 +325,7 @@ static struct resource i2c0_resources[] = {
}; };
static struct resource i2c1_resources[] = { static struct resource i2c1_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xe6822000, 0x426, "IIC1"), [0] = DEFINE_RES_MEM(0xe6822000, 0x426),
[1] = { [1] = {
.start = gic_spi(51), .start = gic_spi(51),
.end = gic_spi(54), .end = gic_spi(54),
...@@ -334,7 +334,7 @@ static struct resource i2c1_resources[] = { ...@@ -334,7 +334,7 @@ static struct resource i2c1_resources[] = {
}; };
static struct resource i2c2_resources[] = { static struct resource i2c2_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xe6824000, 0x426, "IIC2"), [0] = DEFINE_RES_MEM(0xe6824000, 0x426),
[1] = { [1] = {
.start = gic_spi(171), .start = gic_spi(171),
.end = gic_spi(174), .end = gic_spi(174),
...@@ -343,7 +343,7 @@ static struct resource i2c2_resources[] = { ...@@ -343,7 +343,7 @@ static struct resource i2c2_resources[] = {
}; };
static struct resource i2c3_resources[] = { static struct resource i2c3_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xe6826000, 0x426, "IIC3"), [0] = DEFINE_RES_MEM(0xe6826000, 0x426),
[1] = { [1] = {
.start = gic_spi(183), .start = gic_spi(183),
.end = gic_spi(186), .end = gic_spi(186),
...@@ -352,7 +352,7 @@ static struct resource i2c3_resources[] = { ...@@ -352,7 +352,7 @@ static struct resource i2c3_resources[] = {
}; };
static struct resource i2c4_resources[] = { static struct resource i2c4_resources[] = {
[0] = DEFINE_RES_MEM_NAMED(0xe6828000, 0x426, "IIC4"), [0] = DEFINE_RES_MEM(0xe6828000, 0x426),
[1] = { [1] = {
.start = gic_spi(187), .start = gic_spi(187),
.end = gic_spi(190), .end = gic_spi(190),
...@@ -722,7 +722,7 @@ static struct platform_device pmu_device = { ...@@ -722,7 +722,7 @@ static struct platform_device pmu_device = {
/* an IPMMU module for ICB */ /* an IPMMU module for ICB */
static struct resource ipmmu_resources[] = { static struct resource ipmmu_resources[] = {
DEFINE_RES_MEM_NAMED(0xfe951000, 0x100, "IPMMU"), DEFINE_RES_MEM(0xfe951000, 0x100),
}; };
static const char * const ipmmu_dev_names[] = { static const char * const ipmmu_dev_names[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7