linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the mfd tree with the arm-soc tree
@ 2011-10-11  5:41 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2011-10-11  5:41 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: linux-next, linux-kernel, "Philippe Rétornaz",
	Sascha Hauer, Arnd Bergmann, Uwe Kleine-König

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-imx/mach-mx31moboard.c between commit 40d97b89bd3c
("mx31moboard: Add poweroff support") from the arm-soc tree and commit
1ab50c862862 ("ARM: imx/mx31moboard: Add mc13783 power button support")
from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
index fff7791,f7e302d..0000000
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@@ -28,9 -28,7 +28,10 @@@
  #include <linux/spi/spi.h>
  #include <linux/types.h>
  #include <linux/memblock.h>
 +#include <linux/clk.h>
 +#include <linux/io.h>
 +#include <linux/err.h>
+ #include <linux/input.h>
  
  #include <linux/usb/otg.h>
  #include <linux/usb/ulpi.h>

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

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

* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
  2022-03-09  2:29 Stephen Rothwell
  2022-03-09  9:18 ` Krzysztof Kozlowski
@ 2022-03-23  0:58 ` Stephen Rothwell
  1 sibling, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2022-03-23  0:58 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann
  Cc: Lee Jones, ARM, Krzysztof Kozlowski, Krzysztof Kozlowski,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

On Wed, 9 Mar 2022 13:29:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
> 
> between commit:
> 
>   e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")
> 
> from the arm-soc tree and commit:
> 
>   0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")
> 
> from the mfd tree.
> 
> I fixed it up (I just used the former version) 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.

This is now a conflict 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] 10+ messages in thread

* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
  2022-03-09  2:29 Stephen Rothwell
@ 2022-03-09  9:18 ` Krzysztof Kozlowski
  2022-03-23  0:58 ` Stephen Rothwell
  1 sibling, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-09  9:18 UTC (permalink / raw)
  To: Lee Jones, Olof Johansson, Arnd Bergmann, ARM
  Cc: Krzysztof Kozlowski, Linux Kernel Mailing List,
	Linux Next Mailing List, Stephen Rothwell


On 09/03/2022 03:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
> 
> between commit:
> 
>   e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")
> 
> from the arm-soc tree and commit:
> 
>   0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")
> 
> from the mfd tree.
> 
> I fixed it up (I just used the former version) and can carry the fix as
> necessary. 

Hi Arnd, Lee and Olof,

This conflict will pop-up when sending to Linus. I propose to resolve it
slightly different - just remove the conflicting lines. After merge
window I will properly reference the other schema inside properties (not
description). This can look like:
################
--- a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

+++ b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

@@ -17,13 +17,6 @@ description: |

   child nodes, each representing a serial sub-node device. The mode setting

   selects which particular function will be used.

 

-  Refer to next bindings documentation for information on protocol subnodes that

-  can exist under USI node:

-

-  [1] Documentation/devicetree/bindings/serial/samsung_uart.yaml

-  [2] Documentation/devicetree/bindings/i2c/i2c-exynos5.txt

-  [3] Documentation/devicetree/bindings/spi/samsung,spi.yaml

-

 properties:

   $nodename:

     pattern: "^usi@[0-9a-f]+$"

################

Best regards,
Krzysztof

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

* linux-next: manual merge of the mfd tree with the arm-soc tree
@ 2022-03-09  2:29 Stephen Rothwell
  2022-03-09  9:18 ` Krzysztof Kozlowski
  2022-03-23  0:58 ` Stephen Rothwell
  0 siblings, 2 replies; 10+ messages in thread
From: Stephen Rothwell @ 2022-03-09  2:29 UTC (permalink / raw)
  To: Lee Jones, Olof Johansson, Arnd Bergmann, ARM
  Cc: Krzysztof Kozlowski, Krzysztof Kozlowski,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

  Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

between commit:

  e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")

from the arm-soc tree and commit:

  0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")

from the mfd tree.

I fixed it up (I just used the former version) 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] 10+ messages in thread

* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
  2017-01-24  2:43 Stephen Rothwell
@ 2017-01-24  8:16 ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2017-01-24  8:16 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, Arnd Bergmann, ARM, linux-next, linux-kernel,
	Amelie Delaunay, Alexandre TORGUE, Benjamin Gaignard,
	Fabrice GASNIER

On Tue, 24 Jan 2017, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   arch/arm/boot/dts/stm32f429.dtsi
> 
> between commits:
> 
>   3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
>   dd3feb755a4a ("ARM: dts: stm32: Add RTC support for STM32F429 MCU")
> 
> from the arm-soc tree and commit:
> 
>   9072b6b2ba83 ("ARM: dts: stm32: add Timers driver for stm32f429 MCU")
> 
> from the mfd tree.

An immutable branch as already been posted for this.

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

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

* linux-next: manual merge of the mfd tree with the arm-soc tree
@ 2017-01-24  2:43 Stephen Rothwell
  2017-01-24  8:16 ` Lee Jones
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2017-01-24  2:43 UTC (permalink / raw)
  To: Lee Jones, Olof Johansson, Arnd Bergmann, ARM
  Cc: linux-next, linux-kernel, Amelie Delaunay, Alexandre TORGUE,
	Benjamin Gaignard, Fabrice GASNIER

Hi all,

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

  arch/arm/boot/dts/stm32f429.dtsi

between commits:

  3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
  dd3feb755a4a ("ARM: dts: stm32: Add RTC support for STM32F429 MCU")

from the arm-soc tree and commit:

  9072b6b2ba83 ("ARM: dts: stm32: add Timers driver for stm32f429 MCU")

from the mfd 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/stm32f429.dtsi
index f05a9d95ef23,b6089351c0d3..000000000000
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@@ -125,20 -218,73 +225,87 @@@
  			status = "disabled";
  		};
  
+ 		timers7: timers@40001400 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			compatible = "st,stm32-timers";
+ 			reg = <0x40001400 0x400>;
+ 			clocks = <&rcc 0 133>;
+ 			clock-names = "int";
+ 			status = "disabled";
+ 
+ 			timer@6 {
+ 				compatible = "st,stm32-timer-trigger";
+ 				reg = <6>;
+ 				status = "disabled";
+ 			};
+ 		};
+ 
+ 			timers12: timers@40001800 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			compatible = "st,stm32-timers";
+ 			reg = <0x40001800 0x400>;
+ 			clocks = <&rcc 0 134>;
+ 			clock-names = "int";
+ 			status = "disabled";
+ 
+ 			pwm {
+ 				compatible = "st,stm32-pwm";
+ 				status = "disabled";
+ 			};
+ 
+ 			timer@11 {
+ 				compatible = "st,stm32-timer-trigger";
+ 				reg = <11>;
+ 				status = "disabled";
+ 			};
+ 		};
+ 
+ 		timers13: timers@40001c00 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			compatible = "st,stm32-timers";
+ 			reg = <0x40001C00 0x400>;
+ 			clocks = <&rcc 0 135>;
+ 			clock-names = "int";
+ 			status = "disabled";
+ 
+ 			pwm {
+ 				compatible = "st,stm32-pwm";
+ 				status = "disabled";
+ 			};
+ 		};
+ 
+ 		timers14: timers@40002000 {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			compatible = "st,stm32-timers";
+ 			reg = <0x40002000 0x400>;
+ 			clocks = <&rcc 0 136>;
+ 			clock-names = "int";
+ 			status = "disabled";
+ 
+ 			pwm {
+ 				compatible = "st,stm32-pwm";
+ 				status = "disabled";
+ 			};
+ 		};
+ 
 +		rtc: rtc@40002800 {
 +			compatible = "st,stm32-rtc";
 +			reg = <0x40002800 0x400>;
 +			clocks = <&rcc 1 CLK_RTC>;
 +			clock-names = "ck_rtc";
 +			assigned-clocks = <&rcc 1 CLK_RTC>;
 +			assigned-clock-parents = <&rcc 1 CLK_LSE>;
 +			interrupt-parent = <&exti>;
 +			interrupts = <17 1>;
 +			interrupt-names = "alarm";
 +			st,syscfg = <&pwrcfg>;
 +			status = "disabled";
 +		};
 +
  		usart2: serial@40004400 {
  			compatible = "st,stm32-usart", "st,stm32-uart";
  			reg = <0x40004400 0x400>;
@@@ -433,11 -616,20 +693,26 @@@
  				};
  			};
  
 +			adc3_in8_pin: adc@200 {
 +				pins {
 +					pinmux = <STM32F429_PF10_FUNC_ANALOG>;
 +				};
 +			};
++
+ 			pwm1_pins: pwm@1 {
+ 				pins {
+ 					pinmux = <STM32F429_PA8_FUNC_TIM1_CH1>,
+ 						 <STM32F429_PB13_FUNC_TIM1_CH1N>,
+ 						 <STM32F429_PB12_FUNC_TIM1_BKIN>;
+ 				};
+ 			};
+ 
+ 			pwm3_pins: pwm@3 {
+ 				pins {
+ 					pinmux = <STM32F429_PB4_FUNC_TIM3_CH1>,
+ 						 <STM32F429_PB5_FUNC_TIM3_CH2>;
+ 				};
+ 			};
  		};
  
  		rcc: rcc@40023810 {

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

* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
  2015-10-15  2:19 Stephen Rothwell
  2015-10-15  2:23 ` Krzysztof Kozlowski
@ 2015-10-15  8:04 ` Lee Jones
  1 sibling, 0 replies; 10+ messages in thread
From: Lee Jones @ 2015-10-15  8:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
	linux-kernel, Krzysztof Kozlowski, Kukjin Kim

On Thu, 15 Oct 2015, Stephen Rothwell wrote:

> Hi Lee,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mfd/s2mps11.txt
> 
> between commit:
> 
>   6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
> 
> from the arm-soc tree and commit:
> 
>   db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
> 
> from the mfd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Yeah, I thought this might happen.

Hence: http://www.spinics.net/lists/devicetree/msg97548.html.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

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

* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
  2015-10-15  2:19 Stephen Rothwell
@ 2015-10-15  2:23 ` Krzysztof Kozlowski
  2015-10-15  8:04 ` Lee Jones
  1 sibling, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2015-10-15  2:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lee Jones, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
	linux-next, linux-kernel, Kukjin Kim

2015-10-15 11:19 GMT+09:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Lee,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
>   Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> between commit:
>
>   6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
>
> from the arm-soc tree and commit:
>
>   db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
>
> from the mfd tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks! The fix for conflict is good.

Best regards,
Krzysztof

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

* linux-next: manual merge of the mfd tree with the arm-soc tree
@ 2015-10-15  2:19 Stephen Rothwell
  2015-10-15  2:23 ` Krzysztof Kozlowski
  2015-10-15  8:04 ` Lee Jones
  0 siblings, 2 replies; 10+ messages in thread
From: Stephen Rothwell @ 2015-10-15  2:19 UTC (permalink / raw)
  To: Lee Jones, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Krzysztof Kozlowski, Kukjin Kim

Hi Lee,

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

  Documentation/devicetree/bindings/mfd/s2mps11.txt

between commit:

  6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")

from the arm-soc tree and commit:

  db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")

from the mfd 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/mfd/s2mps11.txt
index 90eaef393325,a0bc753955c2..000000000000
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@@ -15,10 -15,9 +15,13 @@@ Optional properties
  - interrupt-parent: Specifies the phandle of the interrupt controller to which
    the interrupts from s2mps11 are delivered to.
  - interrupts: Interrupt specifiers for interrupt sources.
 +- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
 +  connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
 +  register to turn off the power. Usually the ACOKB is pulled up to VBATT so
 +  when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
+ - samsung,s2mps11-wrstbi-ground: Indicates that WRSTBI pin of PMIC is pulled
+   down. When the system is suspended it will always go down thus triggerring
+   unwanted buck warm reset (setting buck voltages to default values).
  
  Optional nodes:
  - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768

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

* linux-next: manual merge of the mfd tree with the arm-soc tree
@ 2011-11-01  5:19 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2011-11-01  5:19 UTC (permalink / raw)
  To: Samuel Ortiz
  Cc: linux-next, linux-kernel, Kyle Manna, Tony Lindgren, Arnd Bergmann

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

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-omap2/board-omap3beagle.c between commit be7324605873
("ARM: OMAP2+: Remove custom init_irq for remaining boards") from the
arm-soc tree and commit 935bac2b14b0 ("arm: BeagleBoard: add support for
the twl4030-madc") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 70261bc,0d68c8d..0000000
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -444,6 -445,23 +445,11 @@@ static struct platform_device keys_gpi
  	},
  };
  
 -static void __init omap3_beagle_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 -				  mt46h32m32lf6_sdrc_params);
 -}
 -
 -static void __init omap3_beagle_init_irq(void)
 -{
 -	omap3_init_irq();
 -}
 -
+ static struct platform_device madc_hwmon = {
+ 	.name	= "twl4030_madc_hwmon",
+ 	.id	= -1,
+ };
+ 
  static struct platform_device *omap3_beagle_devices[] __initdata = {
  	&leds_gpio,
  	&keys_gpio,

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

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

end of thread, other threads:[~2022-03-23  0:58 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-11  5:41 linux-next: manual merge of the mfd tree with the arm-soc tree Stephen Rothwell
2011-11-01  5:19 Stephen Rothwell
2015-10-15  2:19 Stephen Rothwell
2015-10-15  2:23 ` Krzysztof Kozlowski
2015-10-15  8:04 ` Lee Jones
2017-01-24  2:43 Stephen Rothwell
2017-01-24  8:16 ` Lee Jones
2022-03-09  2:29 Stephen Rothwell
2022-03-09  9:18 ` Krzysztof Kozlowski
2022-03-23  0:58 ` Stephen Rothwell

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