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

Commit c816d7c6 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: intc: Initialize radix tree gfp mask explicitly.
  sh: Fix up SH7201 clkfwk build.
  sh: mach-se: Fix up SE7206 build.
  sh: Fix up SH4-202 clkfwk build.
parents b094a870 30f2ba38

arch/sh/boards/mach-se/7206/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void __init init_se7206_IRQ(void) 
	make_se7206_irq(IRQ1_IRQ); /* ATA */

	make_se7206_irq(IRQ3_IRQ); /* SLOT / PCM */



	__raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR); /* ICR1 */

	__raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR1); /* ICR1 */



	/* FPGA System register setup*/

	__raw_writew(0x0000,INTSTS0); /* Clear INTSTS0 */

arch/sh/kernel/cpu/sh2a/clock-sh7201.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static const int pfc_divisors[]={1,2,3,4,6,8,12}; 


static void master_clk_init(struct clk *clk)

{

	return 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];

	clk->rate = 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];

}



static struct clk_ops sh7201_master_clk_ops = {

arch/sh/kernel/cpu/sh4/clock-sh4-202.c

+1 −2
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ static void shoc_clk_init(struct clk *clk) 
	for (i = 0; i < ARRAY_SIZE(frqcr3_divisors); i++) {

		int divisor = frqcr3_divisors[i];



		if (clk->ops->set_rate(clk, clk->parent->rate /

						divisor, 0) == 0)

		if (clk->ops->set_rate(clk, clk->parent->rate / divisor) == 0)

			break;

	}

drivers/sh/intc/core.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ int __init register_intc_controller(struct intc_desc *desc) 
	list_add_tail(&d->list, &intc_list);



	raw_spin_lock_init(&d->lock);

	INIT_RADIX_TREE(&d->tree, GFP_ATOMIC);



	d->index = nr_intc_controllers;