linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2013-08-29  8:04 Stephen Rothwell
  2013-08-29 17:57 ` Olof Johansson
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-08-29  8:04 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Lorenzo Pieralisi, Daniel Lezcano,
	Sahara, Rafael J. Wysocki, Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/cpuidle/Makefile between commits b98e01ad4ed9 ("cpuidle: Add
Kconfig.arm and move calxeda, kirkwood and zynq") and d3f2950f2ade ("ARM:
ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle") from the
pm tree and commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU
idle driver") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/cpuidle/Makefile
index 0b9d200,3b6445c..0000000
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -5,9 -5,7 +5,10 @@@
  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
  
 -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
 -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
 -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
 -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
 +##################################################################################
 +# ARM SoC drivers
 +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)	+= cpuidle-calxeda.o
 +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o
 +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o
 +obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE)       += cpuidle-big_little.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2013-10-29  8:00 Stephen Rothwell
  2013-10-29 12:08 ` Rafael J. Wysocki
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-10-29  8:00 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Nishanth Menon, Tony Lindgren,
	Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 ("PM / OPP: rename
header to linux/pm_opp.h") from the pm tree and commit 92d51856d740
("ARM: OMAP3+: do not register non-dt OPP tables for device tree boot")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/opp.c
index ec21e6eb03e1,82fd8c72f750..000000000000
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@@@ -17,7 -17,8 +17,8 @@@
   * GNU General Public License for more details.
   */
  #include <linux/module.h>
+ #include <linux/of.h>
 -#include <linux/opp.h>
 +#include <linux/pm_opp.h>
  #include <linux/cpu.h>
  
  #include "omap_device.h"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2013-08-27  8:33 Stephen Rothwell
  2013-08-27 15:30 ` Kevin Hilman
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-08-27  8:33 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Sudeep KarkadaNagesha,
	Rafael J. Wysocki, Rafael J. Wysocki, Ezequiel Garcia,
	Jason Cooper

[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 ("ARM: mvebu:
remove device tree parsing for cpu nodes") from the  tree and commit
994c8c94b419 ("ARM: mvebu: Remove the harcoded BootROM window
allocation") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-mvebu/platsmp.c
index 594b63d,4f960f0..0000000
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@@ -29,28 -30,31 +30,31 @@@
  #include "pmsu.h"
  #include "coherency.h"
  
+ #define AXP_BOOTROM_BASE 0xfff00000
+ #define AXP_BOOTROM_SIZE 0x100000
+ 
 +static struct clk *__init get_cpu_clk(int cpu)
 +{
 +	struct clk *cpu_clk;
 +	struct device_node *np = of_get_cpu_node(cpu, NULL);
 +
 +	if (WARN(!np, "missing cpu node\n"))
 +		return NULL;
 +	cpu_clk = of_clk_get(np, 0);
 +	if (WARN_ON(IS_ERR(cpu_clk)))
 +		return NULL;
 +	return cpu_clk;
 +}
 +
  void __init set_secondary_cpus_clock(void)
  {
 -	int thiscpu;
 +	int thiscpu, cpu;
  	unsigned long rate;
 -	struct clk *cpu_clk = NULL;
 -	struct device_node *np = NULL;
 +	struct clk *cpu_clk;
  
  	thiscpu = smp_processor_id();
 -	for_each_node_by_type(np, "cpu") {
 -		int err;
 -		int cpu;
 -
 -		err = of_property_read_u32(np, "reg", &cpu);
 -		if (WARN_ON(err))
 -			return;
 -
 -		if (cpu == thiscpu) {
 -			cpu_clk = of_clk_get(np, 0);
 -			break;
 -		}
 -	}
 -	if (WARN_ON(IS_ERR(cpu_clk)))
 +	cpu_clk = get_cpu_clk(thiscpu);
 +	if (!cpu_clk)
  		return;
  	clk_prepare_enable(cpu_clk);
  	rate = clk_get_rate(cpu_clk);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2013-04-24  6:54 Stephen Rothwell
  2013-04-25 16:15 ` Kukjin Kim
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-04-24  6:54 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Daniel Lezcano, Rafael J. Wysocki, Kukjin Kim

[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 ("cpuidle:
remove en_core_tk_irqen flag") from the pm tree and commit 2eb89f893e44
("ARM: EXYNOS: factor out the idle states") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-exynos/cpuidle.c
index 498a7a2,e2689d1..0000000
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@@ -58,6 -46,20 +46,19 @@@ static DEFINE_PER_CPU(struct cpuidle_de
  static struct cpuidle_driver exynos4_idle_driver = {
  	.name			= "exynos4_idle",
  	.owner			= THIS_MODULE,
 -	.en_core_tk_irqen	= 1,
+ 	.states = {
+ 		[0] = ARM_CPUIDLE_WFI_STATE,
+ 		[1] = {
+ 			.enter			= exynos4_enter_lowpower,
+ 			.exit_latency		= 300,
+ 			.target_residency	= 100000,
+ 			.flags			= CPUIDLE_FLAG_TIME_VALID,
+ 			.name			= "C1",
+ 			.desc			= "ARM power down",
+ 		},
+ 	},
+ 	.state_count = 2,
+ 	.safe_state_index = 0,
  };
  
  /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2013-04-10  7:17 Stephen Rothwell
  2013-04-10  8:36 ` Kukjin Kim
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2013-04-10  7:17 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Viresh Kumar, Alexander Shiyan,
	Kukjin Kim, Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 ("cpufreq:
s3c24xx: move cpufreq driver to drivers/cpufreq") from the pm tree and
commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
dependency on CPU_S3C2412") from the arm-soc tree.

I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig
and can carry thefix as necessary (no action is required).

P.S. those arm-soc tree commits have a bad Author email address ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
* linux-next: manual merge of the arm-soc tree with the pm tree
@ 2012-09-24  9:21 Stephen Rothwell
  2012-09-24 17:02 ` Olof Johansson
  0 siblings, 1 reply; 17+ messages in thread
From: Stephen Rothwell @ 2012-09-24  9:21 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Marc Zyngier, Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 1935 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/include/mach/common.h between commit 35f2b0bd5911
("ARM: shmobile: Move definition of shmobile_init_late() to header") from
the pm tree and commit a62580e58065 ("ARM: SoC: convert shmobile SMP to
SMP operations") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/include/mach/common.h
index eb89293,f80f9c5..0000000
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -81,13 -73,10 +75,8 @@@ extern void r8a7779_pinmux_init(void)
  extern void r8a7779_pm_init(void);
  extern void r8a7740_meram_workaround(void);
  
- extern unsigned int r8a7779_get_core_count(void);
- extern int r8a7779_platform_cpu_kill(unsigned int cpu);
- extern void r8a7779_secondary_init(unsigned int cpu);
- extern int r8a7779_boot_secondary(unsigned int cpu);
- extern void r8a7779_smp_prepare_cpus(void);
  extern void r8a7779_register_twd(void);
  
 -extern void shmobile_init_late(void);
 -
  #ifdef CONFIG_SUSPEND
  int shmobile_suspend_init(void);
  #else
@@@ -100,10 -89,15 +89,21 @@@ int shmobile_cpuidle_init(void)
  static inline int shmobile_cpuidle_init(void) { return 0; }
  #endif
  
 +static inline void shmobile_init_late(void)
 +{
 +	shmobile_suspend_init();
 +	shmobile_cpuidle_init();
 +}
 +
+ extern void shmobile_cpu_die(unsigned int cpu);
+ extern int shmobile_cpu_disable(unsigned int cpu);
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+ extern int shmobile_cpu_is_dead(unsigned int cpu);
+ #else
+ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; }
+ #endif
+ 
+ extern void shmobile_smp_init_cpus(unsigned int ncores);
+ 
  #endif /* __ARCH_MACH_COMMON_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-10-29 11:56 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-29  8:04 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson
2013-09-02 18:09   ` Lorenzo Pieralisi
2013-09-09 17:22     ` Kevin Hilman
2013-09-10  8:59       ` Lorenzo Pieralisi
  -- strict thread matches above, loose matches on Subject: below --
2013-10-29  8:00 Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
2013-08-27  8:33 Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-04-24  6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-04-10  7:17 Stephen Rothwell
2013-04-10  8:36 ` Kukjin Kim
2013-04-11  8:37   ` Olof Johansson
2013-04-19 10:59     ` Kukjin Kim
2012-09-24  9:21 Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).