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

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

Merge tag 'renesas-sh-drivers-for-v3.15' of... 

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 bf98c1ea
  ("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
parents fba69f04 3c90c55d

drivers/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ obj-$(CONFIG_SGI_SN) += sn/ 
obj-y				+= firmware/

obj-y				+= firmware/

obj-$(CONFIG_CRYPTO)		+= crypto/

obj-$(CONFIG_CRYPTO)		+= crypto/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= sh/

obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/

ifndef CONFIG_ARCH_USES_GETTIMEOFFSET

ifndef CONFIG_ARCH_USES_GETTIMEOFFSET

obj-y				+= clocksource/

obj-y				+= clocksource/

endif

endif

drivers/sh/Makefile

+8 −6
Original line number Original line Diff line number Diff line 
#

#

# Makefile for the SuperH specific drivers.

# Makefile for the SuperH specific drivers.

#

#

obj-y	:= intc/

obj-$(CONFIG_SUPERH)			+= intc/



obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= intc/

ifneq ($(CONFIG_COMMON_CLK),y)

obj-$(CONFIG_HAVE_CLK)			+= clk/

obj-$(CONFIG_HAVE_CLK)			+= clk/

endif

obj-$(CONFIG_MAPLE)			+= maple/

obj-$(CONFIG_MAPLE)			+= maple/

obj-$(CONFIG_SUPERHYWAY)		+= superhyway/

obj-$(CONFIG_SUPERHYWAY)		+= superhyway/

drivers/sh/pm_runtime.c

+19 −1
Original line number Original line Diff line number Diff line
@@ -50,8 +50,25 @@ static struct pm_clk_notifier_block platform_bus_notifier = { 
	.con_ids = { NULL, },

	.con_ids = { NULL, },

};

};





static bool default_pm_on;



static int __init sh_pm_runtime_init(void)

static int __init sh_pm_runtime_init(void)

{

{

	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {

		if (!of_machine_is_compatible("renesas,emev2") &&

		    !of_machine_is_compatible("renesas,r7s72100") &&

		    !of_machine_is_compatible("renesas,r8a73a4") &&

		    !of_machine_is_compatible("renesas,r8a7740") &&

		    !of_machine_is_compatible("renesas,r8a7778") &&

		    !of_machine_is_compatible("renesas,r8a7779") &&

		    !of_machine_is_compatible("renesas,r8a7790") &&

		    !of_machine_is_compatible("renesas,r8a7791") &&

		    !of_machine_is_compatible("renesas,sh7372") &&

		    !of_machine_is_compatible("renesas,sh73a0"))

			return 0;

	}



	default_pm_on = true;

	pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);

	pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);

	return 0;

	return 0;

}

}
@@ -59,6 +76,7 @@ core_initcall(sh_pm_runtime_init); 




static int __init sh_pm_runtime_late_init(void)

static int __init sh_pm_runtime_late_init(void)

{

{

	if (default_pm_on)

		pm_genpd_poweroff_unused();

		pm_genpd_poweroff_unused();

	return 0;

	return 0;

}

}