misc: eeprom: sunxi: Add new compatibles

The Allwinner A10 compatibles were following a slightly different compatible
patterns than the rest of the SoCs for historical reasons. Add compatibles
matching the other pattern to the SID driver for consistency, and keep the
older one for backward compatibility.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
index 68ba37295565262d05807c1ba8ac0f7933395725..c10a61ad5f952b51170f8df6fe4eeaea1895053a 100644 (file)
--- a/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
+++ b/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
@@ -1,12 +1,13 @@
 Allwinner sunxi-sid
 
 Required properties:
-- compatible: "allwinner,sun4i-sid" or "allwinner,sun7i-a20-sid".
+- compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid"
+              (Deprecated: "allwinner,sun4i-sid").
 - reg: Should contain registers location and length
 
 Example for sun4i:
        sid@01c23800 {
-               compatible = "allwinner,sun4i-sid";
+               compatible = "allwinner,sun4i-a10-sid";
                reg = <0x01c23800 0x10>
        };
 

diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
index 9c34e5704304f4e40dd33b4293347e6a2d6afa4f..e137e75a89e584e245e70f45e57abdcfeca67bf0 100644 (file)
--- a/drivers/misc/eeprom/sunxi_sid.c
+++ b/drivers/misc/eeprom/sunxi_sid.c
@@ -96,8 +96,11 @@ static int sunxi_sid_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id sunxi_sid_of_match[] = {
-       { .compatible = "allwinner,sun4i-sid", .data = (void *)16},
+       { .compatible = "allwinner,sun4i-a10-sid", .data = (void *)16},
        { .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
+
+       /* Deprecated */
+       { .compatible = "allwinner,sun4i-sid", .data = (void *)16},
        {/* sentinel */},
 };
 MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);