linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-20  3:36 Stephen Rothwell
  2014-04-02  0:47 ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-20  3:36 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Shawn Guo

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 ("ARM: imx6:
rename pm-imx6q.c to pm-imx6.c") from the arm-soc tree and commit
8435cf757632 ("arm: Replace various irq_desc accesses") from the tip tree.

I fixed it up (by applying the tip tree patch to the renamed file -
arch/arm/mach-imx/pm-imx6.c - see patch below) and can carry the fix as
necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Mar 2014 14:33:26 +1100
Subject: [PATCH] arm: Replace various irq_desc accesses fix for file move

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-imx/pm-imx6.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 16f0d249f6a7..9392a8f4ef24 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -241,7 +241,7 @@ static void imx6q_enable_wb(bool enable)
 
 int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
 {
-	struct irq_desc *iomuxc_irq_desc;
+	struct irq_data *iomuxc_irq_data = irq_get_irq_data(32);
 	u32 val = readl_relaxed(ccm_base + CLPCR);
 
 	val &= ~BM_CLPCR_LPM;
@@ -288,10 +288,9 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
 	 * 3) Software should mask IRQ #32 right after CCM Low-Power mode
 	 *    is set (set bits 0-1 of CCM_CLPCR).
 	 */
-	iomuxc_irq_desc = irq_to_desc(32);
-	imx_gpc_irq_unmask(&iomuxc_irq_desc->irq_data);
+	imx_gpc_irq_unmask(iomuxc_irq_data);
 	writel_relaxed(val, ccm_base + CLPCR);
-	imx_gpc_irq_mask(&iomuxc_irq_desc->irq_data);
+	imx_gpc_irq_mask(iomuxc_irq_data);
 
 	return 0;
 }
-- 
1.9.0

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

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

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: linux-next: manual merge of the tip tree with the arm-soc tree
  2014-03-20  3:36 linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
@ 2014-04-02  0:47 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2014-04-02  0:47 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Shawn Guo, Linus

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

Hi all,

On Thu, 20 Mar 2014 14:36:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm/mach-imx/pm-imx6q.c between commit 9cdde7217e92 ("ARM: imx6:
> rename pm-imx6q.c to pm-imx6.c") from the arm-soc tree and commit
> 8435cf757632 ("arm: Replace various irq_desc accesses") from the tip tree.
> 
> I fixed it up (by applying the tip tree patch to the renamed file -
> arch/arm/mach-imx/pm-imx6.c - see patch below) and can carry the fix as
> necessary (no action is required).

The below merge fixup is now needed when the arm-soc tree is merged with
Linus' tree (as well as removing arch/arm/mach-imx/pm-imx6q.c).

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 20 Mar 2014 14:33:26 +1100
> Subject: [PATCH] arm: Replace various irq_desc accesses fix for file move
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/arm/mach-imx/pm-imx6.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
> index 16f0d249f6a7..9392a8f4ef24 100644
> --- a/arch/arm/mach-imx/pm-imx6.c
> +++ b/arch/arm/mach-imx/pm-imx6.c
> @@ -241,7 +241,7 @@ static void imx6q_enable_wb(bool enable)
>  
>  int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
>  {
> -	struct irq_desc *iomuxc_irq_desc;
> +	struct irq_data *iomuxc_irq_data = irq_get_irq_data(32);
>  	u32 val = readl_relaxed(ccm_base + CLPCR);
>  
>  	val &= ~BM_CLPCR_LPM;
> @@ -288,10 +288,9 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
>  	 * 3) Software should mask IRQ #32 right after CCM Low-Power mode
>  	 *    is set (set bits 0-1 of CCM_CLPCR).
>  	 */
> -	iomuxc_irq_desc = irq_to_desc(32);
> -	imx_gpc_irq_unmask(&iomuxc_irq_desc->irq_data);
> +	imx_gpc_irq_unmask(iomuxc_irq_data);
>  	writel_relaxed(val, ccm_base + CLPCR);
> -	imx_gpc_irq_mask(&iomuxc_irq_desc->irq_data);
> +	imx_gpc_irq_mask(iomuxc_irq_data);
>  
>  	return 0;
>  }
> -- 
> 1.9.0

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

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2023-01-16  1:21 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2023-01-16  1:21 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann
  Cc: ARM, Ingo Molnar, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/arm/mach-omap2/pm24xx.c

between commit:

  d2200da9e6de ("ARM: omap2: remove unused omap2_pm_init")

from the arm-soc tree and commit:

  259c95afac6f ("arm, OMAP2: Use WFI for omap2_pm_idle()")

from the tip tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2018-10-08  2:32 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-10-08  2:32 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Manivannan Sadhasivam, Andreas Färber, Daniel Lezcano

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  MAINTAINERS

between commits:

  81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries")
  677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver")

from the arm-soc tree and commit:

  9d8d47ea6ec6 ("clocksource/drivers: Unify the names to timer-* format")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index c4d323faa764,2a83f2339651..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1218,10 -1180,7 +1218,10 @@@ N:	ow
  F:	arch/arm/mach-actions/
  F:	arch/arm/boot/dts/owl-*
  F:	arch/arm64/boot/dts/actions/
 +F:	drivers/clk/actions/
- F:	drivers/clocksource/owl-*
+ F:	drivers/clocksource/timer-owl*
 +F:	drivers/dma/owl-dma.c
 +F:	drivers/i2c/busses/i2c-owl.c
  F:	drivers/pinctrl/actions/*
  F:	drivers/soc/actions/
  F:	include/dt-bindings/power/owl-*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: manual merge of the tip tree with the arm-soc tree
  2018-03-19  3:06 Stephen Rothwell
@ 2018-04-02 23:48 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-04-02 23:48 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Linux-Next Mailing List, Linux Kernel Mailing List, Robin Murphy

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

Hi All,

On Mon, 19 Mar 2018 14:06:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/bus/arm-cci.c
> 
> between commit:
> 
>   3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver")
> 
> from the arm-soc tree and commit:
> 
>   edb39592a587 ("perf: Fix sibling iteration")
> 
> from the tip tree.
> 
> I fixed it up (I added the following merge fix patch) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 19 Mar 2018 14:04:52 +1100
> Subject: [PATCH] perf/core: another merge fix for "drivers/bus: Split Arm CCI
>  driver"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/perf/arm-cci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
> index 192d23b760a0..383b2d3dcbc6 100644
> --- a/drivers/perf/arm-cci.c
> +++ b/drivers/perf/arm-cci.c
> @@ -1265,7 +1265,7 @@ static int validate_group(struct perf_event *event)
>  	if (!validate_event(event->pmu, &fake_pmu, leader))
>  		return -EINVAL;
>  
> -	list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
> +	for_each_sibling_event(sibling, leader) {
>  		if (!validate_event(event->pmu, &fake_pmu, sibling))
>  			return -EINVAL;
>  	}
> -- 

This conflict is now between the arm-soc tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2018-03-19  3:06 Stephen Rothwell
  2018-04-02 23:48 ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2018-03-19  3:06 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Robin Murphy

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/bus/arm-cci.c

between commit:

  3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver")

from the arm-soc tree and commit:

  edb39592a587 ("perf: Fix sibling iteration")

from the tip tree.

I fixed it up (I added the following merge fix patch) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Mar 2018 14:04:52 +1100
Subject: [PATCH] perf/core: another merge fix for "drivers/bus: Split Arm CCI
 driver"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/perf/arm-cci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
index 192d23b760a0..383b2d3dcbc6 100644
--- a/drivers/perf/arm-cci.c
+++ b/drivers/perf/arm-cci.c
@@ -1265,7 +1265,7 @@ static int validate_group(struct perf_event *event)
 	if (!validate_event(event->pmu, &fake_pmu, leader))
 		return -EINVAL;
 
-	list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
+	for_each_sibling_event(sibling, leader) {
 		if (!validate_event(event->pmu, &fake_pmu, sibling))
 			return -EINVAL;
 	}
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2018-03-13  3:11 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-03-13  3:11 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Robin Murphy

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/bus/arm-cci.c

between commit:

  3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver")

from the arm-soc tree and commit:

  8343aae66167 ("perf/core: Remove perf_event::group_entry")

from the tip tree.

I fixed it up (I have added the following merge fix patch) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Mar 2018 14:08:01 +1100
Subject: [PATCH] perf/core: merge fix for "drivers/bus: Split Arm CCI driver"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/perf/arm-cci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
index 67a74c48c7c2..192d23b760a0 100644
--- a/drivers/perf/arm-cci.c
+++ b/drivers/perf/arm-cci.c
@@ -1265,7 +1265,7 @@ static int validate_group(struct perf_event *event)
 	if (!validate_event(event->pmu, &fake_pmu, leader))
 		return -EINVAL;
 
-	list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
+	list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
 		if (!validate_event(event->pmu, &fake_pmu, sibling))
 			return -EINVAL;
 	}
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2015-07-28  2:20 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2015-07-28  2:20 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Geert Uytterhoeven, Simon Horman, Sudeep Holla

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/arm/mach-shmobile/intc-sh73a0.c

between commit:

  30f8925a57d8 ("ARM: shmobile: Remove legacy board code for KZM-A9-GT")

from the arm-soc tree and commit:

  0d3f2c92e004 ("irqchip/gic: Remove redundant gic_set_irqchip_flags")

from the tip tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: manual merge of the tip tree with the arm-soc tree
  2014-09-26  6:25 Stephen Rothwell
@ 2014-09-29 18:12 ` Tony Lindgren
  0 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2014-09-29 18:12 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
	linux-kernel, Marc Zyngier, Jason Cooper, Felipe Balbi

* Stephen Rothwell <sfr@canb.auug.org.au> [140925 23:26]:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq:
> move irq.c to drivers/irqchip/") from the arm-soc tree and commit
> f978999f6096 ("Use the new handle_domain_irq method to handle
> interrupts") from the tip tree.
> 
> I fixed it up (I applied the latter patch to the moved file - see
> below) and can carry the fix as necessary (no action is required).
> 
> diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
> index f3814e79192d..28718d3e8281 100644
> --- a/drivers/irqchip/irq-omap-intc.c
> +++ b/drivers/irqchip/irq-omap-intc.c
> @@ -334,8 +334,7 @@ out:
>  		irqnr &= ACTIVEIRQ_MASK;
>  
>  		if (irqnr) {
> -			irqnr = irq_find_mapping(domain, irqnr);
> -			handle_IRQ(irqnr, regs);
> +			handle_domain_irq(domain, irqnr, regs);
>  			handled_irq = 1;
>  		}
>  	} while (irqnr);
> 

Thanks I've verified things are booting fine with linux next.

Regards,

Tony

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-09-26  6:25 Stephen Rothwell
  2014-09-29 18:12 ` Tony Lindgren
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2014-09-26  6:25 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Marc Zyngier, Jason Cooper,
	Felipe Balbi, Tony Lindgren

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-omap2/irq.c between commit 8598066cddd1 ("arm: omap: irq:
move irq.c to drivers/irqchip/") from the arm-soc tree and commit
f978999f6096 ("Use the new handle_domain_irq method to handle
interrupts") from the tip tree.

I fixed it up (I applied the latter patch to the moved file - see
below) and can carry the fix as necessary (no action is required).

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index f3814e79192d..28718d3e8281 100644
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -334,8 +334,7 @@ out:
 		irqnr &= ACTIVEIRQ_MASK;
 
 		if (irqnr) {
-			irqnr = irq_find_mapping(domain, irqnr);
-			handle_IRQ(irqnr, regs);
+			handle_domain_irq(domain, irqnr, regs);
 			handled_irq = 1;
 		}
 	} while (irqnr);

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-28  3:50 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-28  3:50 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Soren Brinkmann, Daniel Lezcano, Michal Simek

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commit cd325295871f
("arm: zynq: Add support for cpufreq") from the tip 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-zynq/common.c
index dca60d5ba756,a39be8e80856..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -73,8 -74,7 +75,9 @@@ static void __init zynq_init_machine(vo
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  
  	platform_device_register(&zynq_cpuidle_device);
+ 	platform_device_register_full(&devinfo);
 +
 +	zynq_slcr_init();
  }
  
  static void __init zynq_timer_init(void)

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-28  3:47 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-28  3:47 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Soren Brinkmann, Daniel Lezcano,
	Rob Herring, Michal Simek, Steffen Trumtrar

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/Kconfig between commits ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") and 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commits 61f1fc7e9258
("arm: zynq: Don't use arm_global_timer with cpufreq") and cd325295871f
("arm: zynq: Add support for cpufreq") from the tip 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-zynq/Kconfig
index cd2d55ab834a,f03e75bd0b2b..000000000000
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@@ -2,11 -2,19 +2,13 @@@ config ARCH_ZYN
  	bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
  	select ARM_AMBA
  	select ARM_GIC
+ 	select ARCH_HAS_CPUFREQ
+ 	select ARCH_HAS_OPP
 -	select COMMON_CLK
 -	select CPU_V7
 -	select GENERIC_CLOCKEVENTS
  	select HAVE_ARM_SCU if SMP
  	select HAVE_ARM_TWD if SMP
  	select ICST
 -	select MIGHT_HAVE_CACHE_L2X0
 -	select USE_OF
 -	select HAVE_SMP
 -	select SPARSE_IRQ
  	select CADENCE_TTC_TIMER
- 	select ARM_GLOBAL_TIMER
+ 	select ARM_GLOBAL_TIMER if !CPU_FREQ
 +	select MFD_SYSCON
  	help
  	  Support for Xilinx Zynq ARM Cortex A9 Platform

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-28  3:39 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-28  3:39 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Carlo Caione, Maxime Ripard

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/boot/dts/sun7i-a20.dtsi between commit 36ab3e73b7ac ("ARM: dt:
sun7i: Add A20 SPI controller nodes") from the arm-soc tree and commit
8ff973a26763 ("ARM: sun7i/sun6i: dts: Add NMI irqchip support") from the
tip 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/boot/dts/sun7i-a20.dtsi
index 024a01ce4f0c,cadcf2f9881d..000000000000
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@@ -401,28 -339,14 +401,36 @@@
  		#size-cells = <1>;
  		ranges;
  
 +		spi0: spi@01c05000 {
 +			compatible = "allwinner,sun4i-a10-spi";
 +			reg = <0x01c05000 0x1000>;
 +			interrupts = <0 10 4>;
 +			clocks = <&ahb_gates 20>, <&spi0_clk>;
 +			clock-names = "ahb", "mod";
 +			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
 +		spi1: spi@01c06000 {
 +			compatible = "allwinner,sun4i-a10-spi";
 +			reg = <0x01c06000 0x1000>;
 +			interrupts = <0 11 4>;
 +			clocks = <&ahb_gates 21>, <&spi1_clk>;
 +			clock-names = "ahb", "mod";
 +			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
+ 		nmi_intc: interrupt-controller@01c00030 {
+ 			compatible = "allwinner,sun7i-a20-sc-nmi";
+ 			interrupt-controller;
+ 			#interrupt-cells = <2>;
+ 			reg = <0x01c00030 0x0c>;
+ 			interrupts = <0 0 4>;
+ 		};
+ 
  		emac: ethernet@01c0b000 {
  			compatible = "allwinner,sun4i-a10-emac";
  			reg = <0x01c0b000 0x1000>;

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: manual merge of the tip tree with the arm-soc tree
  2014-03-17  5:35 Stephen Rothwell
@ 2014-03-17 16:41 ` Sören Brinkmann
  0 siblings, 0 replies; 16+ messages in thread
From: Sören Brinkmann @ 2014-03-17 16:41 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Rob Herring, Arnd Bergmann, Peter Zijlstra, Daniel Lezcano,
	linux-kernel, linux-next, H. Peter Anvin, Olof Johansson,
	Thomas Gleixner, Ingo Molnar, linux-arm-kernel

On Mon, 2014-03-17 at 04:35PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 ("ARM: centralize
> common multi-platform kconfig options") from the arm-soc tree and commit
> cd325295871f ("arm: zynq: Add support for cpufreq") from the tip 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-zynq/Kconfig
> index 105d39b72a25,f03e75bd0b2b..000000000000
> --- a/arch/arm/mach-zynq/Kconfig
> +++ b/arch/arm/mach-zynq/Kconfig
> @@@ -2,10 -2,19 +2,12 @@@ config ARCH_ZYN
>   	bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
>   	select ARM_AMBA
>   	select ARM_GIC
> + 	select ARCH_HAS_CPUFREQ
> + 	select ARCH_HAS_OPP
>  -	select COMMON_CLK
>  -	select CPU_V7
>  -	select GENERIC_CLOCKEVENTS
>   	select HAVE_ARM_SCU if SMP
>   	select HAVE_ARM_TWD if SMP
>   	select ICST
>  -	select MIGHT_HAVE_CACHE_L2X0

The two conflicting patches mentioned above don't touch this line, I
think. I'm not sure whether this should go away.
Apart from this, things look okay to me.

	Thanks,
	Sören



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-17  5:37 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-17  5:37 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Kumar Gala, Magnus Damm,
	Daniel Lezcano, Wolfram Sang

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/clocksource/Kconfig between commit 3f8e8cee2f4b ("clocksource:
qcom: Move clocksource code out of mach-msm") from the arm-soc tree and
commit fd3f1270d237 ("clocksource: Add Kconfig entries for CMT, MTU2, TMU
and STI") from the tip 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/clocksource/Kconfig
index 6510ec4f45ff,4f754a972139..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -141,5 -141,46 +141,49 @@@ config VF_PIT_TIME
  	help
  	  Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
  
 +config CLKSRC_QCOM
 +	bool
++
+ config SYS_SUPPORTS_SH_CMT
+         bool
+ 
+ config SYS_SUPPORTS_SH_MTU2
+         bool
+ 
+ config SYS_SUPPORTS_SH_TMU
+         bool
+ 
+ config SYS_SUPPORTS_EM_STI
+         bool
+ 
+ config SH_TIMER_CMT
+ 	bool "Renesas CMT timer driver" if COMPILE_TEST
+ 	default SYS_SUPPORTS_SH_CMT
+ 	help
+ 	  This enables build of a clocksource and clockevent driver for
+ 	  the Compare Match Timer (CMT) hardware available in 16/32/48-bit
+ 	  variants on a wide range of Mobile and Automotive SoCs from Renesas.
+ 
+ config SH_TIMER_MTU2
+ 	bool "Renesas MTU2 timer driver" if COMPILE_TEST
+ 	default SYS_SUPPORTS_SH_MTU2
+ 	help
+ 	  This enables build of a clockevent driver for the Multi-Function
+ 	  Timer Pulse Unit 2 (TMU2) hardware available on SoCs from Renesas.
+ 	  This hardware comes with 16 bit-timer registers.
+ 
+ config SH_TIMER_TMU
+ 	bool "Renesas TMU timer driver" if COMPILE_TEST
+ 	default SYS_SUPPORTS_SH_TMU
+ 	help
+ 	  This enables build of a clocksource and clockevent driver for
+ 	  the 32-bit Timer Unit (TMU) hardware available on a wide range
+ 	  SoCs from Renesas.
+ 
+ config EM_TIMER_STI
+ 	bool "Renesas STI timer driver" if COMPILE_TEST
+ 	default SYS_SUPPORTS_EM_STI
+ 	help
+ 	  This enables build of a clocksource and clockevent driver for
+ 	  the 48-bit System Timer (STI) hardware available on a SoCs
+ 	  such as EMEV2 from former NEC Electronics.

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: manual merge of the tip tree with the arm-soc tree
@ 2014-03-17  5:35 Stephen Rothwell
  2014-03-17 16:41 ` Sören Brinkmann
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2014-03-17  5:35 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Rob Herring, Soren Brinkmann, Daniel Lezcano

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/Kconfig between commit ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") from the arm-soc tree and commit
cd325295871f ("arm: zynq: Add support for cpufreq") from the tip 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-zynq/Kconfig
index 105d39b72a25,f03e75bd0b2b..000000000000
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@@ -2,10 -2,19 +2,12 @@@ config ARCH_ZYN
  	bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
  	select ARM_AMBA
  	select ARM_GIC
+ 	select ARCH_HAS_CPUFREQ
+ 	select ARCH_HAS_OPP
 -	select COMMON_CLK
 -	select CPU_V7
 -	select GENERIC_CLOCKEVENTS
  	select HAVE_ARM_SCU if SMP
  	select HAVE_ARM_TWD if SMP
  	select ICST
 -	select MIGHT_HAVE_CACHE_L2X0
 -	select USE_OF
 -	select HAVE_SMP
 -	select SPARSE_IRQ
  	select CADENCE_TTC_TIMER
- 	select ARM_GLOBAL_TIMER
+ 	select ARM_GLOBAL_TIMER if !CPU_FREQ
  	help
  	  Support for Xilinx Zynq ARM Cortex A9 Platform

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2023-01-16  1:21 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-20  3:36 linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2014-04-02  0:47 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-01-16  1:21 Stephen Rothwell
2018-10-08  2:32 Stephen Rothwell
2018-03-19  3:06 Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13  3:11 Stephen Rothwell
2015-07-28  2:20 Stephen Rothwell
2014-09-26  6:25 Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-03-28  3:50 Stephen Rothwell
2014-03-28  3:47 Stephen Rothwell
2014-03-28  3:39 Stephen Rothwell
2014-03-17  5:37 Stephen Rothwell
2014-03-17  5:35 Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann

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).