tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH driver fix from Simon Horman:
"Compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

This resolves a regression introduced in v3.14 by commit bf98c1eac1d4
("ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY")"

* tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

Linus Torvalds f6ce579d fba69f04

+28 -8
unified split
+1 -1
drivers/Makefile
··· 119 obj-y += firmware/ 120 obj-$(CONFIG_CRYPTO) += crypto/ 121 obj-$(CONFIG_SUPERH) += sh/ 122 - obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += sh/ 123 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET 124 obj-y += clocksource/ 125 endif
··· 119 obj-y += firmware/ 120 obj-$(CONFIG_CRYPTO) += crypto/ 121 obj-$(CONFIG_SUPERH) += sh/ 122 + obj-$(CONFIG_ARCH_SHMOBILE) += sh/ 123 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET 124 obj-y += clocksource/ 125 endif
+8 -6
drivers/sh/Makefile
··· 1 # 2 # Makefile for the SuperH specific drivers. 3 # 4 - obj-y := intc/ 5 6 - obj-$(CONFIG_HAVE_CLK) += clk/ 7 - obj-$(CONFIG_MAPLE) += maple/ 8 - obj-$(CONFIG_SUPERHYWAY) += superhyway/ 9 - 10 - obj-y += pm_runtime.o
··· 1 # 2 # Makefile for the SuperH specific drivers. 3 # 4 + obj-$(CONFIG_SUPERH) += intc/ 5 + obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/ 6 + ifneq ($(CONFIG_COMMON_CLK),y) 7 + obj-$(CONFIG_HAVE_CLK) += clk/ 8 + endif 9 + obj-$(CONFIG_MAPLE) += maple/ 10 + obj-$(CONFIG_SUPERHYWAY) += superhyway/ 11 12 + obj-y += pm_runtime.o
+19 -1
drivers/sh/pm_runtime.c
··· 50 .con_ids = { NULL, }, 51 }; 52 53 static int __init sh_pm_runtime_init(void) 54 { 55 pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); 56 return 0; 57 } ··· 76 77 static int __init sh_pm_runtime_late_init(void) 78 { 79 - pm_genpd_poweroff_unused(); 80 return 0; 81 } 82 late_initcall(sh_pm_runtime_late_init);
··· 50 .con_ids = { NULL, }, 51 }; 52 53 + static bool default_pm_on; 54 + 55 static int __init sh_pm_runtime_init(void) 56 { 57 + if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) { 58 + if (!of_machine_is_compatible("renesas,emev2") && 59 + !of_machine_is_compatible("renesas,r7s72100") && 60 + !of_machine_is_compatible("renesas,r8a73a4") && 61 + !of_machine_is_compatible("renesas,r8a7740") && 62 + !of_machine_is_compatible("renesas,r8a7778") && 63 + !of_machine_is_compatible("renesas,r8a7779") && 64 + !of_machine_is_compatible("renesas,r8a7790") && 65 + !of_machine_is_compatible("renesas,r8a7791") && 66 + !of_machine_is_compatible("renesas,sh7372") && 67 + !of_machine_is_compatible("renesas,sh73a0")) 68 + return 0; 69 + } 70 + 71 + default_pm_on = true; 72 pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); 73 return 0; 74 } ··· 59 60 static int __init sh_pm_runtime_late_init(void) 61 { 62 + if (default_pm_on) 63 + pm_genpd_poweroff_unused(); 64 return 0; 65 } 66 late_initcall(sh_pm_runtime_late_init);