diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-03-19 15:52:45 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-03-26 14:20:17 +0000 |
| commit | 1422731dbc14063fc7083cb090108c0d95267361 (patch) | |
| tree | e0e2bd85c768f78d1c17b8f38c262a2df660d947 /drivers/mfd | |
| parent | 5d5a7bffd02863a526abad7700c18b96d4cae19e (diff) | |
| download | op-kernel-dev-1422731dbc14063fc7083cb090108c0d95267361.zip op-kernel-dev-1422731dbc14063fc7083cb090108c0d95267361.tar.gz | |
mfd: tc3589x: Enforce device-tree only mode
All systems using the TC3589x multifunction expander uses
devicetree, so don't clutter the place with a lot of
and assume it is there.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mfd/tc3589x.c | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 5e68fde..ba097f7 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1260,6 +1260,7 @@ config MFD_TIMBERDALE config MFD_TC3589X bool "Toshiba TC35892 and variants" depends on I2C=y + depends on OF select MFD_CORE help Support for the Toshiba TC35892 and variants I/O Expander. diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index aacb372..cf35639 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c @@ -318,7 +318,6 @@ static int tc3589x_device_init(struct tc3589x *tc3589x) return ret; } -#ifdef CONFIG_OF static const struct of_device_id tc3589x_match[] = { /* Legacy compatible string */ { .compatible = "tc3589x", .data = (void *) TC3589X_UNKNOWN }, @@ -359,14 +358,6 @@ tc3589x_of_probe(struct device *dev, enum tc3589x_version *version) return pdata; } -#else -static inline struct tc3589x_platform_data * -tc3589x_of_probe(struct device *dev, enum tc3589x_version *version) -{ - dev_err(dev, "no device tree support\n"); - return ERR_PTR(-ENODEV); -} -#endif static int tc3589x_probe(struct i2c_client *i2c, const struct i2c_device_id *id) |
