Remove support for platform data from matrix keypad driver
Subsystems (5)
Dmitry Torokhov
maintainercover Remove support for platform data from matrix keypad driver
Hi,
This series attempts to remove support for platform data from matrix_keypad driver, and have it use generic device properties only for the keypad configuration. Spitz is the only board [left] that uses platform data.
As part of the migration I am also dropping support for "clustered" interrupt mode, as it was only available through platform data and there are no users of it in the mainline kernel.
Additionally gpio-keys device used by Spitz converted to use device properties instead of platform data.
I would prefer not to have the song and dance of merging first 2 patches through the input tree, waiting, merging the spitz patches through SoC tree, waiting, and finally merging the last patch to matrix keypad through input again, so maybe we could merge it all through SoC? Alternatively, I could merge everything through input. What do you think?
Dmitry Torokhov (5):
Input: matrix_keypad - remove support for clustered interrupt
Input: matrix_keypad - switch to gpiod API and generic device
properties
ARM: spitz: Use software nodes/properties for the GPIO-driven buttons
ARM: spitz: Use software nodes/properties for the matrix keypad
Input: matrix_keypad - remove support for platform data
arch/arm/mach-pxa/spitz.c | 163 ++++++++---- drivers/input/keyboard/matrix_keypad.c | 334 ++++++++++--------------- include/linux/input/matrix_keypad.h | 48 ---- 3 files changed, 248 insertions(+), 297 deletions(-)
Thanks.
--
Dmitry
Dmitry Torokhov
maintainerPATCH 1/5 Input: matrix_keypad - remove support for clustered interrupt
There are no users of this functionality in the mainline kernel (it was only available to boards using platform data and not device tree). Remove it to simplify the code.
--- drivers/input/keyboard/matrix_keypad.c | 61 ++++++++++---------------- 1 file changed, 22 insertions(+), 39 deletions(-)
drivers/input/keyboard/matrix_keypad.c +22 -39
@@ -29,7 +29,6 @@ struct matrix_keypad {unsigned int row_shift;unsigned int row_irqs[MATRIX_MAX_ROWS ]; -unsigned int num_row_irqs;DECLARE_BITMAP (wakeup_enabled_irqs,MATRIX_MAX_ROWS );uint32_t last_key_state[MATRIX_MAX_COLS ];
@@ -88,7 +87,7 @@ static void enable_row_irqs(struct matrix_keypad *keypad) {int i; -for (i =0 ; i < keypad->num_row_irqs; i++) +for (i =0 ; i < keypad->pdata->num_row_gpios; i++)enable_irq (keypad->row_irqs[i]); }
@@ -96,7 +95,7 @@ static void disable_row_irqs(struct matrix_keypad *keypad) {int i; -for (i =0 ; i < keypad->num_row_irqs; i++) +for (i =0 ; i < keypad->pdata->num_row_gpios; i++)disable_irq_nosync (keypad->row_irqs[i]); }
@@ -225,7 +224,8 @@ static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad) {int i; -for_each_clear_bit (i, keypad->wakeup_enabled_irqs, keypad->num_row_irqs) +for_each_clear_bit (i, keypad->wakeup_enabled_irqs, + keypad->pdata->num_row_gpios)if (enable_irq_wake (keypad->row_irqs[i]) ==0 )__set_bit (i, keypad->wakeup_enabled_irqs); }
@@ -234,7 +234,8 @@ static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad) {int i; -for_each_set_bit (i, keypad->wakeup_enabled_irqs, keypad->num_row_irqs) { +for_each_set_bit (i, keypad->wakeup_enabled_irqs, + keypad->pdata->num_row_gpios) {disable_irq_wake (keypad->row_irqs[i]);__clear_bit (i, keypad->wakeup_enabled_irqs); }
@@ -302,48 +303,30 @@ static int matrix_keypad_init_gpio(struct platform_device *pdev,gpio_direction_input (pdata->row_gpios[i]); } -if (pdata->clustered_irq >0 ) { +for (i =0 ; i < pdata->num_row_gpios; i++) { + irq =gpio_to_irq (pdata->row_gpios[i]); +if (irq <0 ) { + err = irq; +dev_err (&pdev->dev, +"Unable to convert GPIO line %i to irq: %d\n" , + pdata->row_gpios[i], err); +return err; + } + err =devm_request_any_context_irq (&pdev->dev, - pdata->clustered_irq, + irq, matrix_keypad_interrupt, - pdata->clustered_irq_flags, +IRQF_TRIGGER_RISING | +IRQF_TRIGGER_FALLING ,"matrix-keypad" , keypad);if (err <0 ) {dev_err (&pdev->dev, -"Unable to acquire clustered interrupt\n" ); +"Unable to acquire interrupt for GPIO line %i\n" , + pdata->row_gpios[i]);return err; } - keypad->row_irqs[0 ] = pdata->clustered_irq; - keypad->num_row_irqs =1 ; - }else { -for (i =0 ; i < pdata->num_row_gpios; i++) { - irq =gpio_to_irq (pdata->row_gpios[i]); -if (irq <0 ) { - err = irq; -dev_err (&pdev->dev, -"Unable to convert GPIO line %i to irq: %d\n" , - pdata->row_gpios[i], err); -return err; - } - - err =devm_request_any_context_irq (&pdev->dev, - irq, - matrix_keypad_interrupt, -IRQF_TRIGGER_RISING | -IRQF_TRIGGER_FALLING , -"matrix-keypad" , keypad); -if (err <0 ) { -dev_err (&pdev->dev, -"Unable to acquire interrupt for GPIO line %i\n" , - pdata->row_gpios[i]); -return err; - } - - keypad->row_irqs[i] = irq; - } - - keypad->num_row_irqs = pdata->num_row_gpios; + keypad->row_irqs[i] = irq; }/* initialized as disabled - enabled by input->open */
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Dmitry Torokhov
maintainerPATCH 2/5 Input: matrix_keypad - switch to gpiod API and generic device properties
In reply to Dmitry Torokhovgpiod API and generic device properties work with software nodes and static properties, which will allow removing platform data support from the driver, simplifying and streamlining the code.
--- drivers/input/keyboard/matrix_keypad.c | 341 ++++++++++++++----------- 1 file changed, 185 insertions(+), 156 deletions(-)
drivers/input/keyboard/matrix_keypad.c +185 -156
@@ -17,17 +17,26 @@#include <linux/jiffies.h> #include <linux/module.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/input/matrix_keypad.h> #include <linux/slab.h> #include <linux/of.h> -#include <linux/of_gpio.h> -#include <linux/of_platform.h> struct matrix_keypad { -const struct matrix_keypad_platform_data *pdata;struct input_dev *input_dev;unsigned int row_shift; +unsigned int col_scan_delay_us; +/* key debounce interval in milli-second */ +unsigned int debounce_ms; +bool drive_inactive_cols; + +struct gpio_desc *row_gpios[MATRIX_MAX_ROWS ]; +unsigned int num_row_gpios; + +struct gpio_desc *col_gpios[MATRIX_MAX_ROWS ]; +unsigned int num_col_gpios; +unsigned int row_irqs[MATRIX_MAX_ROWS ]; DECLARE_BITMAP(wakeup_enabled_irqs, MATRIX_MAX_ROWS);
@@ -44,50 +53,43 @@ struct matrix_keypad {* columns. In that case it is configured here to be input, otherwise it is * driven with the inactive value. */ -static void __activate_col (const struct matrix_keypad_platform_data *pdata, -int col,bool on) +static void __activate_col (struct matrix_keypad *keypad,int col,bool on) { -bool level_on = !pdata->active_low; -if (on) { -gpio_direction_output (pdata->col_gpios[col], level_on); +gpiod_direction_output (keypad->col_gpios[col],1 ); }else { -gpio_set_value_cansleep (pdata->col_gpios[col], !level_on); -if (!pdata->drive_inactive_cols) -gpio_direction_input (pdata->col_gpios[col]); +gpiod_set_value_cansleep (keypad->col_gpios[col],0 ); +if (!keypad->drive_inactive_cols) +gpiod_direction_input (keypad->col_gpios[col]); } } -static void activate_col (const struct matrix_keypad_platform_data *pdata, -int col,bool on) +static void activate_col (struct matrix_keypad *keypad,int col,bool on) { -__activate_col (pdata, col, on); +__activate_col (keypad, col, on); -if (on && pdata->col_scan_delay_us) -udelay (pdata->col_scan_delay_us); +if (on && keypad->col_scan_delay_us) +udelay (keypad->col_scan_delay_us); } -static void activate_all_cols (const struct matrix_keypad_platform_data *pdata, -bool on) +static void activate_all_cols (struct matrix_keypad *keypad,bool on) {int col; -for (col =0 ; col < pdata->num_col_gpios; col++) -__activate_col (pdata, col, on); +for (col =0 ; col < keypad->num_col_gpios; col++) +__activate_col (keypad, col, on); } -static bool row_asserted (const struct matrix_keypad_platform_data *pdata, -int row) +static bool row_asserted (struct matrix_keypad *keypad,int row) { -return gpio_get_value_cansleep (pdata->row_gpios[row]) ? - !pdata->active_low : pdata->active_low; +return gpiod_get_value_cansleep (keypad->row_gpios[row]); }static void enable_row_irqs (struct matrix_keypad *keypad) {int i; -for (i =0 ; i < keypad->pdata->num_row_gpios; i++) +for (i =0 ; i < keypad->num_row_gpios; i++)enable_irq (keypad->row_irqs[i]); }
@@ -95,7 +97,7 @@ static void disable_row_irqs(struct matrix_keypad *keypad) {int i; -for (i =0 ; i < keypad->pdata->num_row_gpios; i++) +for (i =0 ; i < keypad->num_row_gpios; i++)disable_irq_nosync (keypad->row_irqs[i]); }
@@ -108,39 +110,38 @@ static void matrix_keypad_scan(struct work_struct *work) container_of(work, struct matrix_keypad, work.work);struct input_dev *input_dev = keypad->input_dev;const unsigned short *keycodes = input_dev->keycode; -const struct matrix_keypad_platform_data *pdata = keypad->pdata;uint32_t new_state[MATRIX_MAX_COLS ];int row, col, code;/* de-activate all columns for scanning */ -activate_all_cols (pdata, false); +activate_all_cols (keypad, false);memset (new_state,0 ,sizeof (new_state)); -for (row =0 ; row < pdata->num_row_gpios; row++) -gpio_direction_input (pdata->row_gpios[row]); +for (row =0 ; row < keypad->num_row_gpios; row++) +gpiod_direction_input (keypad->row_gpios[row]);/* assert each column and read the row status out */ -for (col =0 ; col < pdata->num_col_gpios; col++) { +for (col =0 ; col < keypad->num_col_gpios; col++) { -activate_col (pdata, col, true); +activate_col (keypad, col, true); -for (row =0 ; row < pdata->num_row_gpios; row++) +for (row =0 ; row < keypad->num_row_gpios; row++) new_state[col] |= -row_asserted (pdata, row) ? (1 << row) :0 ; +row_asserted (keypad, row) ?BIT (row) :0 ; -activate_col (pdata, col, false); +activate_col (keypad, col, false); } -for (col =0 ; col < pdata->num_col_gpios; col++) { +for (col =0 ; col < keypad->num_col_gpios; col++) {uint32_t bits_changed; bits_changed = keypad->last_key_state[col] ^ new_state[col];if (bits_changed ==0 )continue ; -for (row =0 ; row < pdata->num_row_gpios; row++) { -if ((bits_changed & (1 << row)) ==0 ) +for (row =0 ; row < keypad->num_row_gpios; row++) { +if (!(bits_changed &BIT (row)))continue ; code =MATRIX_SCAN_CODE (row, col, keypad->row_shift);
@@ -154,7 +155,7 @@ static void matrix_keypad_scan(struct work_struct *work)memcpy (keypad->last_key_state, new_state,sizeof (new_state)); -activate_all_cols (pdata, true); +activate_all_cols (keypad, true);/* Enable IRQs again */ spin_lock_irq (&keypad->lock);
@@ -181,7 +182,7 @@ static irqreturn_t matrix_keypad_interrupt(int irq, void *id)disable_row_irqs (keypad); keypad->scan_pending = true;schedule_delayed_work (&keypad->work, -msecs_to_jiffies (keypad->pdata->debounce_ms)); +msecs_to_jiffies (keypad->debounce_ms)); out:spin_unlock_irqrestore (&keypad->lock, flags);
@@ -225,7 +226,7 @@ static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad)int i;for_each_clear_bit (i, keypad->wakeup_enabled_irqs, - keypad->pdata->num_row_gpios) + keypad->num_row_gpios)if (enable_irq_wake (keypad->row_irqs[i]) ==0 )__set_bit (i, keypad->wakeup_enabled_irqs); }
@@ -235,7 +236,7 @@ static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad)int i;for_each_set_bit (i, keypad->wakeup_enabled_irqs, - keypad->pdata->num_row_gpios) { + keypad->num_row_gpios) {disable_irq_wake (keypad->row_irqs[i]);__clear_bit (i, keypad->wakeup_enabled_irqs); }
@@ -270,11 +271,14 @@ static int matrix_keypad_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops, matrix_keypad_suspend, matrix_keypad_resume); -static int matrix_keypad_init_gpio (struct platform_device *pdev, -struct matrix_keypad *keypad) +static int matrix_keypad_init_pdata_gpio (struct platform_device *pdev, +const struct matrix_keypad_platform_data *pdata, +struct matrix_keypad *keypad) { -const struct matrix_keypad_platform_data *pdata = keypad->pdata; -int i, irq, err; +int i, err; + + keypad->num_col_gpios = pdata->num_col_gpios; + keypad->num_row_gpios = pdata->num_row_gpios;/* initialized strobe lines as outputs, activated */ for (i =0 ; i < pdata->num_col_gpios; i++) {
@@ -287,7 +291,12 @@ static int matrix_keypad_init_gpio(struct platform_device *pdev,return err; } -gpio_direction_output (pdata->col_gpios[i], !pdata->active_low); + keypad->col_gpios[i] =gpio_to_desc (pdata->col_gpios[i]); + +if (pdata->active_low ^gpiod_is_active_low (keypad->col_gpios[i])) +gpiod_toggle_active_low (keypad->col_gpios[i]); + +gpiod_direction_output (keypad->col_gpios[i],1 ); }for (i =0 ; i < pdata->num_row_gpios; i++) {
@@ -300,137 +309,125 @@ static int matrix_keypad_init_gpio(struct platform_device *pdev,return err; } -gpio_direction_input (pdata->row_gpios[i]); - } - -for (i =0 ; i < pdata->num_row_gpios; i++) { - irq =gpio_to_irq (pdata->row_gpios[i]); -if (irq <0 ) { - err = irq; -dev_err (&pdev->dev, -"Unable to convert GPIO line %i to irq: %d\n" , - pdata->row_gpios[i], err); -return err; - } + keypad->row_gpios[i] =gpio_to_desc (pdata->row_gpios[i]); - err =devm_request_any_context_irq (&pdev->dev, - irq, - matrix_keypad_interrupt, -IRQF_TRIGGER_RISING | -IRQF_TRIGGER_FALLING , -"matrix-keypad" , keypad); -if (err <0 ) { -dev_err (&pdev->dev, -"Unable to acquire interrupt for GPIO line %i\n" , - pdata->row_gpios[i]); -return err; - } +if (pdata->active_low ^gpiod_is_active_low (keypad->row_gpios[i])) +gpiod_toggle_active_low (keypad->row_gpios[i]); - keypad->row_irqs[i] = irq; +gpiod_direction_input (keypad->row_gpios[i]); } -/* initialized as disabled - enabled by input->open */ -disable_row_irqs (keypad); -return 0 ; } -#ifdef CONFIG_OF -static struct matrix_keypad_platform_data * -matrix_keypad_parse_dt (struct device *dev) +static int matrix_keypad_init_gpio (struct platform_device *pdev, +struct matrix_keypad *keypad) { -struct matrix_keypad_platform_data *pdata; -struct device_node *np = dev->of_node; -unsigned int *gpios; -int ret, i, nrow, ncol; - -if (!np) { -dev_err (dev,"device lacks DT data\n" ); -return ERR_PTR (-ENODEV ); - } - - pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL ); -if (!pdata) { -dev_err (dev,"could not allocate memory for platform data\n" ); -return ERR_PTR (-ENOMEM ); - } +bool active_low; +int nrow, ncol; +int err; +int i; - pdata->num_row_gpios = nrow =gpiod_count (dev,"row" ); - pdata->num_col_gpios = ncol =gpiod_count (dev,"col" ); + nrow =gpiod_count (&pdev->dev,"row" ); + ncol =gpiod_count (&pdev->dev,"col" );if (nrow <0 || ncol <0 ) { -dev_err (dev,"number of keypad rows/columns not specified\n" ); -return ERR_PTR (-EINVAL ); +dev_err (&pdev->dev,"missing row or column GPIOs\n" ); +return -EINVAL ; } - pdata->no_autorepeat =of_property_read_bool (np,"linux,no-autorepeat" ); + keypad->num_row_gpios = nrow; + keypad->num_col_gpios = ncol; - pdata->wakeup =of_property_read_bool (np,"wakeup-source" ) || -of_property_read_bool (np,"linux,wakeup" );/* legacy */ + active_low =device_property_read_bool (&pdev->dev,"gpio-activelow" ); - pdata->active_low =of_property_read_bool (np,"gpio-activelow" ); +/* initialize strobe lines as outputs, activated */ +for (i =0 ; i < keypad->num_col_gpios; i++) { + keypad->col_gpios[i] =devm_gpiod_get_index (&pdev->dev,"col" , + i,GPIOD_ASIS ); + err =PTR_ERR_OR_ZERO (keypad->col_gpios[i]); +if (err) { +dev_err (&pdev->dev, +"failed to request GPIO for COL%d: %d\n" , + i, err); +return err; + } - pdata->drive_inactive_cols = -of_property_read_bool (np,"drive-inactive-cols" ); +gpiod_set_consumer_name (keypad->col_gpios[i],"matrix_kbd_col" ); -of_property_read_u32 (np,"debounce-delay-ms" , &pdata->debounce_ms); -of_property_read_u32 (np,"col-scan-delay-us" , - &pdata->col_scan_delay_us); +if (active_low ^gpiod_is_active_low (keypad->col_gpios[i])) +gpiod_toggle_active_low (keypad->col_gpios[i]); - gpios =devm_kcalloc (dev, - pdata->num_row_gpios + pdata->num_col_gpios, -sizeof (unsigned int ), -GFP_KERNEL ); -if (!gpios) { -dev_err (dev,"could not allocate memory for gpios\n" ); -return ERR_PTR (-ENOMEM ); +gpiod_direction_output (keypad->col_gpios[i],1 ); } -for (i =0 ; i < nrow; i++) { - ret =of_get_named_gpio (np,"row-gpios" , i); -if (ret <0 ) -return ERR_PTR (ret); - gpios[i] = ret; - } +for (i =0 ; i < keypad->num_row_gpios; i++) { + keypad->row_gpios[i] =devm_gpiod_get_index (&pdev->dev,"row" , + i,GPIOD_IN ); + err =PTR_ERR_OR_ZERO (keypad->row_gpios[i]); +if (err) { +dev_err (&pdev->dev, +"failed to request GPIO for ROW%d: %d\n" , + i, err); +return err; + } -for (i =0 ; i < ncol; i++) { - ret =of_get_named_gpio (np,"col-gpios" , i); -if (ret <0 ) -return ERR_PTR (ret); - gpios[nrow + i] = ret; - } +gpiod_set_consumer_name (keypad->row_gpios[i],"matrix_kbd_row" ); - pdata->row_gpios = gpios; - pdata->col_gpios = &gpios[pdata->num_row_gpios]; +if (active_low ^gpiod_is_active_low (keypad->row_gpios[i])) +gpiod_toggle_active_low (keypad->row_gpios[i]); + } -return pdata; +return 0 ; } -#else -static inline struct matrix_keypad_platform_data * -matrix_keypad_parse_dt (struct device *dev) + +static int matrix_keypad_setup_interrupts (struct platform_device *pdev, +struct matrix_keypad *keypad) { -dev_err (dev,"no platform data defined\n" ); +int err; +int irq; +int i; + +for (i =0 ; i < keypad->num_row_gpios; i++) { + irq =gpiod_to_irq (keypad->row_gpios[i]); +if (irq <0 ) { + err = irq; +dev_err (&pdev->dev, +"Unable to convert GPIO line %i to irq: %d\n" , + i, err); +return err; + } + + err =devm_request_any_context_irq (&pdev->dev, irq, + matrix_keypad_interrupt, +IRQF_TRIGGER_RISING | +IRQF_TRIGGER_FALLING , +"matrix-keypad" , keypad); +if (err <0 ) { +dev_err (&pdev->dev, +"Unable to acquire interrupt for row %i: %d\n" , + i, err); +return err; + } + + keypad->row_irqs[i] = irq; + } -return ERR_PTR (-EINVAL ); +/* initialized as disabled - enabled by input->open */ +disable_row_irqs (keypad); + +return 0 ; } -#endif static int matrix_keypad_probe (struct platform_device *pdev) { -const struct matrix_keypad_platform_data *pdata; +const struct matrix_keypad_platform_data *pdata = +dev_get_platdata (&pdev->dev);struct matrix_keypad *keypad;struct input_dev *input_dev; +bool autorepeat; +bool wakeup;int err; - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - pdata =matrix_keypad_parse_dt (&pdev->dev); -if (IS_ERR (pdata)) -return PTR_ERR (pdata); - }else if (!pdata->keymap_data) { -dev_err (&pdev->dev,"no keymap data defined\n" ); -return -EINVAL ; - } - keypad =devm_kzalloc (&pdev->dev,sizeof (*keypad),GFP_KERNEL );if (!keypad)return -ENOMEM ;
@@ -440,40 +437,72 @@ static int matrix_keypad_probe(struct platform_device *pdev)return -ENOMEM ; keypad->input_dev = input_dev; - keypad->pdata = pdata; - keypad->row_shift =get_count_order (pdata->num_col_gpios); keypad->stopped = true;INIT_DELAYED_WORK (&keypad->work, matrix_keypad_scan);spin_lock_init (&keypad->lock); + keypad->drive_inactive_cols = +device_property_read_bool (&pdev->dev,"drive-inactive-cols" ); +device_property_read_u32 (&pdev->dev,"debounce-delay-ms" , + &keypad->debounce_ms); +device_property_read_u32 (&pdev->dev,"col-scan-delay-us" , + &keypad->col_scan_delay_us); + +if (pdata) { + keypad->col_scan_delay_us = pdata->col_scan_delay_us; + keypad->debounce_ms = pdata->debounce_ms; + keypad->drive_inactive_cols = pdata->drive_inactive_cols; + } + +if (pdata) + err =matrix_keypad_init_pdata_gpio (pdev, pdata, keypad); +else + err =matrix_keypad_init_gpio (pdev, keypad); +if (err) +return err; + + keypad->row_shift =get_count_order (keypad->num_col_gpios); + + err =matrix_keypad_setup_interrupts (pdev, keypad); +if (err) +return err; + input_dev->name = pdev->name; input_dev->id.bustype =BUS_HOST ; input_dev->open = matrix_keypad_start; input_dev->close = matrix_keypad_stop; - err =matrix_keypad_build_keymap (pdata->keymap_data,NULL , - pdata->num_row_gpios, - pdata->num_col_gpios, + err =matrix_keypad_build_keymap (pdata ? pdata->keymap_data :NULL , +NULL , + keypad->num_row_gpios, + keypad->num_col_gpios,NULL , input_dev);if (err) {dev_err (&pdev->dev,"failed to build keymap\n" );return -ENOMEM ; } -if (!pdata->no_autorepeat) + autorepeat = !device_property_read_bool (&pdev->dev, +"linux,no-autorepeat" ); +if (autorepeat && pdata->no_autorepeat) + autorepeat = false; +if (autorepeat)__set_bit (EV_REP , input_dev->evbit); +input_set_capability (input_dev,EV_MSC ,MSC_SCAN );input_set_drvdata (input_dev, keypad); - err =matrix_keypad_init_gpio (pdev, keypad); -if (err) -return err; - err =input_register_device (keypad->input_dev);if (err)return err; -device_init_wakeup (&pdev->dev, pdata->wakeup); + wakeup =device_property_read_bool (&pdev->dev,"wakeup-source" ) || +/* legacy */ +device_property_read_bool (&pdev->dev,"linux,wakeup" ); +if (!wakeup && pdata) + wakeup = pdata->wakeup; +device_init_wakeup (&pdev->dev, wakeup); +platform_set_drvdata (pdev, keypad);return 0 ;
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Dmitry Torokhov
maintainerPATCH 3/5 ARM: spitz: Use software nodes/properties for the GPIO-driven buttons
In reply to Dmitry TorokhovConvert the Spitz to use software nodes and static properties to describe GPIOs for the GPIO-driven buttons.
--- arch/arm/mach-pxa/spitz.c | 99 +++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 31 deletions(-)
arch/arm/mach-pxa/spitz.c +68 -31
@@ -419,45 +419,82 @@ static inline void spitz_mkp_init(void) {}* GPIO keys ******************************************************************************/ #if defined(CONFIG_KEYBOARD_GPIO ) || defined(CONFIG_KEYBOARD_GPIO_MODULE ) -static struct gpio_keys_button spitz_gpio_keys[] = { - { - .type =EV_PWR , - .code =KEY_SUSPEND , - .gpio =SPITZ_GPIO_ON_KEY , - .desc ="On Off" , - .wakeup =1 , - }, -/* Two buttons detecting the lid state */ - { - .type =EV_SW , - .code =0 , - .gpio =SPITZ_GPIO_SWA , - .desc ="Display Down" , - }, - { - .type =EV_SW , - .code =1 , - .gpio =SPITZ_GPIO_SWB , - .desc ="Lid Closed" , - }, +static const struct software_node spitz_gpio_keys_node = { + .name ="spitz-gpio-keys" , }; -static struct gpio_keys_platform_data spitz_gpio_keys_platform_data = { - .buttons = spitz_gpio_keys, - .nbuttons =ARRAY_SIZE (spitz_gpio_keys), +static const struct property_entry spitz_suspend_key_props[] = { +PROPERTY_ENTRY_U32 ("linux,input-type" ,EV_PWR ), +PROPERTY_ENTRY_U32 ("linux,code" ,KEY_SUSPEND ), +PROPERTY_ENTRY_GPIO ("gpios" , &pxa2xx_gpiochip_node, +SPITZ_GPIO_ON_KEY ,GPIO_ACTIVE_HIGH ), +PROPERTY_ENTRY_STRING ("label" ,"On Off" ), +PROPERTY_ENTRY_BOOL ("wakeup-source" ), + { } }; -static struct platform_device spitz_gpio_keys_device = { - .name ="gpio-keys" , - .id =-1 , - .dev = { - .platform_data = &spitz_gpio_keys_platform_data, - }, +static const struct software_node spitz_suspend_key_node = { + .parent = &spitz_gpio_keys_node, + .properties = spitz_suspend_key_props, +}; + +static const struct property_entry spitz_sw1_props[] = { +PROPERTY_ENTRY_U32 ("linux,input-type" ,EV_SW ), +PROPERTY_ENTRY_U32 ("linux,code" ,0 ), +PROPERTY_ENTRY_GPIO ("gpios" , &pxa2xx_gpiochip_node, +SPITZ_GPIO_SWA ,GPIO_ACTIVE_HIGH ), +PROPERTY_ENTRY_STRING ("label" ,"Display Down" ), + { } +}; + +static const struct software_node spitz_sw1_node = { + .parent = &spitz_gpio_keys_node, + .properties = spitz_sw1_props, +}; + +static const struct property_entry spitz_sw2_props[] = { +PROPERTY_ENTRY_U32 ("linux,input-type" ,EV_SW ), +PROPERTY_ENTRY_U32 ("linux,code" ,1 ), +PROPERTY_ENTRY_GPIO ("gpios" , &pxa2xx_gpiochip_node, +SPITZ_GPIO_SWB ,GPIO_ACTIVE_HIGH ), +PROPERTY_ENTRY_STRING ("label" ,"Lid Closed" ), + { } +}; + +static const struct software_node spitz_sw2_node = { + .parent = &spitz_gpio_keys_node, + .properties = spitz_sw2_props, +}; + +static const struct software_node *spitz_gpio_keys_swnodes[] = { + &spitz_gpio_keys_node, + &spitz_suspend_key_node, + &spitz_sw1_node, + &spitz_sw2_node, +NULL };static void __init spitz_keys_init (void ) { -platform_device_register (&spitz_gpio_keys_device); +struct platform_device_info keys_info = { + .name ="gpio-keys" , + .id =PLATFORM_DEVID_NONE , + }; +struct platform_device *pd; +int err; + + err =software_node_register_node_group (spitz_gpio_keys_swnodes); +if (err) { +pr_err ("failed to register gpio-keys software nodes: %d\n" , err); +return ; + } + + keys_info.fwnode =software_node_fwnode (&spitz_gpio_keys_node); + + pd =platform_device_register_full (&keys_info); + err =PTR_ERR_OR_ZERO (pd); +if (err) +pr_err ("failed to create gpio-keys device: %d\n" , err); }#else static inline void spitz_keys_init (void ) {}
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Dmitry Torokhov
maintainerPATCH 4/5 ARM: spitz: Use software nodes/properties for the matrix keypad
In reply to Dmitry TorokhovConvert the Spitz to use software nodes and static properties to describe GPIOs and other parameters of its matrix keypad.
--- arch/arm/mach-pxa/spitz.c | 64 +++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 23 deletions(-)
arch/arm/mach-pxa/spitz.c +41 -23
@@ -378,38 +378,56 @@ static const uint32_t spitz_keymap[] = { KEY(6, 8, KEY_RIGHT), }; -static const struct matrix_keymap_data spitz_keymap_data = { - .keymap = spitz_keymap, - .keymap_size =ARRAY_SIZE (spitz_keymap), +static const struct software_node_ref_args spitz_mkp_row_gpios[] = { +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,12 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,17 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,91 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,34 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,36 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,38 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,39 ,GPIO_ACTIVE_HIGH ), }; -static const uint32_t spitz_row_gpios[] = - {12 ,17 ,91 ,34 ,36 ,38 ,39 }; -static const uint32_t spitz_col_gpios[] = - {88 ,23 ,24 ,25 ,26 ,27 ,52 ,103 ,107 ,108 ,114 }; - -static struct matrix_keypad_platform_data spitz_mkp_pdata = { - .keymap_data = &spitz_keymap_data, - .row_gpios = spitz_row_gpios, - .col_gpios = spitz_col_gpios, - .num_row_gpios =ARRAY_SIZE (spitz_row_gpios), - .num_col_gpios =ARRAY_SIZE (spitz_col_gpios), - .col_scan_delay_us =10 , - .debounce_ms =10 , - .wakeup =1 , +static const struct software_node_ref_args spitz_mkp_col_gpios[] = { +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,88 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,23 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,24 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,25 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,26 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,27 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,52 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,103 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,107 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,108 ,GPIO_ACTIVE_HIGH ), +SOFTWARE_NODE_REFERENCE (&pxa2xx_gpiochip_node,114 ,GPIO_ACTIVE_HIGH ), }; -static struct platform_device spitz_mkp_device = { +static const struct property_entry spitz_mkp_properties[] = { +PROPERTY_ENTRY_ARRAY_U32 ("linux,keymap" , spitz_keymap), +PROPERTY_ENTRY_REF_ARRAY ("row-gpios" , spitz_mkp_row_gpios), +PROPERTY_ENTRY_REF_ARRAY ("col-gpios" , spitz_mkp_col_gpios), +PROPERTY_ENTRY_U32 ("col-scan-delay-us" ,10 ), +PROPERTY_ENTRY_U32 ("debounce-delay-ms" ,10 ), +PROPERTY_ENTRY_BOOL ("wakeup-source" ), + { } +}; + +static const struct platform_device_info spitz_mkp_info__initconst = { .name ="matrix-keypad" , - .id =-1 , - .dev = { - .platform_data = &spitz_mkp_pdata, - }, + .id =PLATFORM_DEVID_NONE , + .properties = spitz_mkp_properties, }; +static void __init spitz_mkp_init (void ) { -platform_device_register (&spitz_mkp_device); +struct platform_device *pd; +int err; + + pd =platform_device_register_full (&spitz_mkp_info); + err =PTR_ERR_OR_ZERO (pd); +if (err) +pr_err ("failed to create keypad device: %d\n" , err); }#else static inline void spitz_mkp_init (void ) {}
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Dmitry Torokhov
maintainerPATCH 5/5 Input: matrix_keypad - remove support for platform data
In reply to Dmitry TorokhovThere are no more users of struct matrix_keypad_platform_data in the kernel, remove support for it from the driver.
--- drivers/input/keyboard/matrix_keypad.c | 74 ++------------------------ include/linux/input/matrix_keypad.h | 48 ----------------- 2 files changed, 3 insertions(+), 119 deletions(-)
drivers/input/keyboard/matrix_keypad.c +3 -71
@@ -271,55 +271,6 @@ static int matrix_keypad_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops, matrix_keypad_suspend, matrix_keypad_resume); -static int matrix_keypad_init_pdata_gpio (struct platform_device *pdev, -const struct matrix_keypad_platform_data *pdata, -struct matrix_keypad *keypad) -{ -int i, err; - - keypad->num_col_gpios = pdata->num_col_gpios; - keypad->num_row_gpios = pdata->num_row_gpios; - -/* initialized strobe lines as outputs, activated */ -for (i =0 ; i < pdata->num_col_gpios; i++) { - err =devm_gpio_request (&pdev->dev, - pdata->col_gpios[i],"matrix_kbd_col" ); -if (err) { -dev_err (&pdev->dev, -"failed to request GPIO%d for COL%d\n" , - pdata->col_gpios[i], i); -return err; - } - - keypad->col_gpios[i] =gpio_to_desc (pdata->col_gpios[i]); - -if (pdata->active_low ^gpiod_is_active_low (keypad->col_gpios[i])) -gpiod_toggle_active_low (keypad->col_gpios[i]); - -gpiod_direction_output (keypad->col_gpios[i],1 ); - } - -for (i =0 ; i < pdata->num_row_gpios; i++) { - err =devm_gpio_request (&pdev->dev, - pdata->row_gpios[i],"matrix_kbd_row" ); -if (err) { -dev_err (&pdev->dev, -"failed to request GPIO%d for ROW%d\n" , - pdata->row_gpios[i], i); -return err; - } - - keypad->row_gpios[i] =gpio_to_desc (pdata->row_gpios[i]); - -if (pdata->active_low ^gpiod_is_active_low (keypad->row_gpios[i])) -gpiod_toggle_active_low (keypad->row_gpios[i]); - -gpiod_direction_input (keypad->row_gpios[i]); - } - -return 0 ; -} -static int matrix_keypad_init_gpio (struct platform_device *pdev,struct matrix_keypad *keypad) {
@@ -420,11 +371,8 @@ static int matrix_keypad_setup_interrupts(struct platform_device *pdev,static int matrix_keypad_probe (struct platform_device *pdev) { -const struct matrix_keypad_platform_data *pdata = -dev_get_platdata (&pdev->dev);struct matrix_keypad *keypad;struct input_dev *input_dev; -bool autorepeat;bool wakeup;int err;
@@ -448,16 +396,7 @@ static int matrix_keypad_probe(struct platform_device *pdev)device_property_read_u32 (&pdev->dev,"col-scan-delay-us" , &keypad->col_scan_delay_us); -if (pdata) { - keypad->col_scan_delay_us = pdata->col_scan_delay_us; - keypad->debounce_ms = pdata->debounce_ms; - keypad->drive_inactive_cols = pdata->drive_inactive_cols; - } - -if (pdata) - err =matrix_keypad_init_pdata_gpio (pdev, pdata, keypad); -else - err =matrix_keypad_init_gpio (pdev, keypad); + err =matrix_keypad_init_gpio (pdev, keypad);if (err)return err;
@@ -472,8 +411,7 @@ static int matrix_keypad_probe(struct platform_device *pdev) input_dev->open = matrix_keypad_start; input_dev->close = matrix_keypad_stop; - err =matrix_keypad_build_keymap (pdata ? pdata->keymap_data :NULL , -NULL , + err =matrix_keypad_build_keymap (NULL ,NULL , keypad->num_row_gpios, keypad->num_col_gpios,NULL , input_dev);
@@ -482,11 +420,7 @@ static int matrix_keypad_probe(struct platform_device *pdev)return -ENOMEM ; } - autorepeat = !device_property_read_bool (&pdev->dev, -"linux,no-autorepeat" ); -if (autorepeat && pdata->no_autorepeat) - autorepeat = false; -if (autorepeat) +if (!device_property_read_bool (&pdev->dev,"linux,no-autorepeat" ))__set_bit (EV_REP , input_dev->evbit);input_set_capability (input_dev,EV_MSC ,MSC_SCAN );
@@ -499,8 +433,6 @@ static int matrix_keypad_probe(struct platform_device *pdev) wakeup =device_property_read_bool (&pdev->dev,"wakeup-source" ) ||/* legacy */ device_property_read_bool (&pdev->dev,"linux,wakeup" ); -if (!wakeup && pdata) - wakeup = pdata->wakeup;device_init_wakeup (&pdev->dev, wakeup);platform_set_drvdata (pdev, keypad);
include/linux/input/matrix_keypad.h +0 -48
58 lines not on this page · raw message
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Quoted 12 lines · Dmitry Torokhov
This series attempts to remove support for platform data from
matrix_keypaddriver, and have it use generic device properties only for the keypad configuration. Spitz is the only board [left] that uses platform data.As part of the migration I am also dropping support for "clustered" interrupt mode, as it was only available through platform data and there are no users of it in the mainline kernel.
Additionally gpio-keys device used by Spitz converted to use device properties instead of platform data.
Quoted 6 lines
I would prefer not to have the song and dance of merging first 2 patches through the input tree, waiting, merging the spitz patches through SoC tree, waiting, and finally merging the last patch to matrix keypad through input again, so maybe we could merge it all through SoC? Alternatively, I could merge everything through input. What do you think?
Sounds like a plan. The series:
Yours,
Linus Walleij
Dmitry Torokhov
maintainerHi Linus,
Quoted 22 lines · Linus Walleij
Quoted 12 lines · Dmitry Torokhov
This series attempts to remove support for platform data from
matrix_keypaddriver, and have it use generic device properties only for the keypad configuration. Spitz is the only board [left] that uses platform data.As part of the migration I am also dropping support for "clustered" interrupt mode, as it was only available through platform data and there are no users of it in the mainline kernel.
Additionally gpio-keys device used by Spitz converted to use device properties instead of platform data.
Quoted 6 lines
I would prefer not to have the song and dance of merging first 2 patches through the input tree, waiting, merging the spitz patches through SoC tree, waiting, and finally merging the last patch to matrix keypad through input again, so maybe we could merge it all through SoC? Alternatively, I could merge everything through input. What do you think?
Quoted 2 lines
Sounds like a plan. The series:
Reviewed-by Linus Walleij <[email protected]>
Thanks!
I'm glad that we agree that we do not want the elaborate merge process and instead push the changes through one tree in one shot we just need to decide which one - soc or input. I am fine with using either.
Sorry if I am being obtuse.
Thanks.
Signature · 1 line
Dmitry
Quoted 3 lines · Dmitry Torokhov
I'm glad that we agree that we do not want the elaborate merge process and instead push the changes through one tree in one shot we just need to decide which one - soc or input. I am fine with using either.
I'm also fine with either, but let's take the input tree because the you're in direct control of it so it will be easier.
Yours,
Linus Walleij
Arnd Bergmann
Acked-byQuoted 9 lines · Linus Walleij
Quoted 3 lines · Dmitry Torokhov
I'm glad that we agree that we do not want the elaborate merge process and instead push the changes through one tree in one shot we just need to decide which one - soc or input. I am fine with using either.
I'm also fine with either, but let's take the input tree because the you're in direct control of it so it will be easier.
Sorry I dropped the ball here, I just saw that these five patches are still in the patchwork waiting for me to apply them.
I'm also happy for them to go through the input tree, and have marked them as not-for-us in patchwork now. Dmitry, please add my
and pick them up in your tree. I've checked that there are no conflicts against contents of the SoC tree. If you prefer me to pick them up after all, that is also fine, but please resend in that case.
Arnd
Dmitry Torokhov
maintainerQuoted 18 lines · Arnd Bergmann
Quoted 9 lines · Linus Walleij
Quoted 3 lines · Dmitry Torokhov
I'm glad that we agree that we do not want the elaborate merge process and instead push the changes through one tree in one shot we just need to decide which one - soc or input. I am fine with using either.
I'm also fine with either, but let's take the input tree because the you're in direct control of it so it will be easier.
Sorry I dropped the ball here, I just saw that these five patches are still in the patchwork waiting for me to apply them.
I'm also happy for them to go through the input tree, and have marked them as not-for-us in patchwork now. Dmitry, please add my
Quoted 6 lines
Acked-by Arnd Bergmann <[email protected]>and pick them up in your tree. I've checked that there are no conflicts against contents of the SoC tree. If you prefer me to pick them up after all, that is also fine, but please resend in that case.
I made an immutable branch off of 6.11-rc6 with the changesi and merged it into my 'next' branch for the upcoming merge window. Please feel free to also pull it - it does not have any unrelated changes:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git ib/6.11-rc6-matrix-keypad-spitz
Thanks.
Signature · 1 line
Dmitry