|
@@ -23,6 +23,7 @@
|
|
|
#include <linux/io.h>
|
|
|
#include <linux/sh_clk.h>
|
|
|
#include <linux/clkdev.h>
|
|
|
+#include <mach/r8a7779.h>
|
|
|
#include "clock.h"
|
|
|
#include "common.h"
|
|
|
|
|
@@ -52,9 +53,6 @@
|
|
|
#define MSTPCR3 IOMEM(0xffc8003c)
|
|
|
#define MSTPSR1 IOMEM(0xffc80044)
|
|
|
|
|
|
-#define MODEMR 0xffcc0020
|
|
|
-
|
|
|
-
|
|
|
/* ioremap() through clock mapping mandatory to avoid
|
|
|
* collision with ARM coherent DMA virtual memory range.
|
|
|
*/
|
|
@@ -207,14 +205,9 @@ static struct clk_lookup lookups[] = {
|
|
|
|
|
|
void __init r8a7779_clock_init(void)
|
|
|
{
|
|
|
- void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
|
|
|
- u32 mode;
|
|
|
+ u32 mode = r8a7779_read_mode_pins();
|
|
|
int k, ret = 0;
|
|
|
|
|
|
- BUG_ON(!modemr);
|
|
|
- mode = ioread32(modemr);
|
|
|
- iounmap(modemr);
|
|
|
-
|
|
|
if (mode & MD(1)) {
|
|
|
plla_clk.rate = 1500000000;
|
|
|
|