On Mon, May 22, 2017 at 9:02 AM, Javier Martinez Canillas
<javier@xxxxxxxxxxxx> 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@xxxxxxxxxxxx>
>
> ---
>
> 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/powerpc/boot/dts/mpc8308_p1m.dts | 2 +-
> arch/powerpc/boot/dts/mpc8349emitx.dts | 4 ++--
> arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +-
> arch/powerpc/boot/dts/mpc8377_wlan.dts | 2 +-
> arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +-
> arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +-
> 6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts
> index 57f86cdf9f36..702ab4fc5b4a 100644
> --- a/arch/powerpc/boot/dts/mpc8308_p1m.dts
> +++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts
> @@ -123,7 +123,7 @@
> interrupt-parent = <&ipic>;
> dfsrr;
> fram@50 {
> - compatible = "ramtron,24c64";
> + compatible = "atmel,24c64";
This should be '"ramtron,24c64", "atmel,24c64"'
> reg = <0x50>;
> };
> };
> diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
> index 90aed3ac2f69..f49d1cffd927 100644
> --- a/arch/powerpc/boot/dts/mpc8349emitx.dts
> +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
> @@ -92,7 +92,7 @@
> dfsrr;
>
> eeprom: at24@50 {
> - compatible = "st,24c256";
> + compatible = "atmel,24c256";
Similar for this one.
> reg = <0x50>;
> };
>
> @@ -130,7 +130,7 @@
> };
>
> spd: at24@51 {
> - compatible = "at24,spd";
> + compatible = "atmel,spd";
This is fine because at24 is not a vendor.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
