AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

misc: eeprom: sunxi: Add new compatibles

Browse Source 
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>
This commit is contained in:
Maxime Ripard 2014-02-02 14:52:05 +01:00 committed by Greg Kroah-Hartman
parent d913c7439a
commit f0de8e04a7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
View File

@ -1,12 +1,13 @@
Allwinner sunxi-sid Allwinner sunxi-sid
Required properties: 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 - reg: Should contain registers location and length
Example for sun4i: Example for sun4i:
sid@01c23800 { sid@01c23800 {
compatible = "allwinner,sun4i-sid"; compatible = "allwinner,sun4i-a10-sid";
reg = <0x01c23800 0x10> reg = <0x01c23800 0x10>
}; };

5
drivers/misc/eeprom/sunxi_sid.c
View File

@ -96,8 +96,11 @@ static int sunxi_sid_remove(struct platform_device *pdev)
} }
static const struct of_device_id sunxi_sid_of_match[] = { 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}, { .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
/* Deprecated */
{ .compatible = "allwinner,sun4i-sid", .data = (void *)16},
{/* sentinel */}, {/* sentinel */},
}; };
MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);