From a9f787c7053b66375c95b76f85c9693af644fcd6 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 6 May 2012 22:58:41 -0700 Subject: [PATCH] --- yaml --- r: 303489 b: refs/heads/master c: 9c18f238c1ec36b9912b5b36ae24e0c221179044 h: refs/heads/master i: 303487: 0e163904011df8c405b98a529463625c37084b67 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-armadillo800eva.c | 1 + trunk/arch/arm/mach-shmobile/clock-r8a7740.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 287e9f499815..6a8516ba0f81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3841e6f561af717478b253ce1dcba7bff9e9f890 +refs/heads/master: 9c18f238c1ec36b9912b5b36ae24e0c221179044 diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c index 0cfaec5a5c6a..e750ea69cc94 100644 --- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -321,6 +321,7 @@ static struct resource sh_eth_resources[] = { static struct platform_device sh_eth_device = { .name = "sh-eth", + .id = -1, .dev = { .platform_data = &sh_eth_platdata, }, diff --git a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c index 81b54a6af20f..26eea5f21054 100644 --- a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c @@ -352,6 +352,7 @@ enum { MSTP329, MSTP328, MSTP323, MSTP320, MSTP314, MSTP313, MSTP312, + MSTP309, MSTP416, MSTP415, MSTP407, MSTP406, @@ -382,6 +383,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 14, 0), /* SDHI0 */ [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 13, 0), /* SDHI1 */ [MSTP312] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMC */ + [MSTP309] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 9, 0), /* GEther */ [MSTP416] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR4, 16, 0), /* USBHOST */ [MSTP415] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR4, 15, 0), /* SDHI2 */ @@ -447,6 +449,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), + CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP309]), CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),