Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edcf1390 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: r8a7791: Use rcar_gen2_read_mode_pins() helper 



Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c9eaa447

arch/arm/mach-shmobile/clock-r8a7791.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/clkdev.h>

#include <linux/clkdev.h>

#include <mach/clock.h>

#include <mach/clock.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/rcar-gen2.h>





/*

/*

 *   MD		EXTAL		PLL0	PLL1	PLL3

 *   MD		EXTAL		PLL0	PLL1	PLL3
@@ -43,8 +44,6 @@ 
 *	see "p1 / 2" on R8A7791_CLOCK_ROOT() below

 *	see "p1 / 2" on R8A7791_CLOCK_ROOT() below

 */

 */





#define MD(nr)	(1 << nr)



#define CPG_BASE 0xe6150000

#define CPG_BASE 0xe6150000

#define CPG_LEN 0x1000

#define CPG_LEN 0x1000
@@ -68,7 +67,6 @@ 
#define MSTPSR9		IOMEM(0xe61509a4)

#define MSTPSR9		IOMEM(0xe61509a4)

#define MSTPSR11	IOMEM(0xe61509ac)

#define MSTPSR11	IOMEM(0xe61509ac)





#define MODEMR		0xE6160060

#define SDCKCR		0xE6150074

#define SDCKCR		0xE6150074

#define SD1CKCR		0xE6150078

#define SD1CKCR		0xE6150078

#define SD2CKCR		0xE615026c

#define SD2CKCR		0xE615026c
@@ -295,14 +293,9 @@ static struct clk_lookup lookups[] = { 




void __init r8a7791_clock_init(void)

void __init r8a7791_clock_init(void)

{

{

	void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);

	u32 mode = rcar_gen2_read_mode_pins();

	u32 mode;

	int k, ret = 0;

	int k, ret = 0;





	BUG_ON(!modemr);

	mode = ioread32(modemr);

	iounmap(modemr);



	switch (mode & (MD(14) | MD(13))) {

	switch (mode & (MD(14) | MD(13))) {

	case 0:

	case 0:

		R8A7791_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);

		R8A7791_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);