linux-next: manual merge of the nand tree with the mtd tree

linux-next: manual merge of the nand tree with the mtd tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

between commit:

  74f4d7974d2f ("dt-bindings: mtd: Standardize the style in the examples")

from the mtd tree and commit:

  075e181fba72 ("dt-bindings: mtd: brcm,brcmnand: update interrupts description")

from the nand 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/mtd/brcm,brcmnand.yaml
index f9518d39fbbd,cd606a21b53b..1571024aa119
--- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
+++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
@@@ -184,26 -191,27 +191,27 @@@ required
  examples:
    - |
      nand-controller@f0442800 {
 -            compatible = "brcm,brcmnand-v7.0", "brcm,brcmnand";
 -            reg = <0xf0442800 0x600>,
 -                  <0xf0443000 0x100>;
 -            reg-names = "nand", "flash-dma";
 -            interrupt-parent = <&hif_intr2_intc>;
 -            interrupts = <24>, <4>;
 -            interrupt-names = "nand_ctlrdy", "flash_dma_done";
 +        compatible = "brcm,brcmnand-v7.0", "brcm,brcmnand";
 +        reg = <0xf0442800 0x600>,
 +              <0xf0443000 0x100>;
 +        reg-names = "nand", "flash-dma";
 +        interrupt-parent = <&hif_intr2_intc>;
 +        interrupts = <24>, <4>;
++        interrupt-names = "nand_ctlrdy", "flash_dma_done";
 +
 +        #address-cells = <1>;
 +        #size-cells = <0>;
 +
 +        nand@1 {
 +            compatible = "brcm,nandcs";
 +            reg = <1>; // Chip select 1
 +            nand-on-flash-bbt;
 +            nand-ecc-strength = <12>;
 +            nand-ecc-step-size = <512>;
  
              #address-cells = <1>;
 -            #size-cells = <0>;
 -
 -            nand@1 {
 -                    compatible = "brcm,nandcs";
 -                    reg = <1>; // Chip select 1
 -                    nand-on-flash-bbt;
 -                    nand-ecc-strength = <12>;
 -                    nand-ecc-step-size = <512>;
 -
 -                    #address-cells = <1>;
 -                    #size-cells = <1>;
 -            };
 +            #size-cells = <1>;
 +        };
      };
    - |
      nand-controller@10000200 {

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

Re: linux-next: manual merge of the nand tree with the mtd tree

[Miquel Raynal]

Hi Stephen,

sfr@canb.auug.org.au wrote on Mon, 21 Aug 2023 11:55:07 +1000:

> Hi all,
> 
> Today's linux-next merge of the nand tree got a conflict in:
> 
>   drivers/mtd/nand/raw/qcom_nandc.c
> 
> between commit:
> 
>   c2fc6b694790 ("mtd: Explicitly include correct DT includes")
> 
> from the mtd tree and commit:
> 
>   93ca966b4a20 ("mtd: rawnand: qcom: Sort includes alphabetically")
> 
> from the nand 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.

Thanks for the warning, I'll handle it when merging nand/next into
mtd/next before sending to Linus.

Thanks,
Miquèl

linux-next: manual merge of the nand tree with the mtd tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/mtd/nand/raw/qcom_nandc.c

between commit:

  c2fc6b694790 ("mtd: Explicitly include correct DT includes")

from the mtd tree and commit:

  93ca966b4a20 ("mtd: rawnand: qcom: Sort includes alphabetically")

from the nand 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/mtd/nand/raw/qcom_nandc.c
index df245353b12b,997710779fe1..000000000000
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@@ -2,19 -2,19 +2,19 @@@
  /*
   * Copyright (c) 2016, The Linux Foundation. All rights reserved.
   */
+ #include <linux/bitops.h>
  #include <linux/clk.h>
+ #include <linux/delay.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/dma/qcom_adm.h>
+ #include <linux/dma/qcom_bam_dma.h>
+ #include <linux/module.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/rawnand.h>
+ #include <linux/of.h>
 -#include <linux/of_device.h>
 +#include <linux/platform_device.h>
  #include <linux/slab.h>
- #include <linux/bitops.h>
- #include <linux/dma/qcom_adm.h>
- #include <linux/dma-mapping.h>
- #include <linux/dmaengine.h>
- #include <linux/module.h>
- #include <linux/mtd/rawnand.h>
- #include <linux/mtd/partitions.h>
- #include <linux/of.h>
- #include <linux/delay.h>
- #include <linux/dma/qcom_bam_dma.h>
  
  /* NANDc reg offsets */
  #define	NAND_FLASH_CMD			0x00

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

Re: linux-next: manual merge of the nand tree with the mtd tree

[Miquel Raynal]

Hello,

broonie@kernel.org wrote on Mon, 21 Feb 2022 13:55:52 +0000:

> Hi all,
> 
> Today's linux-next merge of the nand tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mtd/nand-controller.yaml
> 
> between commit:
> 
>   751f204a6fe6f ("dt-bindings: mtd: nand-chip: Create a NAND chip description")
> 
> from the mtd tree and commit:
> 
>   cb57fae479be4 ("dt-binding: mtd: nand: Document the wp-gpios property")
> 
> from the nand 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.

Thanks for fixing it up in -next. We will anyway merge the NAND tree
into the MTD tree before sending a unique PR so Linus won't have to
handle it.

> 
> diff --cc Documentation/devicetree/bindings/mtd/nand-controller.yaml
> index 33855eb48a795,53b21aed0ac5f..0000000000000
> --- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml
> +++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml
> @@@ -116,6 -154,20 +116,13 @@@ patternProperties
>             Ready/Busy pins. Active state refers to the NAND ready state and
>             should be set to GPIOD_ACTIVE_HIGH unless the signal is inverted.
>   
> +       wp-gpios:
> +         description:
> +           Contains one GPIO descriptor for the Write Protect pin.
> +           Active state refers to the NAND Write Protect state and should be
> +           set to GPIOD_ACTIVE_LOW unless the signal is inverted.
> +         maxItems: 1
> + 
>  -      secure-regions:
>  -        $ref: /schemas/types.yaml#/definitions/uint64-matrix
>  -        description:
>  -          Regions in the NAND chip which are protected using a secure element
>  -          like Trustzone. This property contains the start address and size of
>  -          the secure regions present.
>  -
>       required:
>         - reg
>   


Thanks,
Miquèl

linux-next: manual merge of the nand tree with the mtd tree

[broonie]

Hi all,

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

  Documentation/devicetree/bindings/mtd/nand-controller.yaml

between commit:

  751f204a6fe6f ("dt-bindings: mtd: nand-chip: Create a NAND chip description")

from the mtd tree and commit:

  cb57fae479be4 ("dt-binding: mtd: nand: Document the wp-gpios property")

from the nand 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.

diff --cc Documentation/devicetree/bindings/mtd/nand-controller.yaml
index 33855eb48a795,53b21aed0ac5f..0000000000000
--- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml
+++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml
@@@ -116,6 -154,20 +116,13 @@@ patternProperties
            Ready/Busy pins. Active state refers to the NAND ready state and
            should be set to GPIOD_ACTIVE_HIGH unless the signal is inverted.
  
+       wp-gpios:
+         description:
+           Contains one GPIO descriptor for the Write Protect pin.
+           Active state refers to the NAND Write Protect state and should be
+           set to GPIOD_ACTIVE_LOW unless the signal is inverted.
+         maxItems: 1
+ 
 -      secure-regions:
 -        $ref: /schemas/types.yaml#/definitions/uint64-matrix
 -        description:
 -          Regions in the NAND chip which are protected using a secure element
 -          like Trustzone. This property contains the start address and size of
 -          the secure regions present.
 -
      required:
        - reg