| Message ID | 1377247417-27386-6-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 23 August 2013 02:13 PM, Daniel Mack wrote: > This third memory region just denotes one single register in the CONTROL > module block. The driver uses that in order to set the correct physical > ethernet interface modes. > > Also update the compatible string to make use of the am335x specific > features of the cpsw driver. > > Signed-off-by: Daniel Mack <zonque@gmail.com> > --- > arch/arm/boot/dts/am33xx.dtsi | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index a785b95..1a1e9dd 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -446,7 +446,7 @@ > }; > > mac: ethernet@4a100000 { > - compatible = "ti,cpsw"; > + compatible = "ti,am3352-cpsw"; Please keep this as compatible = "ti,am3352-cpsw", "ti,cpsw"; so users can upgrade the DTB or kernel independently. Apart from this the series looks good to me. Thanks, Sekhar
On 23.08.2013 11:28, Sekhar Nori wrote: > On Friday 23 August 2013 02:13 PM, Daniel Mack wrote: >> This third memory region just denotes one single register in the CONTROL >> module block. The driver uses that in order to set the correct physical >> ethernet interface modes. >> >> Also update the compatible string to make use of the am335x specific >> features of the cpsw driver. >> >> Signed-off-by: Daniel Mack <zonque@gmail.com> >> --- >> arch/arm/boot/dts/am33xx.dtsi | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi >> index a785b95..1a1e9dd 100644 >> --- a/arch/arm/boot/dts/am33xx.dtsi >> +++ b/arch/arm/boot/dts/am33xx.dtsi >> @@ -446,7 +446,7 @@ >> }; >> >> mac: ethernet@4a100000 { >> - compatible = "ti,cpsw"; >> + compatible = "ti,am3352-cpsw"; > > Please keep this as > > compatible = "ti,am3352-cpsw", "ti,cpsw"; > > so users can upgrade the DTB or kernel independently. Apart from this > the series looks good to me. Ok, thanks. Given that this last patch will be merged through another tree, can I just resend it separately, while David takes the rest as it is? Thanks, Daniel
On Friday 23 August 2013 03:04 PM, Daniel Mack wrote: > On 23.08.2013 11:28, Sekhar Nori wrote: >> On Friday 23 August 2013 02:13 PM, Daniel Mack wrote: >>> This third memory region just denotes one single register in the CONTROL >>> module block. The driver uses that in order to set the correct physical >>> ethernet interface modes. >>> >>> Also update the compatible string to make use of the am335x specific >>> features of the cpsw driver. >>> >>> Signed-off-by: Daniel Mack <zonque@gmail.com> >>> --- >>> arch/arm/boot/dts/am33xx.dtsi | 5 +++-- >>> 1 file changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi >>> index a785b95..1a1e9dd 100644 >>> --- a/arch/arm/boot/dts/am33xx.dtsi >>> +++ b/arch/arm/boot/dts/am33xx.dtsi >>> @@ -446,7 +446,7 @@ >>> }; >>> >>> mac: ethernet@4a100000 { >>> - compatible = "ti,cpsw"; >>> + compatible = "ti,am3352-cpsw"; >> >> Please keep this as >> >> compatible = "ti,am3352-cpsw", "ti,cpsw"; >> >> so users can upgrade the DTB or kernel independently. Apart from this >> the series looks good to me. > > Ok, thanks. Given that this last patch will be merged through another > tree, can I just resend it separately, while David takes the rest as it is? Ideally you could, but there are some bugs in the way compatible string in handled and due to this I suspect you need to reorder cpsw_of_mtable[] to match correctly. Not sure if the bug has been fixed in recent -rcs. Please check if modifying just this patch works and then go ahead and post. Please Cc Benoit Cousson <bcousson@baylibre.com> on your next submission as he is the one who picks up DT patches for OMAP. Thanks, Sekhar
On 23.08.2013 11:40, Sekhar Nori wrote: > On Friday 23 August 2013 03:04 PM, Daniel Mack wrote: >> On 23.08.2013 11:28, Sekhar Nori wrote: >> Ok, thanks. Given that this last patch will be merged through another >> tree, can I just resend it separately, while David takes the rest as it is? > > Ideally you could, but there are some bugs in the way compatible string > in handled and due to this I suspect you need to reorder > cpsw_of_mtable[] to match correctly. Not sure if the bug has been fixed > in recent -rcs. Please check if modifying just this patch works and then > go ahead and post. No, you're right. I had to swap the two entries. Thanks for mentioning it. > Please Cc Benoit Cousson <bcousson@baylibre.com> on your next submission > as he is the one who picks up DT patches for OMAP. Will do. Daniel
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index a785b95..1a1e9dd 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -446,7 +446,7 @@ }; mac: ethernet@4a100000 { - compatible = "ti,cpsw"; + compatible = "ti,am3352-cpsw"; ti,hwmods = "cpgmac0"; cpdma_channels = <8>; ale_entries = <1024>; @@ -459,7 +459,8 @@ cpts_clock_mult = <0x80000000>; cpts_clock_shift = <29>; reg = <0x4a100000 0x800 - 0x4a101200 0x100>; + 0x4a101200 0x100 + 0x44e10650 0x4>; #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&intc>;
This third memory region just denotes one single register in the CONTROL module block. The driver uses that in order to set the correct physical ethernet interface modes. Also update the compatible string to make use of the am335x specific features of the cpsw driver. Signed-off-by: Daniel Mack <zonque@gmail.com> --- arch/arm/boot/dts/am33xx.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)