evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "misc: eeprom: sunxi: Add new compatibles"

Browse source 
This reverts commit f0de8e04a7, it is
incorrect, a future patch will fix this up properly.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-02-14 11:16:08 -08:00
parent 8c442794b2
commit bf74710388
2 changed files with 3 additions and 7 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,13 +1,12 @@
Allwinner sunxi-sid Allwinner sunxi-sid
Required properties: Required properties:
- compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid" - compatible: "allwinner,sun4i-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-a10-sid"; compatible = "allwinner,sun4i-sid";
reg = <0x01c23800 0x10> reg = <0x01c23800 0x10>
}; };

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

@ -96,11 +96,8 @@ 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-a10-sid", .data = (void *)16},
{ .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
/* Deprecated */
{ .compatible = "allwinner,sun4i-sid", .data = (void *)16}, { .compatible = "allwinner,sun4i-sid", .data = (void *)16},
{ .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
{/* sentinel */}, {/* sentinel */},
}; };
MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);