Message ID | 1380916188-24206-6-git-send-email-pekon@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Oct 04, 2013 at 08:49:47PM +0100, 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 > Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt Doesn't this mean these dts were broken between the changes to the driver and the changes to the dts? I think the existing properties need to continue to be supoprted for backwards compatibility. The dts can be fixed up to have the preferred binding style, but they shouldn't _have_ to be modified to continue to function... Thanks, Mark. > > Signed-off-by: Pekon Gupta <pekon@ti.com> > --- > arch/arm/boot/dts/am335x-evm.dts | 3 +-- > arch/arm/boot/dts/omap3430-sdp.dts | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts > index e8ec875..1aee6ac 100644 > --- a/arch/arm/boot/dts/am335x-evm.dts > +++ b/arch/arm/boot/dts/am335x-evm.dts > @@ -269,7 +269,6 @@ > reg = <0 0 0>; /* CS0, offset 0 */ > nand-bus-width = <8>; > ti,nand-ecc-opt = "bch8"; > - gpmc,device-nand = "true"; > gpmc,device-width = <1>; > gpmc,sync-clk-ps = <0>; > gpmc,cs-on-ns = <0>; > @@ -296,7 +295,7 @@ > > #address-cells = <1>; > #size-cells = <1>; > - elm_id = <&elm>; > + ti,elm-id = <&elm>; > > /* MTD partition table */ > partition@0 { > diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts > index e2249bc..501f863 100644 > --- a/arch/arm/boot/dts/omap3430-sdp.dts > +++ b/arch/arm/boot/dts/omap3430-sdp.dts > @@ -105,7 +105,7 @@ > reg = <1 0 0x08000000>; > nand-bus-width = <8>; > > - ti,nand-ecc-opt = "sw"; > + ti,nand-ecc-opt = "ham1"; > gpmc,cs-on-ns = <0>; > gpmc,cs-rd-off-ns = <36>; > gpmc,cs-wr-off-ns = <36>; > -- > 1.8.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> From: Mark Rutland [mailto:mark.rutland@arm.com] > > On Fri, Oct 04, 2013 at 08:49:47PM +0100, 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 > > Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt > Sorry that's an old commit. I probably missed out updating the commit log. So please ignore it here, I should remove that from commit log. > Doesn't this mean these dts were broken between the changes to the > driver and the changes to the dts? > But the DTS updates are kept separate from driver updates because - DTS updates go into "Benoit's tree" or "Tony's tree" - whereas driver updates go into MTD tree. So, it was suggested in earlier patch revisions that I keep the driver and the DTS patches separate, so that there is no merge conflict between the trees when they are finally accepted. > I think the existing properties need to continue to be supoprted for > backwards compatibility. The dts can be fixed up to have the preferred > binding style, but they shouldn't _have_ to be modified to continue to > function... > However, there should be a way to remove legacy code which can no longer be maintained. Here following ecc-schemes are such legacy code, which are neither supported nor encouraged to use since long time. - OMAP_ECC_CODE_HAMMING_HW, - OMAP_ECC_CODE_HAMMING_DEFAULT, - OMAP_ECC_CODE_HAMMING_HW_ROMCODE Also backward compatibility is maintained by keeping a common symbol for all 3 above implementations OMAP_ECC_CODE_HAM1_HW I don't think there is a point to continue keeping these symbols in kernel driver if they are unused, and make driver bulky and unreadable. In actual it shouldn't matter to user what symbols I use inside the driver, what matters is backward compatibility right ? with regards, pekon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index e8ec875..1aee6ac 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -269,7 +269,6 @@ reg = <0 0 0>; /* CS0, offset 0 */ nand-bus-width = <8>; ti,nand-ecc-opt = "bch8"; - gpmc,device-nand = "true"; gpmc,device-width = <1>; gpmc,sync-clk-ps = <0>; gpmc,cs-on-ns = <0>; @@ -296,7 +295,7 @@ #address-cells = <1>; #size-cells = <1>; - elm_id = <&elm>; + ti,elm-id = <&elm>; /* MTD partition table */ partition@0 { diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index e2249bc..501f863 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -105,7 +105,7 @@ reg = <1 0 0x08000000>; nand-bus-width = <8>; - ti,nand-ecc-opt = "sw"; + ti,nand-ecc-opt = "ham1"; gpmc,cs-on-ns = <0>; gpmc,cs-rd-off-ns = <36>; gpmc,cs-wr-off-ns = <36>;
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 | 3 +-- arch/arm/boot/dts/omap3430-sdp.dts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)