diff mbox

[RESEND,v5,11/16] arm64: zynqmp: Add generic compatible string for I2C EEPROM

Message ID 20170615185418.13980-12-javier@dowhile0.org (mailing list archive)
State New, archived
Headers show

Commit Message

Javier Martinez Canillas June 15, 2017, 6:54 p.m. UTC
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/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michal Simek June 21, 2017, 11:43 a.m. UTC | #1
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/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
> index ef1b9e573af0..53907b7a7fd9 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
> @@ -55,7 +55,7 @@
>  	status = "okay";
>  	clock-frequency = <400000>;
>  	eeprom@54 {
> -		compatible = "at,24c64";
> +		compatible = "atmel,24c64";
>  		reg = <0x54>;
>  	};
>  };
> @@ -64,7 +64,7 @@
>  	status = "okay";
>  	clock-frequency = <400000>;
>  	eeprom@55 {
> -		compatible = "at,24c64";
> +		compatible = "atmel,24c64";
>  		reg = <0x55>;
>  	};
>  };
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal
Javier Martinez Canillas Aug. 21, 2017, 11:27 a.m. UTC | #2
[snip]

>>
>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>> index ef1b9e573af0..53907b7a7fd9 100644
>> --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>> @@ -55,7 +55,7 @@
>>       status = "okay";
>>       clock-frequency = <400000>;
>>       eeprom@54 {
>> -             compatible = "at,24c64";
>> +             compatible = "atmel,24c64";
>>               reg = <0x54>;
>>       };
>>  };
>> @@ -64,7 +64,7 @@
>>       status = "okay";
>>       clock-frequency = <400000>;
>>       eeprom@55 {
>> -             compatible = "at,24c64";
>> +             compatible = "atmel,24c64";
>>               reg = <0x55>;
>>       };
>>  };
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>
>

Any reasons why this patch was never picked? It was acked two months ago.

Best regards,
Javier
Michal Simek Aug. 21, 2017, 12:04 p.m. UTC | #3
On 21.8.2017 13:27, Javier Martinez Canillas wrote:
> [snip]
> 
>>>
>>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>> index ef1b9e573af0..53907b7a7fd9 100644
>>> --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>> @@ -55,7 +55,7 @@
>>>       status = "okay";
>>>       clock-frequency = <400000>;
>>>       eeprom@54 {
>>> -             compatible = "at,24c64";
>>> +             compatible = "atmel,24c64";
>>>               reg = <0x54>;
>>>       };
>>>  };
>>> @@ -64,7 +64,7 @@
>>>       status = "okay";
>>>       clock-frequency = <400000>;
>>>       eeprom@55 {
>>> -             compatible = "at,24c64";
>>> +             compatible = "atmel,24c64";
>>>               reg = <0x55>;
>>>       };
>>>  };
>>>
>>
>> Acked-by: Michal Simek <michal.simek@xilinx.com>
>>
> 
> Any reasons why this patch was never picked? It was acked two months ago.

Normally when you send series then it should be applied as the whole
series not just one piece of that.

Anyway I see that changes are applied and this one is missing that's why
I will add to zynqmp/dt branch and going to send pull request today.

Thanks,
Michal
Javier Martinez Canillas Aug. 21, 2017, 12:58 p.m. UTC | #4
Hello Michal,

On Mon, Aug 21, 2017 at 2:04 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 21.8.2017 13:27, Javier Martinez Canillas wrote:
>> [snip]
>>
>>>>
>>>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>>> index ef1b9e573af0..53907b7a7fd9 100644
>>>> --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
>>>> @@ -55,7 +55,7 @@
>>>>       status = "okay";
>>>>       clock-frequency = <400000>;
>>>>       eeprom@54 {
>>>> -             compatible = "at,24c64";
>>>> +             compatible = "atmel,24c64";
>>>>               reg = <0x54>;
>>>>       };
>>>>  };
>>>> @@ -64,7 +64,7 @@
>>>>       status = "okay";
>>>>       clock-frequency = <400000>;
>>>>       eeprom@55 {
>>>> -             compatible = "at,24c64";
>>>> +             compatible = "atmel,24c64";
>>>>               reg = <0x55>;
>>>>       };
>>>>  };
>>>>
>>>
>>> Acked-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>
>> Any reasons why this patch was never picked? It was acked two months ago.
>
> Normally when you send series then it should be applied as the whole
> series not just one piece of that.
>

Right, I mentioned in the cover letter that the patches could be
applied independently. Sorry for the confusion.

> Anyway I see that changes are applied and this one is missing that's why
> I will add to zynqmp/dt branch and going to send pull request today.
>

Great, thanks a lot for your help.

> Thanks,
> Michal

Best regards,
Javier
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index ef1b9e573af0..53907b7a7fd9 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -55,7 +55,7 @@ 
 	status = "okay";
 	clock-frequency = <400000>;
 	eeprom@54 {
-		compatible = "at,24c64";
+		compatible = "atmel,24c64";
 		reg = <0x54>;
 	};
 };
@@ -64,7 +64,7 @@ 
 	status = "okay";
 	clock-frequency = <400000>;
 	eeprom@55 {
-		compatible = "at,24c64";
+		compatible = "atmel,24c64";
 		reg = <0x55>;
 	};
 };