| Message ID | 1378986619-26765-5-git-send-email-pekon@ti.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Sep 12, 2013 at 05:20:19PM +0530, Pekon Gupta wrote: > DT property values for OMAP based gpmc-nand have been updated > to match changes in commit: > 6faf096 ARM: OMAP2+: cleaned-up DT support of various ECC schemes Whose commit ID is this? Your patch is not merged yet, so don't use a commit ID. > Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt > > Signed-off-by: Pekon Gupta <pekon@ti.com> > --- > arch/arm/boot/dts/am335x-evm.dts | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts > index e8ec875..e28a2ac 100644 > --- a/arch/arm/boot/dts/am335x-evm.dts > +++ b/arch/arm/boot/dts/am335x-evm.dts > @@ -268,7 +268,7 @@ > nand@0,0 { > reg = <0 0 0>; /* CS0, offset 0 */ > nand-bus-width = <8>; > - ti,nand-ecc-opt = "bch8"; > + ti,nand-ecc-scheme = "bch8"; > gpmc,device-nand = "true"; > gpmc,device-width = <1>; > gpmc,sync-clk-ps = <0>; This change should probably go in patch 1 anyway, when you break the ABI. Brian
> From: Brian Norris [mailto:computersforpeace@gmail.com] > > On Thu, Sep 12, 2013 at 05:20:19PM +0530, Pekon Gupta wrote: > > DT property values for OMAP based gpmc-nand have been updated > > to match changes in commit: > > 6faf096 ARM: OMAP2+: cleaned-up DT support of various ECC > schemes > > Whose commit ID is this? Your patch is not merged yet, so don't use a > commit ID. > > > Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt > > > > Signed-off-by: Pekon Gupta <pekon@ti.com> > > --- > > arch/arm/boot/dts/am335x-evm.dts | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm/boot/dts/am335x-evm.dts > b/arch/arm/boot/dts/am335x-evm.dts > > index e8ec875..e28a2ac 100644 > > --- a/arch/arm/boot/dts/am335x-evm.dts > > +++ b/arch/arm/boot/dts/am335x-evm.dts > > @@ -268,7 +268,7 @@ > > nand@0,0 { > > reg = <0 0 0>; /* CS0, offset 0 */ > > nand-bus-width = <8>; > > - ti,nand-ecc-opt = "bch8"; > > + ti,nand-ecc-scheme = "bch8"; > > gpmc,device-nand = "true"; > > gpmc,device-width = <1>; > > gpmc,sync-clk-ps = <0>; > > This change should probably go in patch 1 anyway, when you break the > ABI. > As this patch series touches three different trees.. (1) arch/arm/boot/dts/.. maintained by Benoit Cousson (benoit.cousson@linaro.org) (2) arch/arm/mach-omap2/.. maintained by Tony Lindgren (tony@atomide.com) (3) driver/mtd/nand/.. maintained by Brian Norris <computersforpeace@gmail.com> It was observed that there were conflicts usually during final merge, Hence I separated out the patches. However, if all are in sync and the series gets committed in above trees simultaneously, then this conflicts can be avoided. So, if Tony & Benoit are ok then I'll merge this [PATCH 4/4] in [PATCH 1/4]. with regards, pekon
On Thu, Sep 26, 2013 at 1:28 PM, Gupta, Pekon <pekon@ti.com> wrote: >> From: Brian Norris [mailto:computersforpeace@gmail.com] >> >> On Thu, Sep 12, 2013 at 05:20:19PM +0530, Pekon Gupta wrote: >> > DT property values for OMAP based gpmc-nand have been updated >> > to match changes in commit: >> > 6faf096 ARM: OMAP2+: cleaned-up DT support of various ECC >> schemes >> >> Whose commit ID is this? Your patch is not merged yet, so don't use a >> commit ID. >> >> > Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt >> > >> > Signed-off-by: Pekon Gupta <pekon@ti.com> >> > --- >> > arch/arm/boot/dts/am335x-evm.dts | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/arch/arm/boot/dts/am335x-evm.dts >> b/arch/arm/boot/dts/am335x-evm.dts >> > index e8ec875..e28a2ac 100644 >> > --- a/arch/arm/boot/dts/am335x-evm.dts >> > +++ b/arch/arm/boot/dts/am335x-evm.dts >> > @@ -268,7 +268,7 @@ >> > nand@0,0 { >> > reg = <0 0 0>; /* CS0, offset 0 */ >> > nand-bus-width = <8>; >> > - ti,nand-ecc-opt = "bch8"; >> > + ti,nand-ecc-scheme = "bch8"; >> > gpmc,device-nand = "true"; >> > gpmc,device-width = <1>; >> > gpmc,sync-clk-ps = <0>; >> >> This change should probably go in patch 1 anyway, when you break the >> ABI. >> > As this patch series touches three different trees.. > (1) arch/arm/boot/dts/.. maintained by Benoit Cousson (benoit.cousson@linaro.org) Hi Pekon, Please note that Benoit's current email address is bcousson@baylibre.com. I had cc'ed him now with the correct address. > (2) arch/arm/mach-omap2/.. maintained by Tony Lindgren (tony@atomide.com) > (3) driver/mtd/nand/.. maintained by Brian Norris <computersforpeace@gmail.com> > > It was observed that there were conflicts usually during final merge, > Hence I separated out the patches. > However, if all are in sync and the series gets committed in above trees > simultaneously, then this conflicts can be avoided. > So, if Tony & Benoit are ok then I'll merge this [PATCH 4/4] in [PATCH 1/4]. > > with regards, pekon > -- Best regards, Javier
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index e8ec875..e28a2ac 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -268,7 +268,7 @@ nand@0,0 { reg = <0 0 0>; /* CS0, offset 0 */ nand-bus-width = <8>; - ti,nand-ecc-opt = "bch8"; + ti,nand-ecc-scheme = "bch8"; gpmc,device-nand = "true"; gpmc,device-width = <1>; gpmc,sync-clk-ps = <0>;
DT property values for OMAP based gpmc-nand have been updated to match changes in commit: 6faf096 ARM: OMAP2+: cleaned-up DT support of various ECC schemes Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt Signed-off-by: Pekon Gupta <pekon@ti.com> --- arch/arm/boot/dts/am335x-evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)