diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-05-14 10:47:45 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 06:35:57 -0400 |
commit | d37e9b0b20dd7670946ad6034b4aa93b7e7048aa (patch) | |
tree | 2c6f1ab6cbf55c1942efb55faba5b186581530b5 | |
parent | ecdaca48629bd99609fdc612685363330967dce2 (diff) |
ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
Now the core clock issues have been fixed by commit
3c90c55dcde745bed81f6447f24ba96bda43d984 ("drivers: sh: compile
drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI"), revert the following
3 commits:
- 4dcb4c80380dfa482874b931e308fd382597feab ("ARM: shmobile: Add Koelsch
clock workarounds for SDHI"),
- 8e4f394b20a0fe474dd88204d76978191566decf ("ARM: shmobile:
koelsch-reference: Annotate clk_enables as __initconst"),
- 3d75d9ea74fee6f5a4bdcbbdf2d577661d047eef ("ARM: shmobile:
koelsch-reference: Work around core clock issues").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/board-koelsch-reference.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c index 1d3f67d4ccd6..28e3c45c8b90 100644 --- a/arch/arm/mach-shmobile/board-koelsch-reference.c +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c | |||
@@ -92,24 +92,9 @@ static const struct clk_name clk_names[] __initconst = { | |||
92 | { "lvds0", "lvds.0", "rcar-du-r8a7791" }, | 92 | { "lvds0", "lvds.0", "rcar-du-r8a7791" }, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | /* | ||
96 | * This is a really crude hack to work around core platform clock issues | ||
97 | */ | ||
98 | static const struct clk_name clk_enables[] __initconst = { | ||
99 | { "ether", NULL, "ee700000.ethernet" }, | ||
100 | { "i2c2", NULL, "e6530000.i2c" }, | ||
101 | { "msiof0", NULL, "e6e20000.spi" }, | ||
102 | { "qspi_mod", NULL, "e6b10000.spi" }, | ||
103 | { "sdhi0", NULL, "ee100000.sd" }, | ||
104 | { "sdhi1", NULL, "ee140000.sd" }, | ||
105 | { "sdhi2", NULL, "ee160000.sd" }, | ||
106 | { "thermal", NULL, "e61f0000.thermal" }, | ||
107 | }; | ||
108 | |||
109 | static void __init koelsch_add_standard_devices(void) | 95 | static void __init koelsch_add_standard_devices(void) |
110 | { | 96 | { |
111 | shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); | 97 | shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); |
112 | shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true); | ||
113 | r8a7791_add_dt_devices(); | 98 | r8a7791_add_dt_devices(); |
114 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 99 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
115 | 100 | ||