Merge tag 'v6.1-rc1' into next

Merge with mainline to bring in the latest changes to twl4030 driver.

diff --git a/drivers/input/keyboard/dlink-dir685-touchkeys.c b/drivers/input/keyboard/dlink-dir685-touchkeys.c
index a69dcc3..3b67400 100644 (file)
--- a/drivers/input/keyboard/dlink-dir685-touchkeys.c
+++ b/drivers/input/keyboard/dlink-dir685-touchkeys.c
@@ -62,9 +62,9 @@ static irqreturn_t dir685_tk_irq_thread(int irq, void *data)
 static int dir685_tk_probe(struct i2c_client *client,
                           const struct i2c_device_id *id)
 {
-       struct dir685_touchkeys *tk;
+       static const u8 bl_data[] = { 0xa7, 0x40 };
        struct device *dev = &client->dev;
-       u8 bl_data[] = { 0xa7, 0x40 };
+       struct dir685_touchkeys *tk;
        int err;
        int i;
 

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 9f08890..84765e1 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -107,7 +107,7 @@ config INPUT_ATC260X_ONKEY
 
 config INPUT_ATMEL_CAPTOUCH
        tristate "Atmel Capacitive Touch Button Driver"
-       depends on OF || COMPILE_TEST
+       depends on OF
        depends on I2C
        help
          Say Y here if an Atmel Capacitive Touch Button device which

diff --git a/drivers/input/misc/atmel_captouch.c b/drivers/input/misc/atmel_captouch.c
index 051aded..156c699 100644 (file)
--- a/drivers/input/misc/atmel_captouch.c
+++ b/drivers/input/misc/atmel_captouch.c
@@ -249,7 +249,6 @@ static int atmel_captouch_probe(struct i2c_client *client,
        return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id atmel_captouch_of_id[] = {
        {
                .compatible = "atmel,captouch",
@@ -257,7 +256,6 @@ static const struct of_device_id atmel_captouch_of_id[] = {
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, atmel_captouch_of_id);
-#endif
 
 static const struct i2c_device_id atmel_captouch_id[] = {
        { "atmel_captouch", 0 },
@@ -270,7 +268,7 @@ static struct i2c_driver atmel_captouch_driver = {
        .id_table       = atmel_captouch_id,
        .driver         = {
                .name   = "atmel_captouch",
-               .of_match_table = of_match_ptr(atmel_captouch_of_id),
+               .of_match_table = atmel_captouch_of_id,
        },
 };
 module_i2c_driver(atmel_captouch_driver);