Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Maxime Ripard and committed by
Greg Kroah-Hartman
f0de8e04 d913c743

+7 -3
+3 -2
Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
··· 1 1 Allwinner sunxi-sid 2 2 3 3 Required properties: 4 - - compatible: "allwinner,sun4i-sid" or "allwinner,sun7i-a20-sid". 4 + - compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid" 5 + (Deprecated: "allwinner,sun4i-sid"). 5 6 - reg: Should contain registers location and length 6 7 7 8 Example for sun4i: 8 9 sid@01c23800 { 9 - compatible = "allwinner,sun4i-sid"; 10 + compatible = "allwinner,sun4i-a10-sid"; 10 11 reg = <0x01c23800 0x10> 11 12 }; 12 13
+4 -1
drivers/misc/eeprom/sunxi_sid.c
··· 96 96 } 97 97 98 98 static const struct of_device_id sunxi_sid_of_match[] = { 99 - { .compatible = "allwinner,sun4i-sid", .data = (void *)16}, 99 + { .compatible = "allwinner,sun4i-a10-sid", .data = (void *)16}, 100 100 { .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512}, 101 + 102 + /* Deprecated */ 103 + { .compatible = "allwinner,sun4i-sid", .data = (void *)16}, 101 104 {/* sentinel */}, 102 105 }; 103 106 MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);