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

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

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh 

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: Convert sh_clk_mstp32_register to sh_clk_mstp_register
  sh: kfr2r09: fix compile breakage
parents f3747e2f e9bcd470

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

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static struct resource kfr2r09_usb0_gadget_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evtirq(0xa20),

		.end	= evtirq(0xa20),

		.start	= evt2irq(0xa20),

		.end	= evt2irq(0xa20),

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_LOW,

	},

};

arch/sh/drivers/pci/pcie-sh7786.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port) 
	clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);

	clk->enable_bit = BITS_CKE;



	ret = sh_clk_mstp32_register(clk, 1);

	ret = sh_clk_mstp_register(clk, 1);

	if (unlikely(ret < 0))

		goto err_phy;

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

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ int __init arch_clk_init(void) 
		ret = sh_clk_div6_register(div6_clks, DIV6_NR);



	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);



	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int __init arch_clk_init(void) 
		ret = sh_clk_div6_register(div6_clks, DIV6_NR);



	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);



	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int __init arch_clk_init(void) 
		ret = sh_clk_div6_register(div6_clks, DIV6_NR);



	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);

		ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);



	return ret;

}