Subject: [merged] sh-sh7757-switch-rspi-clock-to-dev-id-match.patch removed from -mm tree To: geert+renesas@xxxxxxxxxxxxxx,yoshihiro.shimoda.uh@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 04 Apr 2014 12:29:53 -0700 The patch titled Subject: sh: sh7757: switch RSPI clock to dev ID match has been removed from the -mm tree. Its filename was sh-sh7757-switch-rspi-clock-to-dev-id-match.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Geert Uytterhoeven <geert+renesas@xxxxxxxxxxxxxx> Subject: sh: sh7757: switch RSPI clock to dev ID match Switch the RSPI MSTP clock on SH7757 from a con ID match to a dev ID match, so we can start looking it up using clk_get() with a NULL ID. Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxxxxxxx> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/sh/kernel/cpu/sh4a/clock-sh7757.c~sh-sh7757-switch-rspi-clock-to-dev-id-match arch/sh/kernel/cpu/sh4a/clock-sh7757.c --- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c~sh-sh7757-switch-rspi-clock-to-dev-id-match +++ a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c @@ -132,7 +132,7 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]), CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]), CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]), - CLKDEV_CON_ID("rspi2", &mstp_clks[MSTP127]), + CLKDEV_DEV_ID("rspi.2", &mstp_clks[MSTP127]), }; int __init arch_clk_init(void) _ Patches currently in -mm which might be from geert+renesas@xxxxxxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html