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

Commit e9bcd470 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus

parents bc404e91 ad3337cb

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

+1 −1
Original line number Original line 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_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);

	clk->enable_bit = BITS_CKE;

	clk->enable_bit = BITS_CKE;





	ret = sh_clk_mstp32_register(clk, 1);

	ret = sh_clk_mstp_register(clk, 1);

	if (unlikely(ret < 0))

	if (unlikely(ret < 0))

		goto err_phy;

		goto err_phy;

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

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

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);





	if (!ret)

	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);





	return ret;

	return ret;

}
 
}

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

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

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);





	if (!ret)

	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);





	return ret;

	return ret;

}
 
}

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

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

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);





	if (!ret)

	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);

		ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);





	return ret;

	return ret;

}
 
}

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

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

		ret = sh_clk_div6_register(div6_clks, DIV6_NR);





	if (!ret)

	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);

		ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);





	return ret;

	return ret;

}
 
}