linux-next: manual merge of the arm-soc tree with the l2-mtd tree

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/atmel_nand.c between commit 4331c79c6895 ("mtd: do not
use plain 0 as NULL") from the l2-mtd tree and commit d6a016616ba8
("atmel/nand: add DT support") from the arm-soc tree.

The latter superceded the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/19/2012 07:47 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> drivers/mtd/nand/atmel_nand.c between commit 4331c79c6895 ("mtd: do
> not use plain 0 as NULL") from the l2-mtd tree and commit
> d6a016616ba8 ("atmel/nand: add DT support") from the arm-soc tree.
> 
> The latter superceded the former, so I used that.

That is definitively the proper fix. Thanks Stephen.

Best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPZvWlAAoJEAf03oE53VmQd0EIAKV1xC3F+fd6lvu3rKNyzUl0
yfcvNtc9cFbwuR9A3cbeoCo6FbfdSpsT2eT8v+DZ5LDvPmJ9ln9jgqyldq+QfblU
2KpyOWSLeLpG6ILky7Hlo4tjm1NA3GNZGLpyQ2Yln5r17zeTHqaCBeL+xHXOdgcM
Uvrrix67AmnL91nF4QNPdOfKYnv2h+J2OWW6ukFBajQOMBIiVeddVL62qKYOvq0K
QrgTa5D4cygvD0NUMTrrJ5GXjR+afAL7K5pk0Aab9C6pzgKGVredD5qSu/Zpbn8n
+aHXNyfqLQ9+7++a+hm6VNMTrMZxFo/MZoQZsigu7JkJ8lDTNhsaWkm3QqWl4c4=
=6Y0V
-----END PGP SIGNATURE-----

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Artem Bityutskiy]

On Tue, 2013-07-02 at 06:18 +0000, Gupta, Pekon wrote:
> You may drop this patch if you wish so, but its not correct to say that this
> was not reviewed. Following are comments from "Arnd Bergmann"
> http://lists.infradead.org/pipermail/linux-mtd/2013-May/047030.html
> And follow-up reasoning..
> http://lists.infradead.org/pipermail/linux-mtd/2013-May/047032.html

Pekon, let me drop these 3 patches so far anyway. Please, re-submit it
with CC to the devicetree-discuss mailing list. Thanks!

-- 
Best Regards,
Artem Bityutskiy

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Artem Bityutskiy]

On Mon, 2013-07-01 at 23:00 -0700, Olof Johansson wrote:
> It was also applied today, after the merge window opened. Don't merge
> it for 3.11. Artem?

OK, dropping it.

-- 
Best Regards,
Artem Bityutskiy

RE: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Gupta, Pekon]

> 
> On Mon, Jul 1, 2013 at 10:44 PM, Gupta, Pekon <pekon@ti.com> wrote:
> >>
> >> Hi all,
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between
> commits
> >> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC
> >> schemes") and 212012138deb ("mtd: nand: omap2: updated support for
> >> BCH4
> >> ECC scheme") from the l2-mtd tree and commit 496c8a0bbb72 ("ARM:
> >> OMAP2+:
> >> Allow NAND transfer mode to be specified in DT") from the arm-soc tree.
> >>
> >> I fixed it up (maybe - see below) and can carry the fix as necessary (no
> >> action is required).
> >>
> >> --
> >> Cheers,
> >> Stephen Rothwell                    sfr@canb.auug.org.au
> >>
> > Yes following merge is correct. Apologies, as there were multiple OMAP2
> NAND and GPMC updates and clean-up going into different trees, so these
> conflict came. Going forward you shouldn't find such issues, as code is more
> stable now. Thanks for help.
> >
> > with regards, pekon
> 
> Sigh. The new bindings seem to never have been reviewed by any device
> tree maintainers, and from the look of it, it might need some
> discussion. It wasn't even cc:d to devicetree-discuss.
> 
> It's completely inappropriate to merge a patch like this at this time
> without any kind of acks from the people reviewing bindings. Can it
> please be dropped ASAP from the MTD tree? Thanks!
> 
> Or, if you want it in different wording: The mtd-tree patch is a
> strong NAK until this has been sorted out.
> 
> It was also applied today, after the merge window opened. Don't merge
> it for 3.11. Artem?
> 
> 
Hi OIof,

You may drop this patch if you wish so, but its not correct to say that this
was not reviewed. Following are comments from "Arnd Bergmann"
http://lists.infradead.org/pipermail/linux-mtd/2013-May/047030.html
And follow-up reasoning..
http://lists.infradead.org/pipermail/linux-mtd/2013-May/047032.html


And based on Arnd's feedbacks patches which contained changes in 
binding string was even dropped from the series, please see 
cover-letter of V3 set below.
http://lists.infradead.org/pipermail/linux-mtd/2013-June/047319.html
- PATCH-4 <DROPPED> update DT attribute for ti,nand-ecc-opt 
	- received feedback to keep DT mapping independent of linuxism
- PATCH-4:<NEW> : ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
	- independent patch for AM335x-evm.dts update based on PATCH-2

So, in case you have objections to same earlier patch where I had
introduced 'linux-based' nomenclature for bindings, that particular
one is already dropped in V3 of this patch series.


with regards, pekon

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Olof Johansson]

On Mon, Jul 1, 2013 at 10:44 PM, Gupta, Pekon <pekon@ti.com> wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits
>> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC
>> schemes") and 212012138deb ("mtd: nand: omap2: updated support for
>> BCH4
>> ECC scheme") from the l2-mtd tree and commit 496c8a0bbb72 ("ARM:
>> OMAP2+:
>> Allow NAND transfer mode to be specified in DT") from the arm-soc tree.
>>
>> I fixed it up (maybe - see below) and can carry the fix as necessary (no
>> action is required).
>>
>> --
>> Cheers,
>> Stephen Rothwell                    sfr@canb.auug.org.au
>>
> Yes following merge is correct. Apologies, as there were multiple OMAP2 NAND and GPMC updates and clean-up going into different trees, so these conflict came. Going forward you shouldn't find such issues, as code is more stable now. Thanks for help.
>
> with regards, pekon

Sigh. The new bindings seem to never have been reviewed by any device
tree maintainers, and from the look of it, it might need some
discussion. It wasn't even cc:d to devicetree-discuss.

It's completely inappropriate to merge a patch like this at this time
without any kind of acks from the people reviewing bindings. Can it
please be dropped ASAP from the MTD tree? Thanks!

Or, if you want it in different wording: The mtd-tree patch is a
strong NAK until this has been sorted out.

It was also applied today, after the merge window opened. Don't merge
it for 3.11. Artem?


-Olof

RE: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Gupta, Pekon]

> 
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits
> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC
> schemes") and 212012138deb ("mtd: nand: omap2: updated support for
> BCH4
> ECC scheme") from the l2-mtd tree and commit 496c8a0bbb72 ("ARM:
> OMAP2+:
> Allow NAND transfer mode to be specified in DT") from the arm-soc tree.
> 
> I fixed it up (maybe - see below) and can carry the fix as necessary (no
> action is required).
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
Yes following merge is correct. Apologies, as there were multiple OMAP2 NAND and GPMC updates and clean-up going into different trees, so these conflict came. Going forward you shouldn't find such issues, as code is more stable now. Thanks for help.

with regards, pekon

> diff --cc Documentation/devicetree/bindings/mtd/gpmc-nand.txt
> index b3f23df,df338cb..0000000
> --- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
> +++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
> @@@ -17,59 -17,27 +17,66 @@@ Required properties
> 
>   Optional properties:
> 
>  - - nand-bus-width: 		Set this numeric value to 16 if the hardware
>  -				is wired that way. If not specified, a bus
>  -				width of 8 is assumed.
>  + - nand-bus-width: 		Determines data-width of the connected
> device
>  +				x16 = "16"
>  +				x8  = "8" (default)
> 
>  - - ti,nand-ecc-opt:		A string setting the ECC layout to use. One of:
> 
>  -		"sw"		Software method (default)
>  -		"hw"		Hardware method
>  -		"hw-romcode"	gpmc hamming mode method & romcode
> layout
>  -		"bch4"		4-bit BCH ecc code
>  -		"bch8"		8-bit BCH ecc code
>  + - ti,nand-ecc-opt:		Determines the ECC scheme used by driver.
>  +				It can be any of the following strings:
>  +
>  +	"hamming_code_sw"		1-bit Hamming ECC
>  +					- ECC calculation in software
>  +					- Error detection in software
>  +					- ECC layout compatible with S/W
> scheme
>  +
>  +	"hamming_code_hw"		1-bit Hamming ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in software
>  +					- ECC layout compatible with S/W
> scheme
>  +
>  +	"hamming_code_hw_romcode"	1-bit Hamming ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in software
>  +					- ECC layout compatible with ROM
> code
>  +
>  +	"bch4_code_hw_detection_sw"	4-bit BCH ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in software
>  +					- ECC layout compatible with S/W
> scheme
>  +					* depends on
> CONFIG_MTD_NAND_ECC_BCH
>  +
>  +	"bch4_code_hw"             	4-bit BCH ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in hardware
>  +					- ECC layout compatible with ROM
> code
>  +					* depends on
> CONFIG_MTD_NAND_OMAP_BCH
>  +					* requires <elm_id> to be specified
>  +
>  +	"bch8_code_hw_detection_sw"	8-bit BCH ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in software
>  +					- ECC layout compatible with S/W
> scheme
>  +					* depends on
> CONFIG_MTD_NAND_ECC_BCH
>  +
>  +	"bch8_code_hw"             	8-bit BCH ECC
>  +					- ECC calculation in hardware
>  +					- Error detection in hardware
>  +					- ECC layout compatible with ROM
> code
>  +					* depends on
> CONFIG_MTD_NAND_OMAP_BCH
>  +					* requires <elm_id> to be specified
> 
> +  - ti,nand-xfer-type:		A string setting the data transfer type. One
> of:
> +
> + 		"prefetch-polled"	Prefetch polled mode (default)
> + 		"polled"		Polled mode, without prefetch
> + 		"prefetch-dma"		Prefetch enabled sDMA
> mode
> + 		"prefetch-irq"		Prefetch enabled irq mode
> +
>  - - elm_id:	Specifies elm device node. This is required to support BCH
>  - 		error correction using ELM module.
>  +
>  + - elm_id:			Specifies elm device node. This is required to
>  +				support some BCH ECC schemes mentioned
> above.
>  +
> 
>   For inline partiton table parsing (optional):
> 

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/Kconfig between commit 212012138deb ("mtd: nand: omap2:
updated support for BCH4 ECC scheme") from the l2-mtd tree and commit
930d800bded7 ("mtd: omap2: allow bulding as a module") from the arm-soc
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/mtd/nand/Kconfig
index a6e247c,50543f1..0000000
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -95,13 -95,35 +95,13 @@@ config MTD_NAND_OMAP
  
  config MTD_NAND_OMAP_BCH
  	depends on MTD_NAND && MTD_NAND_OMAP2 && ARCH_OMAP3
- 	bool "Support hardware based BCH error correction"
 -	tristate "Enable support for hardware BCH error correction"
++	tristate "Support hardware based BCH error correction"
  	default n
  	select BCH
 -	select BCH_CONST_PARAMS
  	help
 -	 Support for hardware BCH error correction.
 -
 -choice
 -	prompt "BCH error correction capability"
 -	depends on MTD_NAND_OMAP_BCH
 -
 -config MTD_NAND_OMAP_BCH8
 -	bool "8 bits / 512 bytes (recommended)"
 -	help
 -	 Support correcting up to 8 bitflips per 512-byte block.
 -	 This will use 13 bytes of spare area per 512 bytes of page data.
 -	 This is the recommended mode, as 4-bit mode does not work
 -	 on some OMAP3 revisions, due to a hardware bug.
 -
 -config MTD_NAND_OMAP_BCH4
 -	bool "4 bits / 512 bytes"
 -	help
 -	 Support correcting up to 4 bitflips per 512-byte block.
 -	 This will use 7 bytes of spare area per 512 bytes of page data.
 -	 Note that this mode does not work on some OMAP3 revisions, due to a
 -	 hardware bug. Please check your OMAP datasheet before selecting this
 -	 mode.
 -
 -endchoice
 +	  Some devices have built-in ELM hardware engine, which can be used to
 +	  locate and correct errors when using BCH ECC scheme. This enables the
 +	  driver support for same.
  
  if MTD_NAND_OMAP_BCH
  config BCH_CONST_M

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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits
6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC
schemes") and 212012138deb ("mtd: nand: omap2: updated support for BCH4
ECC scheme") from the l2-mtd tree and commit 496c8a0bbb72 ("ARM: OMAP2+:
Allow NAND transfer mode to be specified in DT") from the arm-soc tree.

I fixed it up (maybe - 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/mtd/gpmc-nand.txt
index b3f23df,df338cb..0000000
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@@ -17,59 -17,27 +17,66 @@@ Required properties
  
  Optional properties:
  
 - - nand-bus-width: 		Set this numeric value to 16 if the hardware
 -				is wired that way. If not specified, a bus
 -				width of 8 is assumed.
 + - nand-bus-width: 		Determines data-width of the connected device
 +				x16 = "16"
 +				x8  = "8" (default)
  
 - - ti,nand-ecc-opt:		A string setting the ECC layout to use. One of:
  
 -		"sw"		Software method (default)
 -		"hw"		Hardware method
 -		"hw-romcode"	gpmc hamming mode method & romcode layout
 -		"bch4"		4-bit BCH ecc code
 -		"bch8"		8-bit BCH ecc code
 + - ti,nand-ecc-opt:		Determines the ECC scheme used by driver.
 +				It can be any of the following strings:
 +
 +	"hamming_code_sw"		1-bit Hamming ECC
 +					- ECC calculation in software
 +					- Error detection in software
 +					- ECC layout compatible with S/W scheme
 +
 +	"hamming_code_hw"		1-bit Hamming ECC
 +					- ECC calculation in hardware
 +					- Error detection in software
 +					- ECC layout compatible with S/W scheme
 +
 +	"hamming_code_hw_romcode"	1-bit Hamming ECC
 +					- ECC calculation in hardware
 +					- Error detection in software
 +					- ECC layout compatible with ROM code
 +
 +	"bch4_code_hw_detection_sw"	4-bit BCH ECC
 +					- ECC calculation in hardware
 +					- Error detection in software
 +					- ECC layout compatible with S/W scheme
 +					* depends on CONFIG_MTD_NAND_ECC_BCH
 +
 +	"bch4_code_hw"             	4-bit BCH ECC
 +					- ECC calculation in hardware
 +					- Error detection in hardware
 +					- ECC layout compatible with ROM code
 +					* depends on CONFIG_MTD_NAND_OMAP_BCH
 +					* requires <elm_id> to be specified
 +
 +	"bch8_code_hw_detection_sw"	8-bit BCH ECC
 +					- ECC calculation in hardware
 +					- Error detection in software
 +					- ECC layout compatible with S/W scheme
 +					* depends on CONFIG_MTD_NAND_ECC_BCH
 +
 +	"bch8_code_hw"             	8-bit BCH ECC
 +					- ECC calculation in hardware
 +					- Error detection in hardware
 +					- ECC layout compatible with ROM code
 +					* depends on CONFIG_MTD_NAND_OMAP_BCH
 +					* requires <elm_id> to be specified
  
+  - ti,nand-xfer-type:		A string setting the data transfer type. One of:
+ 
+ 		"prefetch-polled"	Prefetch polled mode (default)
+ 		"polled"		Polled mode, without prefetch
+ 		"prefetch-dma"		Prefetch enabled sDMA mode
+ 		"prefetch-irq"		Prefetch enabled irq mode
+ 
 - - elm_id:	Specifies elm device node. This is required to support BCH
 - 		error correction using ELM module.
 +
 + - elm_id:			Specifies elm device node. This is required to
 +				support some BCH ECC schemes mentioned above.
 +
  
  For inline partiton table parsing (optional):
  

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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/spear13xx.dtsi between commit 6d7b42a447f9 ("mtd:
fsmc_nand: pass the ale and cmd resource via resource") from the l2-mtd
tree and commit f631b984ee10 ("ARM: SPEAr: DT: Fix existing DT support")
from the arm-soc 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/spear13xx.dtsi
index 701b0d7,009096d..0000000
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@@ -151,6 -125,9 +165,7 @@@
  				      0 21 0x4
  				      0 22 0x4
  				      0 23 0x4>;
 -			st,ale-off = <0x20000>;
 -			st,cle-off = <0x10000>;
+ 			st,mode = <2>;
  			status = "disabled";
  		};
  

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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/mxc_nand.c between commit 06f255106923 ("mtd: remove use
of __devinit") from the l2-mtd tree and commit 4d62435f0601 ("mtd:
mxc_nand: remove cpu_is_xxx by using platform_device_id") from the
arm-soc 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/mtd/nand/mxc_nand.c
index 4aef6a3,022dcdc..0000000
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@@ -1337,33 -1378,7 +1378,7 @@@ static int __init mxcnd_probe_dt(struc
  }
  #endif
  
- static int __init mxcnd_probe_pdata(struct mxc_nand_host *host)
- {
- 	struct mxc_nand_platform_data *pdata = host->dev->platform_data;
- 
- 	if (!pdata)
- 		return -ENODEV;
- 
- 	host->pdata = *pdata;
- 
- 	if (nfc_is_v1()) {
- 		if (cpu_is_mx21())
- 			host->devtype_data = &imx21_nand_devtype_data;
- 		else
- 			host->devtype_data = &imx27_nand_devtype_data;
- 	} else if (nfc_is_v21()) {
- 		host->devtype_data = &imx25_nand_devtype_data;
- 	} else if (nfc_is_v3_2a()) {
- 		host->devtype_data = &imx51_nand_devtype_data;
- 	} else if (nfc_is_v3_2b()) {
- 		host->devtype_data = &imx53_nand_devtype_data;
- 	} else
- 		BUG();
- 
- 	return 0;
- }
- 
 -static int __devinit mxcnd_probe(struct platform_device *pdev)
 +static int mxcnd_probe(struct platform_device *pdev)
  {
  	struct nand_chip *this;
  	struct mtd_info *mtd;
@@@ -1555,8 -1578,9 +1578,9 @@@ static struct platform_driver mxcnd_dri
  		   .owner = THIS_MODULE,
  		   .of_match_table = of_match_ptr(mxcnd_dt_ids),
  	},
+ 	.id_table = mxcnd_devtype,
  	.probe = mxcnd_probe,
 -	.remove = __devexit_p(mxcnd_remove),
 +	.remove = mxcnd_remove,
  };
  module_platform_driver(mxcnd_driver);
  

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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
drivers/mtd/nand/bcm_umi_nand.c and drivers/mtd/nand/nand_bcm_umi.h
between commit 07f4c69caf01 ("mtd: remove bcmring NAND driver") from the
l2-mtd tree and commit 878040ef831a ("ARM: bcmring: use proper MMIO
accessors") from the arm-soc tree.

I just removed the files and can carry the fix as necessary (no action
is required).

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

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

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Jason Cooper]

On Mon, Sep 24, 2012 at 07:39:34PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd:
> orion_nand: remove <mach/hardware.h> include") from the l2-mtd tree and
> commit c02cecb92ed4 ("ARM: orion: move platform_data definitions") from
> the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The change below is correct, thanks.

thx,

Jason.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/mtd/nand/orion_nand.c
> index 9ee436d,131b58a..0000000
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@@ -21,7 -21,8 +21,7 @@@
>   #include <linux/err.h>
>   #include <asm/io.h>
>   #include <asm/sizes.h>
> - #include <plat/orion_nand.h>
>  -#include <mach/hardware.h>
> + #include <linux/platform_data/mtd-orion_nand.h>
>   
>   static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
>   {



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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd:
orion_nand: remove <mach/hardware.h> include") from the l2-mtd tree and
commit c02cecb92ed4 ("ARM: orion: move platform_data definitions") from
the arm-soc 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/mtd/nand/orion_nand.c
index 9ee436d,131b58a..0000000
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -21,7 -21,8 +21,7 @@@
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/sizes.h>
- #include <plat/orion_nand.h>
 -#include <mach/hardware.h>
+ #include <linux/platform_data/mtd-orion_nand.h>
  
  static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
  {

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

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c between commit 2890c63138a4 ("mtd:
gpmi: add device tree support to gpmi-nand") from the l2-mtd tree and
commit 39febc018bd2 ("mtd: nand: gpmi: adopt pinctrl support") from the
arm-soc 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 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 95f2af8,8478fd9..0000000
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@@ -24,8 -24,7 +24,9 @@@
  #include <linux/module.h>
  #include <linux/mtd/gpmi-nand.h>
  #include <linux/mtd/partitions.h>
 +#include <linux/of.h>
 +#include <linux/of_device.h>
+ #include <linux/pinctrl/consumer.h>
  #include "gpmi-nand.h"
  
  /* add our owner bbt descriptor */

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