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

Commit df9d38eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: se/7724: Remove FSI/B of GPIO init code
  sh: se/7724: Update clock framework of FSI clock to non-legacy
  sh: Assume new page cache pages have dirty dcache lines.
  sh: boards: mach-se: use IS_ERR() instead of NULL check
  sh: Add div6_reparent_clks to clock framework for FSI
  dma: shdma: add a MODULE_ALIAS() to allow module autoloading
parents 47337ad6 a9fc7492

arch/sh/boards/mach-ecovec24/setup.c

+4 −30
Original line number Diff line number Diff line
@@ -720,32 +720,6 @@ static struct platform_device camera_devices[] = { 
};



/* FSI */

/*

 * FSI-B use external clock which came from da7210.

 * So, we should change parent of fsi

 */

#define FCLKBCR		0xa415000c

static void fsimck_init(struct clk *clk)

{

	u32 status = __raw_readl(clk->enable_reg);



	/* use external clock */

	status &= ~0x000000ff;

	status |= 0x00000080;



	__raw_writel(status, clk->enable_reg);

}



static struct clk_ops fsimck_clk_ops = {

	.init = fsimck_init,

};



static struct clk fsimckb_clk = {

	.ops		= &fsimck_clk_ops,

	.enable_reg	= (void __iomem *)FCLKBCR,

	.rate		= 0, /* unknown */

};



static struct sh_fsi_platform_info fsi_info = {

	.portb_flags = SH_FSI_BRS_INV |

		       SH_FSI_OUT_SLAVE_MODE |
@@ -1264,10 +1238,10 @@ static int __init arch_setup(void) 
	/* change parent of FSI B */

	clk = clk_get(NULL, "fsib_clk");

	if (!IS_ERR(clk)) {

		clk_register(&fsimckb_clk);

		clk_set_parent(clk, &fsimckb_clk);

		clk_set_rate(clk, 11000);

		clk_set_rate(&fsimckb_clk, 11000);

		/* 48kHz dummy clock was used to make sure 1/1 divide */

		clk_set_rate(&sh7724_fsimckb_clk, 48000);

		clk_set_parent(clk, &sh7724_fsimckb_clk);

		clk_set_rate(clk, 48000);

		clk_put(clk);

	}

arch/sh/boards/mach-se/7724/setup.c

+7 −40
Original line number Diff line number Diff line
@@ -283,31 +283,6 @@ static struct platform_device ceu1_device = { 
};



/* FSI */

/*

 * FSI-A use external clock which came from ak464x.

 * So, we should change parent of fsi

 */

#define FCLKACR		0xa4150008

static void fsimck_init(struct clk *clk)

{

	u32 status = __raw_readl(clk->enable_reg);



	/* use external clock */

	status &= ~0x000000ff;

	status |= 0x00000080;

	__raw_writel(status, clk->enable_reg);

}



static struct clk_ops fsimck_clk_ops = {

	.init = fsimck_init,

};



static struct clk fsimcka_clk = {

	.ops		= &fsimck_clk_ops,

	.enable_reg	= (void __iomem *)FCLKACR,

	.rate		= 0, /* unknown */

};



/* change J20, J21, J22 pin to 1-2 connection to use slave mode */

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_BRS_INV |
@@ -852,37 +827,29 @@ static int __init devices_setup(void) 
	gpio_request(GPIO_FN_KEYOUT0,     NULL);



	/* enable FSI */

	gpio_request(GPIO_FN_FSIMCKB,    NULL);

	gpio_request(GPIO_FN_FSIMCKA,    NULL);

	gpio_request(GPIO_FN_FSIIASD,    NULL);

	gpio_request(GPIO_FN_FSIOASD,    NULL);

	gpio_request(GPIO_FN_FSIIABCK,   NULL);

	gpio_request(GPIO_FN_FSIIALRCK,  NULL);

	gpio_request(GPIO_FN_FSIOABCK,   NULL);

	gpio_request(GPIO_FN_FSIOALRCK,  NULL);

	gpio_request(GPIO_FN_CLKAUDIOAO, NULL);

	gpio_request(GPIO_FN_FSIIBSD,    NULL);

	gpio_request(GPIO_FN_FSIOBSD,    NULL);

	gpio_request(GPIO_FN_FSIIBBCK,   NULL);

	gpio_request(GPIO_FN_FSIIBLRCK,  NULL);

	gpio_request(GPIO_FN_FSIOBBCK,   NULL);

	gpio_request(GPIO_FN_FSIOBLRCK,  NULL);

	gpio_request(GPIO_FN_CLKAUDIOBO, NULL);

	gpio_request(GPIO_FN_FSIIASD,    NULL);



	/* set SPU2 clock to 83.4 MHz */

	clk = clk_get(NULL, "spu_clk");

	if (clk) {

	if (!IS_ERR(clk)) {

		clk_set_rate(clk, clk_round_rate(clk, 83333333));

		clk_put(clk);

	}



	/* change parent of FSI A */

	clk = clk_get(NULL, "fsia_clk");

	if (clk) {

		clk_register(&fsimcka_clk);

		clk_set_parent(clk, &fsimcka_clk);

		clk_set_rate(clk, 11000);

		clk_set_rate(&fsimcka_clk, 11000);

	if (!IS_ERR(clk)) {

		/* 48kHz dummy clock was used to make sure 1/1 divide */

		clk_set_rate(&sh7724_fsimcka_clk, 48000);

		clk_set_parent(clk, &sh7724_fsimcka_clk);

		clk_set_rate(clk, 48000);

		clk_put(clk);

	}

arch/sh/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void kmap_coherent_init(void); 
void *kmap_coherent(struct page *page, unsigned long addr);

void kunmap_coherent(void *kvaddr);



#define PG_dcache_dirty	PG_arch_1

#define PG_dcache_clean	PG_arch_1



void cpu_cache_init(void);

arch/sh/include/cpu-sh4/cpu/sh7724.h

+3 −0
Original line number Diff line number Diff line
@@ -303,4 +303,7 @@ enum { 
	SHDMA_SLAVE_SDHI1_RX,

};



extern struct clk sh7724_fsimcka_clk;

extern struct clk sh7724_fsimckb_clk;



#endif /* __ASM_SH7724_H__ */

arch/sh/kernel/cpu/sh4a/clock-sh7724.c

+39 −5
Original line number Diff line number Diff line
@@ -111,12 +111,21 @@ static struct clk div3_clk = { 
	.parent		= &pll_clk,

};



/* External input clock (pin name: FSIMCKA/FSIMCKB ) */

struct clk sh7724_fsimcka_clk = {

};



struct clk sh7724_fsimckb_clk = {

};



static struct clk *main_clks[] = {

	&r_clk,

	&extal_clk,

	&fll_clk,

	&pll_clk,

	&div3_clk,

	&sh7724_fsimcka_clk,

	&sh7724_fsimckb_clk,

};



static void div4_kick(struct clk *clk)
@@ -154,16 +163,38 @@ struct clk div4_clks[DIV4_NR] = { 
	[DIV4_M1] = DIV4(FRQCRB, 4, 0x2f7c, CLK_ENABLE_ON_INIT),

};



enum { DIV6_V, DIV6_FA, DIV6_FB, DIV6_I, DIV6_S, DIV6_NR };

enum { DIV6_V, DIV6_I, DIV6_S, DIV6_NR };



static struct clk div6_clks[DIV6_NR] = {

	[DIV6_V] = SH_CLK_DIV6(&div3_clk, VCLKCR, 0),

	[DIV6_FA] = SH_CLK_DIV6(&div3_clk, FCLKACR, 0),

	[DIV6_FB] = SH_CLK_DIV6(&div3_clk, FCLKBCR, 0),

	[DIV6_I] = SH_CLK_DIV6(&div3_clk, IRDACLKCR, 0),

	[DIV6_S] = SH_CLK_DIV6(&div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT),

};



enum { DIV6_FA, DIV6_FB, DIV6_REPARENT_NR };



/* Indices are important - they are the actual src selecting values */

static struct clk *fclkacr_parent[] = {

	[0] = &div3_clk,

	[1] = NULL,

	[2] = &sh7724_fsimcka_clk,

	[3] = NULL,

};



static struct clk *fclkbcr_parent[] = {

	[0] = &div3_clk,

	[1] = NULL,

	[2] = &sh7724_fsimckb_clk,

	[3] = NULL,

};



static struct clk div6_reparent_clks[DIV6_REPARENT_NR] = {

	[DIV6_FA] = SH_CLK_DIV6_EXT(&div3_clk, FCLKACR, 0,

				      fclkacr_parent, ARRAY_SIZE(fclkacr_parent), 6, 2),

	[DIV6_FB] = SH_CLK_DIV6_EXT(&div3_clk, FCLKBCR, 0,

				      fclkbcr_parent, ARRAY_SIZE(fclkbcr_parent), 6, 2),

};



static struct clk mstp_clks[HWBLK_NR] = {

	SH_HWBLK_CLK(HWBLK_TLB, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),

	SH_HWBLK_CLK(HWBLK_IC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
@@ -240,8 +271,8 @@ static struct clk_lookup lookups[] = { 


	/* DIV6 clocks */

	CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),

	CLKDEV_CON_ID("fsia_clk", &div6_clks[DIV6_FA]),

	CLKDEV_CON_ID("fsib_clk", &div6_clks[DIV6_FB]),

	CLKDEV_CON_ID("fsia_clk", &div6_reparent_clks[DIV6_FA]),

	CLKDEV_CON_ID("fsib_clk", &div6_reparent_clks[DIV6_FB]),

	CLKDEV_CON_ID("irda_clk", &div6_clks[DIV6_I]),

	CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_S]),
@@ -375,6 +406,9 @@ int __init arch_clk_init(void) 
	if (!ret)

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);



	if (!ret)

		ret = sh_clk_div6_reparent_register(div6_reparent_clks, DIV6_REPARENT_NR);



	if (!ret)

		ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);