OSDN Git Service

mfd: wm8994: Add device ID data to WM8994 OF device IDs
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Apr 2013 17:11:50 +0000 (18:11 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 18 Apr 2013 22:35:19 +0000 (00:35 +0200)
We can actually read this back from the device but we use this when
registered using standard I2C board data registration so make sure
it's there for OF too.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/wm8994-core.c

index cdea84e..3f8d591 100644 (file)
@@ -673,9 +673,9 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
 }
 
 static const struct of_device_id wm8994_of_match[] = {
-       { .compatible = "wlf,wm1811", },
-       { .compatible = "wlf,wm8994", },
-       { .compatible = "wlf,wm8958", },
+       { .compatible = "wlf,wm1811", .data = (void *)WM1811 },
+       { .compatible = "wlf,wm8994", .data = (void *)WM8994 },
+       { .compatible = "wlf,wm8958", .data = (void *)WM8958 },
        { }
 };
 MODULE_DEVICE_TABLE(of, wm8994_of_match);