linux-next: manual merge of the pinctrl tree with the devicetree tree

linux-next: manual merge of the pinctrl tree with the devicetree tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt

between commit:

  998282c6dad8 ("dt-bindings: qcom,pdc: Add SM6350 compatible")

from the devicetree tree and commit:

  6d289c378af4 ("dt-bindings: qcom,pdc: Add compatible for SM8150")

from the pinctrl tree.

I fixed it up (see below - I "corrected" the SM8150 in line with the former
commit) 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 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
index 3b7b1134dea9,bd3539644d3f..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
@@@ -21,9 -21,9 +21,10 @@@ Properties
  		    - "qcom,sc7180-pdc": For SC7180
  		    - "qcom,sc7280-pdc": For SC7280
  		    - "qcom,sdm845-pdc": For SDM845
 -		    - "qcom,sdm8150-pdc": For SM8150
 -		    - "qcom,sdm8250-pdc": For SM8250
 -		    - "qcom,sdm8350-pdc": For SM8350
 +		    - "qcom,sm6350-pdc": For SM6350
++		    - "qcom,sm8150-pdc": For SM8150
 +		    - "qcom,sm8250-pdc": For SM8250
 +		    - "qcom,sm8350-pdc": For SM8350
  
  - reg:
  	Usage: required

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

Re: linux-next: manual merge of the pinctrl tree with the devicetree tree

[Ludovic BARRE]

On 07/31/2018 07:42 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pinctrl tree got a conflict in:
> 
>    Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
> 
> between commit:
> 
>    791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings")
> 
> from the devicetree tree and commit:
> 
>    de1d08b22974 ("dt-bindings: pinctrl: add syscfg mask parameter")
> 
> from the pinctrl 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.
>

hi Stephen

thanks for the fix conflict, and the fix is OK for me.

BR
Ludo

linux-next: manual merge of the pinctrl tree with the devicetree tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt

between commit:

  791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings")

from the devicetree tree and commit:

  de1d08b22974 ("dt-bindings: pinctrl: add syscfg mask parameter")

from the pinctrl 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 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
index a8bb36b4f9fd,046a3de026d4..000000000000
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
@@@ -37,9 -37,12 +37,10 @@@ Required properties
  
  Optional properties:
   - reset:	  : Reference to the reset controller
-  - st,syscfg: Should be phandle/offset pair. The phandle to the syscon node
-    which includes IRQ mux selection register, and the offset of the IRQ mux
-    selection register.
 - - interrupt-parent: phandle of the interrupt parent to which the external
 -   GPIO interrupts are forwarded to.
+  - st,syscfg: Should be phandle/offset/mask.
+ 	-The phandle to the syscon node which includes IRQ mux selection register.
+ 	-The offset of the IRQ mux selection register
+ 	-The field mask of IRQ mux, needed if different of 0xf.
   - gpio-ranges: Define a dedicated mapping between a pin-controller and
     a gpio controller. Format is <&phandle a b c> with:
  	-(phandle): phandle of pin-controller.

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