| Message ID | 20170615185418.13980-11-javier@dowhile0.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 15.6.2017 20:54, Javier Martinez Canillas wrote: > The at24 driver allows to register I2C EEPROM chips using different vendor > and devices, but the I2C subsystem does not take the vendor into account > when matching using the I2C table since it only has device entries. > > But when matching using an OF table, both the vendor and device has to be > taken into account so the driver defines only a set of compatible strings > using the "atmel" vendor as a generic fallback for compatible I2C devices. > > So add this generic fallback to the device node compatible string to make > the device to match the driver using the OF device ID table. > > Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org> > > --- > > Changes in v5: None > Changes in v4: > - Only use the atmel manufacturer in the compatible string instead of > keeping the deprecated ones (Rob Herring). > > Changes in v3: None > Changes in v2: None > > arch/arm/boot/dts/zynq-zc702.dts | 2 +- > arch/arm/boot/dts/zynq-zc706.dts | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts > index 0cdad2cc8b78..f8c840f7118f 100644 > --- a/arch/arm/boot/dts/zynq-zc702.dts > +++ b/arch/arm/boot/dts/zynq-zc702.dts > @@ -136,7 +136,7 @@ > #size-cells = <0>; > reg = <2>; > eeprom@54 { > - compatible = "at,24c08"; > + compatible = "atmel,24c08"; > reg = <0x54>; > }; > }; > diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts > index ad4bb06dba25..76492be4a912 100644 > --- a/arch/arm/boot/dts/zynq-zc706.dts > +++ b/arch/arm/boot/dts/zynq-zc706.dts > @@ -92,7 +92,7 @@ > #size-cells = <0>; > reg = <2>; > eeprom@54 { > - compatible = "at,24c08"; > + compatible = "atmel,24c08"; > reg = <0x54>; > }; > }; > Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
Hello Michal, On Wed, Jun 21, 2017 at 1:43 PM, Michal Simek <michal.simek@xilinx.com> wrote: > On 15.6.2017 20:54, Javier Martinez Canillas wrote: >> The at24 driver allows to register I2C EEPROM chips using different vendor >> and devices, but the I2C subsystem does not take the vendor into account >> when matching using the I2C table since it only has device entries. >> >> But when matching using an OF table, both the vendor and device has to be >> taken into account so the driver defines only a set of compatible strings >> using the "atmel" vendor as a generic fallback for compatible I2C devices. >> >> So add this generic fallback to the device node compatible string to make >> the device to match the driver using the OF device ID table. >> >> Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org> >> [snip] >> --- a/arch/arm/boot/dts/zynq-zc706.dts >> +++ b/arch/arm/boot/dts/zynq-zc706.dts >> @@ -92,7 +92,7 @@ >> #size-cells = <0>; >> reg = <2>; >> eeprom@54 { >> - compatible = "at,24c08"; >> + compatible = "atmel,24c08"; >> reg = <0x54>; >> }; >> }; >> > > Acked-by: Michal Simek <michal.simek@xilinx.com> > Same question than for the other patch, could you please also apply this? Sorry for not being clear in the cover letter that the patches could be applied independently. Best regards, Javier
Hi, On 23.8.2017 16:28, Javier Martinez Canillas wrote: > Hello Michal, > > On Wed, Jun 21, 2017 at 1:43 PM, Michal Simek <michal.simek@xilinx.com> wrote: >> On 15.6.2017 20:54, Javier Martinez Canillas wrote: >>> The at24 driver allows to register I2C EEPROM chips using different vendor >>> and devices, but the I2C subsystem does not take the vendor into account >>> when matching using the I2C table since it only has device entries. >>> >>> But when matching using an OF table, both the vendor and device has to be >>> taken into account so the driver defines only a set of compatible strings >>> using the "atmel" vendor as a generic fallback for compatible I2C devices. >>> >>> So add this generic fallback to the device node compatible string to make >>> the device to match the driver using the OF device ID table. >>> >>> Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org> >>> > > [snip] > >>> --- a/arch/arm/boot/dts/zynq-zc706.dts >>> +++ b/arch/arm/boot/dts/zynq-zc706.dts >>> @@ -92,7 +92,7 @@ >>> #size-cells = <0>; >>> reg = <2>; >>> eeprom@54 { >>> - compatible = "at,24c08"; >>> + compatible = "atmel,24c08"; >>> reg = <0x54>; >>> }; >>> }; >>> >> >> Acked-by: Michal Simek <michal.simek@xilinx.com> >> > > Same question than for the other patch, could you please also apply this? > > Sorry for not being clear in the cover letter that the patches could > be applied independently. Ok. Applied to https://github.com/Xilinx/linux-xlnx/commits/zynq/dt Will wait if something else pop up. Arnd: If you want to take this directly, feel free to do it. Thanks, Michal
Hello Michal, On Thu, Aug 24, 2017 at 3:44 PM, Michal Simek <michal.simek@xilinx.com> wrote: [snip] > > Ok. Applied to > https://github.com/Xilinx/linux-xlnx/commits/zynq/dt > > Will wait if something else pop up. > I see the patch applied to that repository but I don't see it in neither mainline nor linux-next. > Arnd: If you want to take this directly, feel free to do it. > > Thanks, > Michal Best regards, Javier
Hi, On 21.9.2017 11:41, Javier Martinez Canillas wrote: > Hello Michal, > > On Thu, Aug 24, 2017 at 3:44 PM, Michal Simek <michal.simek@xilinx.com> wrote: > > [snip] > >> >> Ok. Applied to >> https://github.com/Xilinx/linux-xlnx/commits/zynq/dt >> >> Will wait if something else pop up. >> > > I see the patch applied to that repository but I don't see it in > neither mainline nor linux-next. xilinx tree was merging to linux-next but there were conflicts with arm soc tree that's why it was removed. > >> Arnd: If you want to take this directly, feel free to do it. >> >> Thanks, >> Michal It is in queue for v4.15. FYI: There are still 3 more in doc. Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt:50: compatible = "at,24c08"; Documentation/devicetree/bindings/i2c/nxp,pca9541.txt:25: compatible = "at,24c08"; Documentation/devicetree/bindings/trivial-devices.txt:34:at,24c08 i2c serial eeprom (24cxx) Thanks, Michal
On Mon, Sep 25, 2017 at 10:06 AM, Michal Simek <michal.simek@xilinx.com> wrote: > Hi, > > On 21.9.2017 11:41, Javier Martinez Canillas wrote: >> Hello Michal, >> >> On Thu, Aug 24, 2017 at 3:44 PM, Michal Simek <michal.simek@xilinx.com> wrote: >> >> [snip] >> >>> >>> Ok. Applied to >>> https://github.com/Xilinx/linux-xlnx/commits/zynq/dt >>> >>> Will wait if something else pop up. >>> >> >> I see the patch applied to that repository but I don't see it in >> neither mainline nor linux-next. > > xilinx tree was merging to linux-next but there were conflicts with arm > soc tree that's why it was removed. > >> >>> Arnd: If you want to take this directly, feel free to do it. >>> >>> Thanks, >>> Michal > > It is in queue for v4.15. > Got it, thanks a lot for the info. > FYI: There are still 3 more in doc. > > Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt:50: > compatible = " "; > Documentation/devicetree/bindings/i2c/nxp,pca9541.txt:25: > compatible = "at,24c08"; > Documentation/devicetree/bindings/trivial-devices.txt:34:at,24c08 > i2c serial eeprom (24cxx) > Indeed, thanks for pointing out. I'll take a look to these as well. > > Thanks, > Michal > Best regards, Javier
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 0cdad2cc8b78..f8c840f7118f 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -136,7 +136,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index ad4bb06dba25..76492be4a912 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -92,7 +92,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; };
The at24 driver allows to register I2C EEPROM chips using different vendor and devices, but the I2C subsystem does not take the vendor into account when matching using the I2C table since it only has device entries. But when matching using an OF table, both the vendor and device has to be taken into account so the driver defines only a set of compatible strings using the "atmel" vendor as a generic fallback for compatible I2C devices. So add this generic fallback to the device node compatible string to make the device to match the driver using the OF device ID table. Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org> --- Changes in v5: None Changes in v4: - Only use the atmel manufacturer in the compatible string instead of keeping the deprecated ones (Rob Herring). Changes in v3: None Changes in v2: None arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)