diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 09:48:19 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 18:14:52 -0400 |
commit | 2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15 (patch) | |
tree | ffbaba1c737fa5da32d9c1a503e58d2896f10be6 /arch | |
parent | 959e85f7751c33d1a2dabc5cc3fe2ed0db7052e5 (diff) |
of: refactor of_modalias_node() and remove explicit match table.
This patch tightens up the behaviour of of_modalias_node() to be more
predicatable and to eliminate the explicit of_modalias_tablep[] that
is currently used to override the first entry in the compatible list
of a device. The override table was needed originally because spi
and i2c drivers had no way to do of-style matching. Now that all
devices can have an of_node pointer, and all drivers can have an
of_match_table, the explicit override table is no longer needed
because each driver can specify its own OF-style match data.
The mpc8349emitx-mcu driver is modified to explicitly specify the
correct device to bind against.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c index 59b0ed1a56b1..70798ac911ef 100644 --- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c +++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | |||
@@ -160,10 +160,16 @@ static const struct i2c_device_id mcu_ids[] = { | |||
160 | }; | 160 | }; |
161 | MODULE_DEVICE_TABLE(i2c, mcu_ids); | 161 | MODULE_DEVICE_TABLE(i2c, mcu_ids); |
162 | 162 | ||
163 | static struct of_device_id mcu_of_match_table[] __devinitdata = { | ||
164 | { .compatible = "fsl,mcu-mpc8349emitx", }, | ||
165 | { }, | ||
166 | }; | ||
167 | |||
163 | static struct i2c_driver mcu_driver = { | 168 | static struct i2c_driver mcu_driver = { |
164 | .driver = { | 169 | .driver = { |
165 | .name = "mcu-mpc8349emitx", | 170 | .name = "mcu-mpc8349emitx", |
166 | .owner = THIS_MODULE, | 171 | .owner = THIS_MODULE, |
172 | .of_match_table = mcu_of_match_table, | ||
167 | }, | 173 | }, |
168 | .probe = mcu_probe, | 174 | .probe = mcu_probe, |
169 | .remove = __devexit_p(mcu_remove), | 175 | .remove = __devexit_p(mcu_remove), |