Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the irqchip tree with the arm-soc tree
@ 2021-04-23  3:22 Stephen Rothwell
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2021-04-23  3:22 UTC (permalink / raw)
  To: Marc Zyngier, Olof Johansson, Arnd Bergmann, ARM
  Cc: Hector Martin, Linux Kernel Mailing List,
	Linux Next Mailing List, Thomas Bogendoerfer


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

Hi all,

Today's linux-next merge of the irqchip tree got conflicts in:

  drivers/irqchip/Kconfig
  drivers/irqchip/Makefile

between commit:

  76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")

from the arm-soc tree and commit:

  529ea3681811 ("irqchip: Add support for IDT 79rc3243x interrupt controller")

from the irqchip 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 drivers/irqchip/Kconfig
index d3a14f304ec8,18b0d0b33b8b..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -577,12 -577,15 +577,23 @@@ config MST_IR
  	help
  	  Support MStar Interrupt Controller.
  
 +config APPLE_AIC
 +	bool "Apple Interrupt Controller (AIC)"
 +	depends on ARM64
 +	default ARCH_APPLE
 +	help
 +	  Support for the Apple Interrupt Controller found on Apple Silicon SoCs,
 +	  such as the M1.
 +
+ config WPCM450_AIC
+ 	bool "Nuvoton WPCM450 Advanced Interrupt Controller"
+ 	depends on ARCH_WPCM450
+ 	help
+ 	  Support for the interrupt controller in the Nuvoton WPCM450 BMC SoC.
+ 
+ config IRQ_IDT3243X
+ 	bool
+ 	select GENERIC_IRQ_CHIP
+ 	select IRQ_DOMAIN
+ 
  endmenu
diff --cc drivers/irqchip/Makefile
index eb6a515f0f64,18573602a939..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -113,4 -113,5 +113,6 @@@ obj-$(CONFIG_LOONGSON_PCH_MSI)		+= irq-
  obj-$(CONFIG_MST_IRQ)			+= irq-mst-intc.o
  obj-$(CONFIG_SL28CPLD_INTC)		+= irq-sl28cpld.o
  obj-$(CONFIG_MACH_REALTEK_RTL)		+= irq-realtek-rtl.o
 +obj-$(CONFIG_APPLE_AIC)			+= irq-apple-aic.o
+ obj-$(CONFIG_WPCM450_AIC)		+= irq-wpcm450-aic.o
+ obj-$(CONFIG_IRQ_IDT3243X)		+= irq-idt3243x.o

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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* linux-next: manual merge of the irqchip tree with the arm-soc tree
@ 2021-04-09  5:52 Stephen Rothwell
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2021-04-09  5:52 UTC (permalink / raw)
  To: Marc Zyngier, Olof Johansson, Arnd Bergmann, ARM
  Cc: Hector Martin, Jonathan Neuschäfer,
	Linux Kernel Mailing List, Linux Next Mailing List


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

Hi all,

Today's linux-next merge of the irqchip tree got conflicts in:

  drivers/irqchip/Kconfig
  drivers/irqchip/Makefile

between commit:

  76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")

from the arm-soc tree and commits:

  fead4dd49663 ("irqchip: Add driver for WPCM450 interrupt controller")
  94bc94209a66 ("irqchip/wpcm450: Drop COMPILE_TEST")

from the irqchip 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 drivers/irqchip/Kconfig
index d3a14f304ec8,715eb4366e35..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -577,12 -577,10 +577,18 @@@ config MST_IR
  	help
  	  Support MStar Interrupt Controller.
  
 +config APPLE_AIC
 +	bool "Apple Interrupt Controller (AIC)"
 +	depends on ARM64
 +	default ARCH_APPLE
 +	help
 +	  Support for the Apple Interrupt Controller found on Apple Silicon SoCs,
 +	  such as the M1.
 +
+ config WPCM450_AIC
+ 	bool "Nuvoton WPCM450 Advanced Interrupt Controller"
+ 	depends on ARCH_WPCM450
+ 	help
+ 	  Support for the interrupt controller in the Nuvoton WPCM450 BMC SoC.
+ 
  endmenu
diff --cc drivers/irqchip/Makefile
index eb6a515f0f64,bef57937e729..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -113,4 -113,4 +113,5 @@@ obj-$(CONFIG_LOONGSON_PCH_MSI)		+= irq-
  obj-$(CONFIG_MST_IRQ)			+= irq-mst-intc.o
  obj-$(CONFIG_SL28CPLD_INTC)		+= irq-sl28cpld.o
  obj-$(CONFIG_MACH_REALTEK_RTL)		+= irq-realtek-rtl.o
 +obj-$(CONFIG_APPLE_AIC)			+= irq-apple-aic.o
+ obj-$(CONFIG_WPCM450_AIC)		+= irq-wpcm450-aic.o

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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* linux-next: manual merge of the irqchip tree with the arm-soc tree
@ 2018-05-29  5:52 Stephen Rothwell
  2018-05-29  7:41 ` Alexandre Torgue
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2018-05-29  5:52 UTC (permalink / raw)
  To: Marc Zyngier, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Ludovic Barre, Amelie Delaunay, Alexandre Torgue


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

Hi all,

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

  arch/arm/boot/dts/stm32mp157c.dtsi

between commit:

  3c00436fdb20 ("ARM: dts: stm32: add USBPHYC support to stm32mp157c")

from the arm-soc tree and commit:

  5f0e9d2557d7 ("ARM: dts: stm32: Add exti support for stm32mp157c")

from the irqchip 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 arch/arm/boot/dts/stm32mp157c.dtsi
index b66f673b5038,4fa0df853c8a..000000000000
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@@ -777,26 -183,13 +777,33 @@@
  			status = "disabled";
  		};
  
 +		usbphyc: usbphyc@5a006000 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			compatible = "st,stm32mp1-usbphyc";
 +			reg = <0x5a006000 0x1000>;
 +			clocks = <&rcc USBPHY_K>;
 +			resets = <&rcc USBPHY_R>;
 +			status = "disabled";
 +
 +			usbphyc_port0: usb-phy@0 {
 +				#phy-cells = <0>;
 +				reg = <0>;
 +			};
 +
 +			usbphyc_port1: usb-phy@1 {
 +				#phy-cells = <1>;
 +				reg = <1>;
 +			};
 +		};
 +
+ 		exti: interrupt-controller@5000d000 {
+ 			compatible = "st,stm32mp1-exti", "syscon";
+ 			interrupt-controller;
+ 			#interrupt-cells = <2>;
+ 			reg = <0x5000d000 0x400>;
+ 		};
+ 
  		usart1: serial@5c000000 {
  			compatible = "st,stm32h7-uart";
  			reg = <0x5c000000 0x400>;

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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* linux-next: manual merge of the irqchip tree with the arm-soc tree
@ 2014-07-29  5:53 Stephen Rothwell
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2014-07-29  5:53 UTC (permalink / raw)
  To: Jason Cooper, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Marc Carino, Matt Porter,
	Suravee Suthikulpanit


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

Hi Jason,

Today's linux-next merge of the irqchip tree got a conflict in
Documentation/devicetree/bindings/arm/gic.txt between commit
f80b71397d09 ("ARM: brcmstb: gic: add compatible string for Broadcom
Brahma15") from the arm-soc tree and commit 3e44358c12cc ("") from the
irqchip 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 Documentation/devicetree/bindings/arm/gic.txt
index c7d2fa156678,d2eea0b75580..000000000000
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
@@@ -16,8 -17,9 +17,10 @@@ Main node required properties
  	"arm,cortex-a9-gic"
  	"arm,cortex-a7-gic"
  	"arm,arm11mp-gic"
 +	"brcm,brahma-b15-gic"
+ 
  - interrupt-controller : Identifies the node as an interrupt controller
+ 
  - #interrupt-cells : Specifies the number of cells needed to encode an
    interrupt source.  The type shall be a <u32> and the value shall be 3.
  

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

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

end of thread, back to index

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23  3:22 linux-next: manual merge of the irqchip tree with the arm-soc tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-04-09  5:52 Stephen Rothwell
2018-05-29  5:52 Stephen Rothwell
2018-05-29  7:41 ` Alexandre Torgue
2018-05-29  7:47   ` Marc Zyngier
2018-05-29  8:16     ` Alexandre Torgue
2018-05-29  8:39       ` Marc Zyngier
2018-05-29  8:55         ` Alexandre Torgue
2018-05-29 12:20           ` Ludovic BARRE
2018-05-30  5:10             ` Olof Johansson
2014-07-29  5:53 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git