Qualcomm PMIC8058 sub-device drivers
Subsystems (5)
cover Qualcomm PMIC8058 sub-device drivers
This patch series contains sub-device drivers for Qualcomm PMIC8058. It is submitted here as RFC, due the dependent drivers like PMIC8058 core driver and SSBI bus driver are not yet merged into the mainline. So we are sending these patches early to get the feedback from the community.
If you want to refer the PMIC8058 core and SSBI driver then they are here:
PMIC8058 core driver:
https://www.codeaurora.org/gitweb/quic/la/?p=kernel/msm.git;a=blob;f=drivers/mfd/pmic8058.c;h=dc561988c474721d76178ab1a2f82a3a4d1b03a1;hb=refs/heads/msm-2.6.35
Anirudh Ghayal (2):
input: pmic8058-othc: Add support for PM8058 based OTHC
drivers: rtc: Add support for Qualcomm PMIC8058 RTC
Trilok Soni (4):
matrix_keypad: Increase the max limit of rows and columns
input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
led: pmic8058: Add PMIC8058 leds driver
input: pmic8058_pwrkey: Add support for power key
drivers/input/keyboard/Kconfig | 11 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/pmic8058-keypad.c | 769 ++++++++++++++++++++++++++++++ drivers/input/misc/Kconfig | 21 + drivers/input/misc/Makefile | 2 + drivers/input/misc/pmic8058-othc.c | 544 +++++++++++++++++++++ drivers/input/misc/pmic8058-pwrkey.c | 322 +++++++++++++ drivers/leds/Kconfig | 11 + drivers/leds/Makefile | 1 + drivers/leds/leds-pmic8058.c | 405 ++++++++++++++++ drivers/rtc/Kconfig | 9 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pm8058.c | 487 +++++++++++++++++++ include/linux/input/matrix_keypad.h | 8 +- include/linux/input/pmic8058-keypad.h | 58 +++ include/linux/input/pmic8058-othc.h | 117 +++++ include/linux/input/pmic8058-pwrkey.h | 37 ++ include/linux/leds-pmic8058.h | 63 +++ include/linux/rtc/rtc-pm8058.h | 29 ++ 19 files changed, 2892 insertions(+), 4 deletions(-) create mode 100644 drivers/input/keyboard/pmic8058-keypad.c create mode 100644 drivers/input/misc/pmic8058-othc.c create mode 100644 drivers/input/misc/pmic8058-pwrkey.c create mode 100644 drivers/leds/leds-pmic8058.c create mode 100644 drivers/rtc/rtc-pm8058.c create mode 100644 include/linux/input/pmic8058-keypad.h create mode 100644 include/linux/input/pmic8058-othc.h create mode 100644 include/linux/input/pmic8058-pwrkey.h create mode 100644 include/linux/leds-pmic8058.h create mode 100644 include/linux/rtc/rtc-pm8058.h
RFC PATCH 1/6 matrix_keypad: Increase the max limit of rows and columns
Some keyboard controller have support for more than 16 columns and rows.
--- include/linux/input/matrix_keypad.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
include/linux/input/matrix_keypad.h +4 -4
@@ -4,11 +4,11 @@#include <linux/types.h> #include <linux/input.h> -#define MATRIX_MAX_ROWS 16 -#define MATRIX_MAX_COLS 16 +#define MATRIX_MAX_ROWS 18 +#define MATRIX_MAX_COLS 18 -#define KEY (row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\ - (((col) & (MATRIX_MAX_COLS - 1)) << 16) |\ +#define KEY (row, col, val) ((((row) % (MATRIX_MAX_ROWS)) << 24) |\ + (((col) % (MATRIX_MAX_COLS)) << 16) |\ (val & 0xffff))#define KEY_ROW (k) (((k) >> 24) & 0xff)
Signature · 1 line
1.7.0.2
Re: [RFC v1 PATCH 1/6] matrix_keypad: Increase the max limit of rows and columns
Quoted 19 lines · Trilok Soni
Some keyboard controller have support for more than 16 columns and rows.
Cc Dmitry Torokhov <[email protected]>Cc Eric Miao <[email protected]>Signed-off-by Trilok Soni <[email protected]>---
include/linux/input/matrix_keypad.h | 8 ++++----1 files changed, 4 insertions(+), 4 deletions(-)include/linux/input/matrix_keypad.h +0
-1@@ -4,11 +4,11 @@ #include <linux/types.h> #include <linux/input.h> -#define MATRIX_MAX_ROWS 16
include/linux/input/matrix_keypad.h line 13
Quoted 10 lines
include/linux/input/matrix_keypad.h +4
-3-#define MATRIX_MAX_COLS 16 +#define MATRIX_MAX_ROWS 18 +#define MATRIX_MAX_COLS 18 -#define KEY (row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\ - (((col) & (MATRIX_MAX_COLS - 1)) << 16) |\ +#define KEY (row, col, val) ((((row) % (MATRIX_MAX_ROWS)) << 24) |\ + (((col) % (MATRIX_MAX_COLS)) << 16) |\ (val & 0xffff))
Or maybe we can solve this completely by introducing something like:
struct matrix_keycode {
int row;
int col;
int value;
}And make changes to KEY() macro and other places. You may also want to eliminate the hardcoded MATRIX_MAX_* in matrix_keypad.c.
Quoted 5 lines
include/linux/input/matrix_keypad.h +0
-1#define KEY_ROW(k) (((k) >> 24) & 0xff) --1.7.0.2
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 1/6] matrix_keypad: Increase the max limit of rows and columns
Quoted 33 lines · Eric Miao
Quoted 19 lines · Trilok Soni
Some keyboard controller have support for more than 16 columns and rows.
Cc Dmitry Torokhov <[email protected]>Cc Eric Miao <[email protected]>Signed-off-by Trilok Soni <[email protected]>---
include/linux/input/matrix_keypad.h | 8 ++++----1 files changed, 4 insertions(+), 4 deletions(-)include/linux/input/matrix_keypad.h +0
-1@@ -4,11 +4,11 @@ #include <linux/types.h> #include <linux/input.h> -#define MATRIX_MAX_ROWS 16include/linux/input/matrix_keypad.h line 13
Quoted 10 lines
include/linux/input/matrix_keypad.h +4
-3-#define MATRIX_MAX_COLS 16 +#define MATRIX_MAX_ROWS 18 +#define MATRIX_MAX_COLS 18 -#define KEY (row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\ - (((col) & (MATRIX_MAX_COLS - 1)) << 16) |\ +#define KEY (row, col, val) ((((row) % (MATRIX_MAX_ROWS)) << 24) |\ + (((col) % (MATRIX_MAX_COLS)) << 16) |\ (val & 0xffff))Or maybe we can solve this completely by introducing something like:
Quoted 4 lines
struct matrix_keycode {
int row;
int col;
int value;Though that triples the space needed to store initial keymaps.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 1/6] matrix_keypad: Increase the max limit of rows and columns
Quoted 34 lines · Dmitry Torokhov
Quoted 33 lines · Eric Miao
Quoted 19 lines · Trilok Soni
Some keyboard controller have support for more than 16 columns and rows.
Cc Dmitry Torokhov <[email protected]>Cc Eric Miao <[email protected]>Signed-off-by Trilok Soni <[email protected]>---
include/linux/input/matrix_keypad.h | 8 ++++----1 files changed, 4 insertions(+), 4 deletions(-)include/linux/input/matrix_keypad.h +0
-1@@ -4,11 +4,11 @@ #include <linux/types.h> #include <linux/input.h> -#define MATRIX_MAX_ROWS 16include/linux/input/matrix_keypad.h line 13
Quoted 10 lines
include/linux/input/matrix_keypad.h +4
-3-#define MATRIX_MAX_COLS 16 +#define MATRIX_MAX_ROWS 18 +#define MATRIX_MAX_COLS 18 -#define KEY (row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\ - (((col) & (MATRIX_MAX_COLS - 1)) << 16) |\ +#define KEY (row, col, val) ((((row) % (MATRIX_MAX_ROWS)) << 24) |\ + (((col) % (MATRIX_MAX_COLS)) << 16) |\ (val & 0xffff))Or maybe we can solve this completely by introducing something like:
Quoted 7 lines
Quoted 4 lines
struct matrix_keycode { int row; int col; int value;Though that triples the space needed to store initial keymaps.
Looking at it I think we should simply bump up max cols/rows to 32 and be done with it. It will grow the matrix keypad structure by a few bytes but nothing drastic.
Signature · 1 line
Dmitry
RFC PATCH 2/6 input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
In reply to Trilok SoniAdd Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
--- drivers/input/keyboard/Kconfig | 11 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/pmic8058-keypad.c | 769 ++++++++++++++++++++++++++++++ include/linux/input/pmic8058-keypad.h | 58 +++ 4 files changed, 839 insertions(+), 0 deletions(-) create mode 100644 drivers/input/keyboard/pmic8058-keypad.c create mode 100644 include/linux/input/pmic8058-keypad.h
drivers/input/keyboard/Kconfig +11 -0
@@ -364,6 +364,17 @@ config KEYBOARD_PXA930_ROTARY To compile this driver as a module, choose M here: the module will be called pxa930_rotary. +config KEYBOARD_PMIC8058 + tristate "Qualcomm PMIC8058 keypad support" + depends on PMIC8058 + help + Say Y here if you want to enable the driver for the PMIC8058 + keypad provided as a reference design from Qualcomm. This is intended + to support upto 18x8 matrix based keypad design. + + To compile this driver as a module, choose M here: the module will + be called pmic8058-keypad. + config KEYBOARD_SAMSUNG tristate "Samsung keypad support" depends on SAMSUNG_DEV_KEYPAD
drivers/input/keyboard/Makefile +1 -0
@@ -34,6 +34,7 @@ obj-$(CONFIG_KEYBOARD_OMAP4) += omap4-keypad.o obj-$(CONFIG_KEYBOARD_OPENCORES) += opencores-kbd.o obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o +obj-$(CONFIG_KEYBOARD_PMIC8058) += pmic8058-keypad.o obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o obj-$(CONFIG_KEYBOARD_SAMSUNG) += samsung-keypad.o obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o
drivers/input/keyboard/pmic8058-keypad.c new file +769 -0
769 lines not on this page · raw message
include/linux/input/pmic8058-keypad.h new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.7.0.2
Re: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
Hi Dmitry,
Quoted 5 lines · Trilok Soni
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Trilok Soni <[email protected]>
Quoted 8 lines
--- drivers/input/keyboard/Kconfig | 11 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/pmic8058-keypad.c | 769 ++++++++++++++++++++++++++++++ include/linux/input/pmic8058-keypad.h | 58 +++ 4 files changed, 839 insertions(+), 0 deletions(-) create mode 100644 drivers/input/keyboard/pmic8058-keypad.c create mode 100644 include/linux/input/pmic8058-keypad.h
Any comments on this patch?
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
In reply to Trilok SoniQuoted 3 lines · Trilok Soni
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Looks good, just a couple of nitpicks:
drivers/input/keyboard/pmic8058-keypad.c line 109
Quoted 7 lines
drivers/input/keyboard/pmic8058-keypad.c new file +7
-0+struct pmic8058_kp { +const struct pmic8058_keypad_data *pdata; +struct input_dev *input; +int key_sense_irq; +int key_stuck_irq; + +unsigned short *keycodes;
Since the size of keycode table is constant there is no need to allocate it separately (and even if it was variable you still could move it to the end of the structure and allocate together).
drivers/input/keyboard/pmic8058-keypad.c line 284
Quoted 2 lines
drivers/input/keyboard/pmic8058-keypad.c new file +2
-0+ +static int pmic8058_detect_ghost_keys (struct pmic8058_kp *kp,u16 *new_state)
bool
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+{ +int row, found_first =-1 ; +u16 check, row_state; + + check =0 ; +for (row =0 ; row < kp->pdata->num_rows; row++) {
drivers/input/keyboard/pmic8058-keypad.c line 300
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ row_state = (~new_state[row]) & + ((1 << kp->pdata->num_cols) -1 ); + +if (hweight16 (row_state) >1 ) { +if (found_first ==-1 ) + found_first = row; +if (check & row_state) { +dev_dbg (kp->dev,"detected ghost key on row[%d]" +" and row[%d]\n" , found_first, row); +return 1 ;
true
drivers/input/keyboard/pmic8058-keypad.c line 305
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+ } + } + check |= row_state; + } +return 0 ;
false
Quoted 4 lines
drivers/input/keyboard/pmic8058-keypad.c new file +4
-0+static int __devinit pmic8058_kp_probe (struct platform_device *pdev) +{ +struct pmic8058_keypad_data *pdata = pdev->dev.platform_data; +const struct matrix_keymap_data *keymap_data;
drivers/input/keyboard/pmic8058-keypad.c line 514
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+struct pmic8058_kp *kp; +int rc; +unsigned short *keycodes; +u8 ctrl_val; +struct pm8058_chip *pm_chip; + + pm_chip =platform_get_drvdata (pdev); +if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"no parent data passed in\n" ); +return -EFAULT ;
EFAULT is really odd, maybe -EINVAL?
Quoted 31 lines
drivers/input/keyboard/pmic8058-keypad.c new file +31
-0+ } + +/* Check PMIC8058 version. A0 version is not supported */ +if (pm8058_rev (pm_chip) == PM_8058_REV_1p0) { +dev_err (&pdev->dev,"PMIC8058 1.0 version is not supported\n" ); +return -ENODEV ; + } + +if (!pdata || !pdata->num_cols || !pdata->num_rows || + pdata->num_cols >PM8058_MAX_COLS || + pdata->num_rows >PM8058_MAX_ROWS || + pdata->num_cols <PM8058_MIN_COLS || + pdata->num_rows <PM8058_MIN_ROWS ) { +dev_err (&pdev->dev,"invalid platform data\n" ); +return -EINVAL ; + } + +if (pdata->rows_gpio_start <0 || pdata->cols_gpio_start <0 ) { +dev_err (&pdev->dev,"invalid gpio_start platform data\n" ); +return -EINVAL ; + } + +if (!pdata->scan_delay_ms || pdata->scan_delay_ms >MAX_SCAN_DELAY + || pdata->scan_delay_ms <MIN_SCAN_DELAY || + !is_power_of_2 (pdata->scan_delay_ms)) { +dev_err (&pdev->dev,"invalid keypad scan time supplied\n" ); +return -EINVAL ; + } + + if (!pdata->row_hold_ns || pdata->row_hold_ns > MAX_ROW_HOLD_DELAY + || pdata->row_hold_ns < MIN_ROW_HOLD_DELAY ||
drivers/input/keyboard/pmic8058-keypad.c line 555
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ ((pdata->row_hold_ns % MIN_ROW_HOLD_DELAY) != 0)) { +dev_err (&pdev->dev,"invalid keypad row hold time supplied\n" ); +return -EINVAL ; + } + +if (!pdata->debounce_ms + || ((pdata->debounce_ms %5 ) !=0 ) + || pdata->debounce_ms >MAX_DEBOUNCE_TIME + || pdata->debounce_ms <MIN_DEBOUNCE_TIME ) { +dev_err (&pdev->dev,"invalid debounce time supplied\n" );
Mixing style (logical || either in front of expression or after), please use same style (and I prefer after).
Quoted 47 lines
drivers/input/keyboard/pmic8058-keypad.c new file +47
-0+return -EINVAL ; + } + + keymap_data = pdata->keymap_data; +if (!keymap_data) { +dev_err (&pdev->dev,"no keymap data supplied\n" ); +return -EINVAL ; + } + + kp =kzalloc (sizeof (*kp),GFP_KERNEL ); +if (!kp) +return -ENOMEM ; + + keycodes =kzalloc (PM8058_MATRIX_MAX_SIZE *sizeof (*keycodes), +GFP_KERNEL ); +if (!keycodes) { + rc = -ENOMEM ; + goto err_alloc_mem; + } + +platform_set_drvdata (pdev, kp); + + kp->pdata = pdata; + kp->dev = &pdev->dev; + kp->keycodes = keycodes; + kp->pm_chip = pm_chip; + + kp->input =input_allocate_device (); +if (!kp->input) { +dev_err (&pdev->dev,"unable to allocate input device\n" ); + rc = -ENOMEM ; + goto err_alloc_device; + } + + kp->key_sense_irq =platform_get_irq (pdev,0 ); +if (kp->key_sense_irq <0 ) { +dev_err (&pdev->dev,"unable to get keypad sense irq\n" ); + rc = -ENXIO ; + goto err_get_irq; + } + + kp->key_stuck_irq =platform_get_irq (pdev,1 ); +if (kp->key_stuck_irq <0 ) { +dev_err (&pdev->dev,"unable to get keypad stuck irq\n" ); + rc = -ENXIO ; + goto err_get_irq; + }
drivers/input/keyboard/pmic8058-keypad.c line 612
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ +if (pdata->input_name) + kp->input->name = pdata->input_name; +else + kp->input->name ="PMIC8058 keypad" ; + +if (pdata->input_phys_device) + kp->input->phys = pdata->input_phys_device; +else + kp->input->phys ="pmic8058_keypad/input0" ;
kp->input->phys = pdata->input_phys_device ?: "pmic8058_keypad/input0";
Is shorter.
Thanks.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
In reply to Trilok SoniHi Trilok,
Quoted 3 lines · Trilok Soni
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Looks very good, just a couple of small things:
Review
Quoted 2 lines
(quoted diff) +2
-0+ +#include <linux/input/pmic8058-keypad.h>
Move to MFD directory with the rest of pmic8058 definitions?
drivers/input/keyboard/pmic8058-keypad.c line 109
Quoted 8 lines
+ */
drivers/input/keyboard/pmic8058-keypad.c new file +7
-0+struct pmic8058_kp { +const struct pmic8058_keypad_data *pdata; +struct input_dev *input; +int key_sense_irq; +int key_stuck_irq; + +unsigned short *keycodes;
I'd pull the keycodes into this structure (at the end) so it can be allocated in one shot. Hmm it even appears to be constant-sized. So just declare it right here and be done with it.
drivers/input/keyboard/pmic8058-keypad.c line 284
Quoted 2 lines
drivers/input/keyboard/pmic8058-keypad.c new file +2
-0+ +static int pmic8058_detect_ghost_keys (struct pmic8058_kp *kp,u16 *new_state)
bool
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+{ +int row, found_first =-1 ; +u16 check, row_state; + + check =0 ; +for (row =0 ; row < kp->pdata->num_rows; row++) {
drivers/input/keyboard/pmic8058-keypad.c line 300
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ row_state = (~new_state[row]) & + ((1 << kp->pdata->num_cols) -1 ); + +if (hweight16 (row_state) >1 ) { +if (found_first ==-1 ) + found_first = row; +if (check & row_state) { +dev_dbg (kp->dev,"detected ghost key on row[%d]" +" and row[%d]\n" , found_first, row); +return 1 ;
true
drivers/input/keyboard/pmic8058-keypad.c line 305
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+ } + } + check |= row_state; + } +return 0 ;
false
drivers/input/keyboard/pmic8058-keypad.c line 404
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+ +static int pmic8058_kpd_init (struct pmic8058_kp *kp) +{ +int bits, rc, cycles; +u8 scan_val =0 , ctrl_val =0 ; +static u8 row_bits[] = {
const?
Quoted 41 lines
drivers/input/keyboard/pmic8058-keypad.c new file +41
-0+ 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, + }; + +} + +static int pmic8058_kp_enable (struct pmic8058_kp *kp) +{ +int rc; + + kp->ctrl_reg |=KEYP_CTRL_KEYP_EN ; + + rc =pmic8058_kp_write_u8 (kp, kp->ctrl_reg,KEYP_CTRL ); +if (rc <0 ) +return rc; + +enable_irq (kp->key_sense_irq); +enable_irq (kp->key_stuck_irq); + +return rc; +} + +static int pmic8058_kp_disable (struct pmic8058_kp *kp) +{ +int rc; + + kp->ctrl_reg &= ~KEYP_CTRL_KEYP_EN ; + + rc =pmic8058_kp_write_u8 (kp, kp->ctrl_reg,KEYP_CTRL ); +if (rc <0 ) +return rc; + +disable_irq (kp->key_sense_irq); +disable_irq (kp->key_stuck_irq); + +return rc; +} + +static int pmic8058_kp_open (struct input_dev *dev) +{ +struct pmic8058_kp *kp =input_get_drvdata (dev); +
drivers/input/keyboard/pmic8058-keypad.c line 490
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+return pmic8058_kp_enable (kp); +} + +static void pmic8058_kp_close (struct input_dev *dev) +{ +struct pmic8058_kp *kp =input_get_drvdata (dev); + +pmic8058_kp_disable (kp); +} +
You need to protect suspend/resume from racing with open_close. Take dev->mutex and act depending on whether there are users of the device.
drivers/input/keyboard/pmic8058-keypad.c line 534
Quoted 3 lines
drivers/input/keyboard/pmic8058-keypad.c new file +3
-0+if (pdata->rows_gpio_start <0 || pdata->cols_gpio_start <0 ) { +dev_err (&pdev->dev,"invalid gpio_start platform data\n" ); +return -EINVAL ;
These are declared as unsigned. Hmm, doesn't sparse catch it?
Thanks.
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
Hi Dmitry
Quoted 8 lines · Dmitry Torokhov
Hi Trilok,
Quoted 3 lines · Trilok Soni
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Looks very good, just a couple of small things:
Thanks for reviewing same revision of the patch again :)
Quoted 5 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ +#include <linux/input/pmic8058-keypad.h>Move to MFD directory with the rest of pmic8058 definitions?
As discussed earlier we can either have one big header file having all of the sub-device(s) or have separate file for each sub-device driver, I need to check which one would be better but I will atleast move pmic8058-keypad.h header to "mfd" directory, as these patch series is in RFC state, we can have final changes like along with when core-driver gets submitted for review.
Quoted 13 lines
drivers/input/keyboard/pmic8058-keypad.c line 109
Quoted 9 lines
+ */
drivers/input/keyboard/pmic8058-keypad.c new file +7
-0+struct pmic8058_kp { +const struct pmic8058_keypad_data *pdata; +struct input_dev *input; +int key_sense_irq; +int key_stuck_irq; + +unsigned short *keycodes;I'd pull the keycodes into this structure (at the end) so it can be allocated in one shot. Hmm it even appears to be constant-sized. So just declare it right here and be done with it.
Done. You had already commented on it during the 1st review :)
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c line 284
Quoted 3 lines
drivers/input/keyboard/pmic8058-keypad.c new file +2
-0+ +static int pmic8058_detect_ghost_keys (struct pmic8058_kp *kp,u16 *new_state)bool
Done.
Quoted 20 lines
Quoted 7 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+{ +int row, found_first =-1 ; +u16 check, row_state; + + check =0 ; +for (row =0 ; row < kp->pdata->num_rows; row++) {drivers/input/keyboard/pmic8058-keypad.c line 300
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ row_state = (~new_state[row]) & + ((1 << kp->pdata->num_cols) -1 ); + +if (hweight16 (row_state) >1 ) { +if (found_first ==-1 ) + found_first = row; +if (check & row_state) { +dev_dbg (kp->dev,"detected ghost key on row[%d]" +" and row[%d]\n" , found_first, row); +return 1 ;true
Quoted 7 lines
drivers/input/keyboard/pmic8058-keypad.c line 305
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+ } + } + check |= row_state; + } +return 0 ;false
Done.
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c line 404
Quoted 7 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+ +static int pmic8058_kpd_init (struct pmic8058_kp *kp) +{ +int bits, rc, cycles; +u8 scan_val =0 , ctrl_val =0 ; +static u8 row_bits[] = {const?
Quoted 2 lines
drivers/input/keyboard/pmic8058-keypad.c line 406
Quoted 2 lines
drivers/input/keyboard/pmic8058-keypad.c new file +2
-0+ 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, + };
Sure.
Quoted 10 lines
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ +static int pmic8058_kp_open (struct input_dev *dev) +{ +struct pmic8058_kp *kp =input_get_drvdata (dev); + +return pmic8058_kp_enable (kp); +} + +static void pmic8058_kp_close (struct input_dev *dev) +{
Quoted 8 lines
drivers/input/keyboard/pmic8058-keypad.c line 490
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+struct pmic8058_kp *kp =input_get_drvdata (dev); + +pmic8058_kp_disable (kp); +} +You need to protect suspend/resume from racing with
open_close. Takedev->mutexand act depending on whether there are users of the device.
Sure.
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c line 534
Quoted 4 lines
drivers/input/keyboard/pmic8058-keypad.c new file +3
-0+if (pdata->rows_gpio_start <0 || pdata->cols_gpio_start <0 ) { +dev_err (&pdev->dev,"invalid gpio_start platform data\n" ); +return -EINVAL ;These are declared as unsigned. Hmm, doesn't sparse catch it?
I will fix it.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
Quoted 5 lines · Trilok Soni
Hi Dmitry
Quoted 2 lines · Dmitry Torokhov
Hi Trilok,
Quoted 9 lines
Quoted 6 lines · Trilok Soni
Quoted 3 lines
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Looks very good, just a couple of small things:
Thanks for reviewing same revision of the patch again :)
Oops ;) Did I need to review something else from you then? I have a nagging feeling that I have a patch outstanding...
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
Hi Dmitry,
Quoted 4 lines · Dmitry Torokhov
Oops ;) Did I need to review something else from you then? I have a nagging feeling that I have a patch outstanding...
You need to review PMIC8058 OTHC patch.
https://patchwork.kernel.org/patch/314092/
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [rtc-linux] Re: [RFC v1 PATCH 2/6] input: pm8058_keypad: Qualcomm PMIC8058 keypad controller driver
In reply to Dmitry TorokhovHi Dimitry,
Quoted 114 lines · Dmitry Torokhov
Hi Trilok,
Quoted 3 lines · Trilok Soni
Add Qualcomm PMIC8058 based keypad controller driver supporting upto 18x8 matrix configuration.
Looks very good, just a couple of small things:
Review
Quoted 2 lines
(quoted diff) +2
-0+ +#include<linux/input/pmic8058-keypad.h>Move to MFD directory with the rest of pmic8058 definitions?
drivers/input/keyboard/pmic8058-keypad.c line 109
Quoted 8 lines
+ */
drivers/input/keyboard/pmic8058-keypad.c new file +7
-0+struct pmic8058_kp { +const struct pmic8058_keypad_data *pdata; +struct input_dev *input; +int key_sense_irq; +int key_stuck_irq; + +unsigned short *keycodes;I'd pull the keycodes into this structure (at the end) so it can be allocated in one shot. Hmm it even appears to be constant-sized. So just declare it right here and be done with it.
drivers/input/keyboard/pmic8058-keypad.c line 284
Quoted 2 lines
drivers/input/keyboard/pmic8058-keypad.c new file +2
-0+ +static int pmic8058_detect_ghost_keys (struct pmic8058_kp *kp,u16 *new_state)bool
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+{ +int row, found_first =-1 ; +u16 check, row_state; + + check =0 ; +for (row =0 ; row< kp->pdata->num_rows; row++) {drivers/input/keyboard/pmic8058-keypad.c line 300
Quoted 10 lines
drivers/input/keyboard/pmic8058-keypad.c new file +10
-0+ row_state = (~new_state[row])& + ((1 << kp->pdata->num_cols) -1 ); + +if (hweight16 (row_state)>1 ) { +if (found_first ==-1 ) + found_first = row; +if (check& row_state) { +dev_dbg (kp->dev,"detected ghost key on row[%d]" +" and row[%d]\n" , found_first, row); +return 1 ;true
drivers/input/keyboard/pmic8058-keypad.c line 305
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+ } + } + check |= row_state; + } +return 0 ;false
drivers/input/keyboard/pmic8058-keypad.c line 404
Quoted 6 lines
drivers/input/keyboard/pmic8058-keypad.c new file +6
-0+ +static int pmic8058_kpd_init (struct pmic8058_kp *kp) +{ +int bits, rc, cycles; +u8 scan_val =0 , ctrl_val =0 ; +static u8 row_bits[] = {const?
Quoted 46 lines
drivers/input/keyboard/pmic8058-keypad.c new file +46
-0+ 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, + }; + +} + +static int pmic8058_kp_enable (struct pmic8058_kp *kp) +{ +int rc; + + kp->ctrl_reg |=KEYP_CTRL_KEYP_EN ; + + rc =pmic8058_kp_write_u8 (kp, kp->ctrl_reg,KEYP_CTRL ); +if (rc<0 ) +return rc; + +enable_irq (kp->key_sense_irq); +enable_irq (kp->key_stuck_irq); + +return rc; +} + +static int pmic8058_kp_disable (struct pmic8058_kp *kp) +{ +int rc; + + kp->ctrl_reg&= ~KEYP_CTRL_KEYP_EN ; + + rc =pmic8058_kp_write_u8 (kp, kp->ctrl_reg,KEYP_CTRL ); +if (rc<0 ) +return rc; + +disable_irq (kp->key_sense_irq); +disable_irq (kp->key_stuck_irq); + +return rc; +} + +static int pmic8058_kp_open (struct input_dev *dev) +{ +struct pmic8058_kp *kp =input_get_drvdata (dev); + +return pmic8058_kp_enable (kp); +} + +static void pmic8058_kp_close (struct input_dev *dev) +{
Quoted 8 lines
drivers/input/keyboard/pmic8058-keypad.c line 490
Quoted 5 lines
drivers/input/keyboard/pmic8058-keypad.c new file +5
-0+struct pmic8058_kp *kp =input_get_drvdata (dev); + +pmic8058_kp_disable (kp); +} +You need to protect suspend/resume from racing with
open_close. Takedev->mutexand act depending on whether there are users of the device.
In our case, we can only disable/enable the keypad in suspend/resume if the device is not configured as wakeup. The call pmic8058_kp_disable(kp) disables the keypad totally rather than placing it in the low power mode (the hardware does support this capability). So, we plan to add the race check only if the device is not configured as wakeup capable.
Quoted 9 lines
drivers/input/keyboard/pmic8058-keypad.c line 534
Quoted 4 lines
drivers/input/keyboard/pmic8058-keypad.c new file +3
-0+if (pdata->rows_gpio_start<0 || pdata->cols_gpio_start<0 ) { +dev_err (&pdev->dev,"invalid gpio_start platform data\n" ); +return -EINVAL ;These are declared as unsigned. Hmm, doesn't sparse catch it?
Thanks.
Thanks,
Anirudh
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
RFC PATCH 3/6 led: pmic8058: Add PMIC8058 leds driver
In reply to Trilok SoniAdd support for Qualcomm PMIC8058 keyboard
backlight, flash and low current leds.
--- drivers/leds/Kconfig | 11 + drivers/leds/Makefile | 1 + drivers/leds/leds-pmic8058.c | 405 +++++++++++++++++++++++++++++++++++++++++ include/linux/leds-pmic8058.h | 63 +++++++ 4 files changed, 480 insertions(+), 0 deletions(-) create mode 100644 drivers/leds/leds-pmic8058.c create mode 100644 include/linux/leds-pmic8058.h
drivers/leds/Kconfig +11 -0
@@ -214,6 +214,17 @@ config LEDS_PCA955X LED driver chips accessed via the I2C bus. Supported devices include PCA9550, PCA9551, PCA9552, and PCA9553. +config LEDS_PMIC8058 + tristate "LED Support for Qualcomm PMIC8058" + depends on PMIC8058 + help + This option enables support for LEDs connected over PMIC8058 + (Power Management IC) chip on Qualcomm reference boards, + for example SURF and FFAs. + + To compile this driver as a module, choose M here: the module will + be called leds-pmic8058. + config LEDS_WM831X_STATUS tristate "LED support for status LEDs on WM831x PMICs" depends on MFD_WM831X
drivers/leds/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_SUNFIRE) += leds-sunfire.o obj-$(CONFIG_LEDS_PCA9532) += leds-pca9532.o +obj-$(CONFIG_LEDS_PMIC8058) += leds-pmic8058.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
drivers/leds/leds-pmic8058.c new file +405 -0
405 lines not on this page · raw message
include/linux/leds-pmic8058.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
1.7.0.2
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Quoted 113 lines · Trilok Soni
Add support for Qualcomm PMIC8058 keyboard
backlight, flash and low current leds.Cc Richard Purdie <[email protected]>Signed-off-by Trilok Soni <[email protected]>--- drivers/leds/Kconfig | 11 + drivers/leds/Makefile | 1 + drivers/leds/leds-pmic8058.c | 405 +++++++++++++++++++++++++++++++++++++++++ include/linux/leds-pmic8058.h | 63 +++++++ 4 files changed, 480 insertions(+), 0 deletions(-) create mode 100644 drivers/leds/leds-pmic8058.c create mode 100644 include/linux/leds-pmic8058.hdrivers/leds/Kconfig +11
-0@@ -214,6 +214,17 @@ config LEDS_PCA955X LED driver chips accessed via the I2C bus. Supported devices include PCA9550, PCA9551, PCA9552, and PCA9553. +config LEDS_PMIC8058 + tristate "LED Support for Qualcomm PMIC8058" + depends on PMIC8058 + help + This option enables support for LEDs connected over PMIC8058 + (Power Management IC) chip on Qualcomm reference boards, + for example SURF and FFAs. + + To compile this driver as a module, choose M here: the module will + be called leds-pmic8058. + config LEDS_WM831X_STATUS tristate "LED support for status LEDs on WM831x PMICs" depends on MFD_WM831Xdrivers/leds/Makefile +1
-0@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_SUNFIRE) += leds-sunfire.o obj-$(CONFIG_LEDS_PCA9532) += leds-pca9532.o +obj-$(CONFIG_LEDS_PMIC8058) += leds-pmic8058.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_LP3944) += leds-lp3944.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.odrivers/leds/leds-pmic8058.c new file +59
-0@@ -0,0 +1,405 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/platform_device.h> +#include <linux/leds.h> +#include <linux/workqueue.h> +#include <linux/spinlock.h> +#include <linux/mfd/pmic8058.h> +#include <linux/leds-pmic8058.h> + +#define SSBI_REG_ADDR_DRV_KEYPAD 0x48 +#define PM8058_DRV_KEYPAD_BL_MASK 0xf0 +#define PM8058_DRV_KEYPAD_BL_SHIFT 0x04 + +#define SSBI_REG_ADDR_FLASH_DRV0 0x49 +#define PM8058_DRV_FLASH_MASK 0xf0 +#define PM8058_DRV_FLASH_SHIFT 0x04 + +#define SSBI_REG_ADDR_FLASH_DRV1 0xFB + +#define SSBI_REG_ADDR_LED_CTRL_BASE 0x131 +#define SSBI_REG_ADDR_LED_CTRL (n) (SSBI_REG_ADDR_LED_CTRL_BASE + (n)) +#define PM8058_DRV_LED_CTRL_MASK 0xf8 +#define PM8058_DRV_LED_CTRL_SHIFT 0x03 + +#define MAX_FLASH_LED_CURRENT 300 +#define MAX_LC_LED_CURRENT 40 +#define MAX_KP_BL_LED_CURRENT 300 + +#define MAX_KEYPAD_BL_LEVEL (1 << 4) +#define MAX_LED_DRV_LEVEL 20/* 2 * 20 mA */ + +#define PMIC8058_LED_OFFSET (id) ((id) - PMIC8058_ID_LED_0) + +#define PMIC8058_MAX_LEDS 7 + +/** +* struct pmic8058_led_data - internal led data structure +* @led_classdev - led class device +* @id - led index +* @led_brightness - led brightness levels +* @pm_chip - parent MFD core device +* @work - workqueue for led
drivers/leds/leds-pmic8058.c line 69
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+* @lock - to protect the transactions +* @value_lock - to protect the register value writes +* @reg_kp - cached value of keypad led backlight register +* @reg_led_ctrl - cached values of low-current led registers +* @reg_flash_led0 - cached value of first flash led control register +* @reg_flash_led1 - cached value of second flash led control register +*/ +struct pmic8058_led_data { +struct led_classdev cdev; +int id;
"enum pmic8058_leds" instead of int
drivers/leds/leds-pmic8058.c line 78
Quoted 9 lines
drivers/leds/leds-pmic8058.c new file +9
-0+enum led_brightness brightness; +struct pm8058_chip *pm_chip; +struct work_struct work; +struct mutex lock; +spinlock_t value_lock; +u8 reg_kp; +u8 reg_led_ctrl[3 ]; +u8 reg_flash_led0; +u8 reg_flash_led1;
You allocate a separate pmic8058_led_data for each led, so one "u8 reg" should be sufficient.
drivers/leds/leds-pmic8058.c line 89
Quoted 11 lines
drivers/leds/leds-pmic8058.c new file +11
-0+}; + +#define PM8058_MAX_LEDS 7 + +static void led_kp_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +int rc; +u8 level; +unsigned long flags; + +spin_lock_irqsave (&led->value_lock, flags);
This function is only ever called from within the workqueue so there is no need for locking.
Quoted 12 lines
drivers/leds/leds-pmic8058.c new file +12
-0+ level = (value <<PM8058_DRV_KEYPAD_BL_SHIFT ) & +PM8058_DRV_KEYPAD_BL_MASK ; + + led->reg_kp &= ~PM8058_DRV_KEYPAD_BL_MASK ; + led->reg_kp |= level; +spin_unlock_irqrestore (&led->value_lock, flags); + + rc =pm8058_write (led->pm_chip,SSBI_REG_ADDR_DRV_KEYPAD , + &led->reg_kp,1 ); +if (rc <0 ) +dev_err (led->cdev.dev,"can't set keypad backlight level\n" ); +}
drivers/leds/leds-pmic8058.c line 111
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+ +static enum led_brightness led_kp_get (struct pmic8058_led_data *led) +{ +if ((led->reg_kp &PM8058_DRV_KEYPAD_BL_MASK ) >> +PM8058_DRV_KEYPAD_BL_SHIFT ) +return LED_FULL ; +else +return LED_OFF ; +} +
Shouldn't you be returning the actual brightness here instead of only either on or off? The brightness is btw. stored in led->brightness, so you can use the same getter for all three types of leds.
drivers/leds/leds-pmic8058.c line 118
Quoted 7 lines
drivers/leds/leds-pmic8058.c new file +7
-0+static void led_lc_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +unsigned long flags; +int rc, offset; +u8 level, tmp; + +spin_lock_irqsave (&led->value_lock, flags);
This function is only ever called from within the workqueue so there is no need for locking.
Quoted 28 lines
drivers/leds/leds-pmic8058.c new file +28
-0+ + level = (led->brightness <<PM8058_DRV_LED_CTRL_SHIFT ) & +PM8058_DRV_LED_CTRL_MASK ; + + offset =PMIC8058_LED_OFFSET (led->id); + tmp = led->reg_led_ctrl[offset]; + + tmp &= ~PM8058_DRV_LED_CTRL_MASK ; + tmp |= level; +spin_unlock_irqrestore (&led->value_lock, flags); + + rc =pm8058_write (led->pm_chip,SSBI_REG_ADDR_LED_CTRL (offset), + &tmp,1 ); +if (rc) { +dev_err (led->cdev.dev,"can't set (%d) led value\n" , + led->id); +return ; + } + +spin_lock_irqsave (&led->value_lock, flags); + led->reg_led_ctrl[offset] = tmp; +spin_unlock_irqrestore (&led->value_lock, flags); +} + +static enum led_brightness led_lc_get (struct pmic8058_led_data *led) +{ +int offset; +u8 value;
drivers/leds/leds-pmic8058.c line 156
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+ + offset =PMIC8058_LED_OFFSET (led->id); + value = led->reg_led_ctrl[offset]; + +if ((value &PM8058_DRV_LED_CTRL_MASK ) >> +PM8058_DRV_LED_CTRL_SHIFT ) +return LED_FULL ; +else +return LED_OFF ; +}
See above.
drivers/leds/leds-pmic8058.c line 167
Quoted 11 lines
drivers/leds/leds-pmic8058.c new file +11
-0+ +static void +led_flash_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +int rc; +u8 level; +unsigned long flags; +u8 reg_flash_led; +u16 reg_addr; + +spin_lock_irqsave (&led->value_lock, flags);
This function is only ever called from within the workqueue so there is no need for locking.
Quoted 19 lines
drivers/leds/leds-pmic8058.c new file +19
-0+ level = (value <<PM8058_DRV_FLASH_SHIFT ) & +PM8058_DRV_FLASH_MASK ; + +if (led->id ==PMIC8058_ID_FLASH_LED_0 ) { + led->reg_flash_led0 &= ~PM8058_DRV_FLASH_MASK ; + led->reg_flash_led0 |= level; + reg_flash_led = led->reg_flash_led0; + reg_addr =SSBI_REG_ADDR_FLASH_DRV0 ; + }else { + led->reg_flash_led1 &= ~PM8058_DRV_FLASH_MASK ; + led->reg_flash_led1 |= level; + reg_flash_led = led->reg_flash_led1; + reg_addr =SSBI_REG_ADDR_FLASH_DRV1 ; + } +spin_unlock_irqrestore (&led->value_lock, flags); + + rc =pm8058_write (led->pm_chip, reg_addr, ®_flash_led,1 ); +if (rc <0 ) + dev_err(led->cdev.dev, "can't set flash led%d level\n",
drivers/leds/leds-pmic8058.c line 196
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+ led->id); +} + +static void pmic8058_led_work (struct work_struct *work) +{ +struct pmic8058_led_data *led =container_of (work, + struct pmic8058_led_data, work); + +mutex_lock (&led->lock); +
Since this is a workqueue and there will only one running instance per led at a time there is no need to take a lock here.
Quoted 17 lines
drivers/leds/leds-pmic8058.c new file +17
-0+switch (led->id) { +case PMIC8058_ID_LED_KB_LIGHT : +led_kp_set (led, led->brightness); +break ; +case PMIC8058_ID_LED_0 : +case PMIC8058_ID_LED_1 : +case PMIC8058_ID_LED_2 : +led_lc_set (led, led->brightness); +break ; +case PMIC8058_ID_FLASH_LED_0 : +case PMIC8058_ID_FLASH_LED_1 : +led_flash_set (led, led->brightness); +break ; + } + +mutex_unlock (&led->lock); +}
drivers/leds/leds-pmic8058.c line 223
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+ +static void pmic8058_led_set (struct led_classdev *led_cdev, +enum led_brightness value) +{ +struct pmic8058_led_data *led; +unsigned long flags; + + led = container_of(led_cdev, struct pmic8058_led_data, cdev); + +spin_lock_irqsave (&led->value_lock, flags);
Locking is not really required here since it is only a single assignment...
drivers/leds/leds-pmic8058.c line 225
Quoted 2 lines
drivers/leds/leds-pmic8058.c new file +2
-0+ led->brightness = value; +schedule_work (&led->work);
and scheudule_work does not have to be inside of the lock.
drivers/leds/leds-pmic8058.c line 233
Quoted 8 lines
drivers/leds/leds-pmic8058.c new file +8
-0+spin_unlock_irqrestore (&led->value_lock, flags); +} + +static enum led_brightness pmic8058_led_get (struct led_classdev *led_cdev) +{ +struct pmic8058_led_data *led; + + led = container_of(led_cdev, struct pmic8058_led_data, cdev);
return led->brightness; (See above)
drivers/leds/leds-pmic8058.c line 246
Quoted 13 lines
drivers/leds/leds-pmic8058.c new file +13
-0+ +switch (led->id) { +case PMIC8058_ID_LED_KB_LIGHT : +return led_kp_get (led); +case PMIC8058_ID_LED_0 : +case PMIC8058_ID_LED_1 : +case PMIC8058_ID_LED_2 : +return led_lc_get (led); + } +return LED_OFF ; +} + +static int pmic8058_led_probe (struct platform_device *pdev)
__devinit
drivers/leds/leds-pmic8058.c line 259
Quoted 13 lines
drivers/leds/leds-pmic8058.c new file +13
-0+{ +struct pmic8058_leds_platform_data *pdata = pdev->dev.platform_data; +struct pmic8058_led_data *led_dat; +struct pmic8058_led *curr_led; +int rc, i =0 ; +struct pm8058_chip *pm_chip; +u8 reg_kp; +u8 reg_led_ctrl[3 ]; +u8 reg_flash_led0; +u8 reg_flash_led1; +static struct pmic8058_led_data *led; + + pm_chip =platform_get_drvdata (pdev);
This looks at least a bit bogus since you'll overwrite the drvdata later. Can't you get the pm8058_chip through pdev->dev.parent somehow?
drivers/leds/leds-pmic8058.c line 262
Quoted 3 lines
drivers/leds/leds-pmic8058.c new file +3
-0+if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"no parent data passed in\n" ); +return -EFAULT ;
-EINVAL
drivers/leds/leds-pmic8058.c line 273
Quoted 11 lines
drivers/leds/leds-pmic8058.c new file +11
-0+ } + +if (pdata ==NULL ) { +dev_err (&pdev->dev,"platform data not supplied\n" ); +return -EINVAL ; + } + +if (pdata->num_leds >PMIC8058_MAX_LEDS ) { +dev_err (&pdev->dev,"can't handle more than %d LEDS\n" , +PMIC8058_MAX_LEDS ); +return -EFAULT ;
-EINVAL
drivers/leds/leds-pmic8058.c line 276
Quoted 3 lines
drivers/leds/leds-pmic8058.c new file +3
-0+ } + + led =kzalloc (sizeof (*led) * pdata->num_leds,GFP_KERNEL );
Use kcalloc instead of kzalloc.
Quoted 22 lines
drivers/leds/leds-pmic8058.c new file +22
-0+if (led ==NULL ) { +dev_err (&pdev->dev,"failed to alloc memory\n" ); +return -ENOMEM ; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_DRV_KEYPAD , ®_kp, +1 ); +if (rc) { +dev_err (&pdev->dev,"can't get keypad backlight level\n" ); + goto err_reg_read; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_LED_CTRL_BASE , + reg_led_ctrl,3 ); +if (rc) { +dev_err (&pdev->dev,"can't get led levels\n" ); + goto err_reg_read; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_FLASH_DRV0 , + ®_flash_led0,1 ); +if (rc) {
drivers/leds/leds-pmic8058.c line 308
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+dev_err (&pdev->dev,"can't read flash led0\n" ); + goto err_reg_read; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_FLASH_DRV1 , + ®_flash_led1,1 ); +if (rc) { +dev_err (&pdev->dev,"can't get flash led1\n" ); + goto err_reg_read; + }
How about adding a helper function which will initializes the leds 'reg' field depending on its id? It will certainly to improve code readability.
Quoted 57 lines
drivers/leds/leds-pmic8058.c new file +57
-0+ +for (i =0 ; i < pdata->num_leds; i++) { + curr_led = &pdata->leds[i]; + led_dat = &led[curr_led->id]; + + led_dat->cdev.name = curr_led->name; + led_dat->cdev.default_trigger = curr_led->default_trigger; + led_dat->cdev.brightness_set = pmic8058_led_set; + led_dat->cdev.brightness_get = pmic8058_led_get; + led_dat->cdev.brightness =LED_OFF ; + led_dat->cdev.max_brightness = curr_led->max_brightness; + led_dat->cdev.flags =LED_CORE_SUSPENDRESUME ; + + led_dat->id = curr_led->id; + led_dat->reg_kp = reg_kp; +memcpy (led->reg_led_ctrl, reg_led_ctrl, +sizeof (reg_led_ctrl)); + led_dat->reg_flash_led0 = reg_flash_led0; + led_dat->reg_flash_led1 = reg_flash_led1; + +if (!((led_dat->id >=PMIC8058_ID_LED_KB_LIGHT ) && + (led_dat->id <=PMIC8058_ID_FLASH_LED_1 ))) { +dev_err (&pdev->dev,"invalid LED ID (%d) specified\n" , + led_dat->id); + rc = -EINVAL ; + goto fail_id_check; + } + + led_dat->pm_chip = pm_chip; + +mutex_init (&led_dat->lock); +spin_lock_init (&led_dat->value_lock); +INIT_WORK (&led_dat->work, pmic8058_led_work); + + rc =led_classdev_register (&pdev->dev, &led_dat->cdev); +if (rc) { +dev_err (&pdev->dev,"unable to register led %d\n" , + led_dat->id); + goto fail_id_check; + } + } + +platform_set_drvdata (pdev, led); + +return 0 ; + +err_reg_read: +kfree (led); +fail_id_check: +if (i >0 ) { +for (i = i -1 ; i >=0 ; i--) +led_classdev_unregister (&led[i].cdev); + } +return rc; +} + +static int __devexit pmic8058_led_remove(struct platform_device *pdev)
drivers/leds/leds-pmic8058.c line 375
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+{ +int i; +struct pmic8058_leds_platform_data *pdata = pdev->dev.platform_data; +struct pmic8058_led_data *led =platform_get_drvdata (pdev); + +for (i =0 ; i < pdata->num_leds; i++) { +mutex_destroy (&led[led->id].lock); +led_classdev_unregister (&led[led->id].cdev); +cancel_work_sync (&led[led->id].work); + }
You need to free the 'led' array.
Quoted 75 lines
drivers/leds/leds-pmic8058.c new file +30
-0+ +return 0 ; +} + +static struct platform_driver pmic8058_led_driver = { + .probe = pmic8058_led_probe, + .remove =__devexit_p (pmic8058_led_remove), + .driver = { + .name ="pm8058-led" , + .owner =THIS_MODULE , + }, +}; + +static int __init pmic8058_led_init (void ) +{ +return platform_driver_register (&pmic8058_led_driver); +} +module_init (pmic8058_led_init); + +static void __exit pmic8058_led_exit(void) +{ +platform_driver_unregister (&pmic8058_led_driver); +} +module_exit (pmic8058_led_exit); + +MODULE_DESCRIPTION ("PMIC8058 LEDs driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_VERSION ("1.0" ); +MODULE_ALIAS ("platform:pmic8058-led" ); +MODULE_AUTHOR ("Trilok Soni <[email protected]>" );include/linux/leds-pmic8058.h new file +39
-0@@ -0,0 +1,63 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __LEDS_PMIC8058_H__ +#define __LEDS_PMIC8058_H__ + +/** +* enum pmic8058_leds - PMIC8058 supported led ids +* @PMIC8058_ID_LED_KB_LIGHT - keyboard backlight led +* @PMIC8058_ID_LED_0 - First low current led +* @PMIC8058_ID_LED_1 - Second low current led +* @PMIC8058_ID_LED_2 - Third low current led +* @PMIC8058_ID_FLASH_LED_0 - First flash led +* @PMIC8058_ID_FLASH_LED_0 - Second flash led +*/ +enum pmic8058_leds { +PMIC8058_ID_LED_KB_LIGHT =1 , +PMIC8058_ID_LED_0 , +PMIC8058_ID_LED_1 , +PMIC8058_ID_LED_2 , +PMIC8058_ID_FLASH_LED_0 , +PMIC8058_ID_FLASH_LED_1 , +}; + +/**
include/linux/leds-pmic8058.h line 49
Quoted 10 lines
include/linux/leds-pmic8058.h new file +10
-0+* struct pmic8058_led - per led data +* @name - name of the led +* @default_trigger - default trigger which needs to e attached +* @max_brightness - maximum brightness level supported by the led +* @id - supported led id +*/ +struct pmic8058_led { +const char *name; +const char *default_trigger; +unsigned max_brightness;
Should max_brightness not rather be hardcoded in the driver? As far as I can tell it depend on the hardware and is 4 bits wide for flash and bl leds and 5 bits for the others.
include/linux/leds-pmic8058.h line 50
Quoted 1 line
include/linux/leds-pmic8058.h new file +1
-0+int id;
enum pmic8058_leds instead of int
include/linux/leds-pmic8058.h line 59
Quoted 9 lines
include/linux/leds-pmic8058.h new file +9
-0+}; + +/** +* struct pmic8058_leds_platform_data - platform data for leds +* @num_leds - number of leds +* @leds - array of struct pmic8058_led +*/ +struct pmic8058_leds_platform_data { +int num_leds;
size_t
include/linux/leds-pmic8058.h line 61
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_led *leds; +};
If max_brightness is hardcoded in the driver you can reuse "struct led_info" and "struct struct led_platform_data" instead of adding your own structs.
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+ +#endif /* __LEDS_PMIC8058_H__ */
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Quoted 12 lines · Lars-Peter Clausen
drivers/leds/leds-pmic8058.c line 89
Quoted 8 lines · Trilok Soni
drivers/leds/leds-pmic8058.c new file +8
-0+ +static void led_kp_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +int rc; +u8 level; +unsigned long flags; + +spin_lock_irqsave (&led->value_lock, flags);This function is only ever called from within the workqueue so there is no need for locking.
That is a common misconception, unfortunately. The same work may be executing on several CPUs at the same time if it was scheduled on multi-threaded work queue.
...
Quoted 1 line
drivers/leds/leds-pmic8058.c line 225
Quoted 1 line
drivers/leds/leds-pmic8058.c new file +1
-0+schedule_work (&led->work);
And sure enough, keventd is such workqueue.
Now, whether having the same work run simultaneously is OK or not is a different question altogether...
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Quoted 14 lines · Dmitry Torokhov
Quoted 12 lines · Lars-Peter Clausen
drivers/leds/leds-pmic8058.c line 89
Quoted 8 lines · Trilok Soni
drivers/leds/leds-pmic8058.c new file +8
-0+ +static void led_kp_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +int rc; +u8 level; +unsigned long flags; + +spin_lock_irqsave (&led->value_lock, flags);This function is only ever called from within the workqueue so there is no need for locking.
Quoted 4 lines
That is a common misconception, unfortunately. The same work may be executing on several CPUs at the same time if it was scheduled on multi-threaded work queue.
Hm, right my fault.
Still the comment above is still valid, because the original workqueue handler was locked by a mutex. But the comment regarding the mutex should have been:
You can remove the mutex if you queue the work on the system_nrt_wq workqueue
Quoted 9 lines
...
Quoted 1 line
drivers/leds/leds-pmic8058.c line 225
Quoted 1 line
drivers/leds/leds-pmic8058.c new file +1
-0+schedule_work (&led->work);And sure enough, keventd is such workqueue.
Now, whether having the same work run simultaneously is OK or not is a different question altogether...
- Lars
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
In reply to Lars-Peter ClausenHi Peter,
Quoted 4 lines
drivers/leds/leds-pmic8058.c line 69
Quoted 3 lines
drivers/leds/leds-pmic8058.c new file +3
-0+struct pmic8058_led_data { +struct led_classdev cdev; +int id;"enum
pmic8058_leds" instead of int
Ack.
Quoted 4 lines
Quoted 4 lines
drivers/leds/leds-pmic8058.c new file +4
-0+enum led_brightness brightness; +struct pm8058_chip *pm_chip; +struct work_struct work; +struct mutex lock;
Quoted 8 lines
drivers/leds/leds-pmic8058.c line 78
Quoted 5 lines
drivers/leds/leds-pmic8058.c new file +5
-0+spinlock_t value_lock; +u8 reg_kp; +u8 reg_led_ctrl[3 ]; +u8 reg_flash_led0; +u8 reg_flash_led1;You allocate a separate
pmic8058_led_datafor each led, so one "u8 reg" should be sufficient.
Agree. I will check and update.
Quoted 14 lines
drivers/leds/leds-pmic8058.c line 89
Quoted 12 lines
drivers/leds/leds-pmic8058.c new file +11
-0+}; + +#define PM8058_MAX_LEDS 7 + +static void led_kp_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +int rc; +u8 level; +unsigned long flags; + +spin_lock_irqsave (&led->value_lock, flags);This function is only ever called from within the workqueue so there is no need for locking.
There is a historical reason here, but not application to upstream. You can see that we have flash_drv lines also for flash leds in this code, which is used to drive the camera flash leds. The core problem here is that there is no "camera flash" framework in the v4l2 which could drive these pins from the kernel space, so internally we had to also export this _set functions so that v4l2 drivers can use them to control the brightness of the camera flash.
Looking at another way, you can use all of these low level leds, flash leds and keyboard leds drive strengths by combining them into the h/w and driver single camera flash requiring around 990mA of current.
I could remove these spin locks from this code though, as we don't have generic solution in upstream to handle in-kernel usage of LED apis.
Quoted 6 lines
Quoted 6 lines
drivers/leds/leds-pmic8058.c new file +6
-0+ +static enum led_brightness led_kp_get (struct pmic8058_led_data *led) +{ +if ((led->reg_kp &PM8058_DRV_KEYPAD_BL_MASK ) >> +PM8058_DRV_KEYPAD_BL_SHIFT ) +return LED_FULL ;
Quoted 8 lines
drivers/leds/leds-pmic8058.c line 111
Quoted 4 lines
drivers/leds/leds-pmic8058.c new file +4
-0+else +return LED_OFF ; +} +Shouldn't you be returning the actual brightness here instead of only either on or off? The brightness is btw. stored in
led->brightness, so you can use the same getter for all three types of leds.
Ack.
Quoted 11 lines
drivers/leds/leds-pmic8058.c line 118
Quoted 9 lines
drivers/leds/leds-pmic8058.c new file +7
-0+static void led_lc_set (struct pmic8058_led_data *led,enum led_brightness value) +{ +unsigned long flags; +int rc, offset; +u8 level, tmp; + +spin_lock_irqsave (&led->value_lock, flags);This function is only ever called from within the workqueue so there is no need for locking.
As pointed above. Ack.
Quoted 10 lines
drivers/leds/leds-pmic8058.c line 196
Quoted 8 lines
drivers/leds/leds-pmic8058.c new file +8
-0+ +static void pmic8058_led_work (struct work_struct *work) +{ +struct pmic8058_led_data *led =container_of (work, + struct pmic8058_led_data, work); + +mutex_lock (&led->lock); +Since this is a workqueue and there will only one running instance per led at a time there is no need to take a lock here.
I will check this.
Quoted 11 lines
drivers/leds/leds-pmic8058.c line 223
Quoted 10 lines
drivers/leds/leds-pmic8058.c new file +10
-0+ +static void pmic8058_led_set (struct led_classdev *led_cdev, +enum led_brightness value) +{ +struct pmic8058_led_data *led; +unsigned long flags; + + led = container_of(led_cdev, struct pmic8058_led_data, cdev); + +spin_lock_irqsave (&led->value_lock, flags);Locking is not really required here since it is only a single assignment...
Quoted 4 lines
drivers/leds/leds-pmic8058.c line 225
Quoted 2 lines
drivers/leds/leds-pmic8058.c new file +2
-0+ led->brightness = value; +schedule_work (&led->work);and
scheudule_workdoes not have to be inside of the lock.Review
Quoted 1 line
(quoted diff) +1
-0+ spin_unlock_irqrestore(&led->value_lock, flags);
locks will go away.
Quoted 8 lines
drivers/leds/leds-pmic8058.c line 233
Quoted 7 lines
drivers/leds/leds-pmic8058.c new file +7
-0+} + +static enum led_brightness pmic8058_led_get (struct led_classdev *led_cdev) +{ +struct pmic8058_led_data *led; + + led = container_of(led_cdev, struct pmic8058_led_data, cdev);return
led->brightness; (See above)
Ack.
Quoted 3 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ +static int pmic8058_led_probe(struct platform_device *pdev)
__devinit
Ack.
Quoted 4 lines
drivers/leds/leds-pmic8058.c line 259
Quoted 2 lines
drivers/leds/leds-pmic8058.c new file +2
-0+ + pm_chip =platform_get_drvdata (pdev);This looks at least a bit bogus since you'll overwrite the drvdata later. Can't you get the
pm8058_chipthroughpdev->dev.parentsomehow?
I will update this once the PMIC8058 core driver gets updated.
Quoted 4 lines
drivers/leds/leds-pmic8058.c line 262
Quoted 3 lines
drivers/leds/leds-pmic8058.c new file +3
-0+if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"no parent data passed in\n" ); +return -EFAULT ;
-EINVAL
Sure.
Quoted 6 lines
drivers/leds/leds-pmic8058.c line 273
Quoted 5 lines
drivers/leds/leds-pmic8058.c new file +5
-0+ +if (pdata->num_leds >PMIC8058_MAX_LEDS ) { +dev_err (&pdev->dev,"can't handle more than %d LEDS\n" , +PMIC8058_MAX_LEDS ); +return -EFAULT ;
-EINVAL
Ack.
Quoted 4 lines
drivers/leds/leds-pmic8058.c line 276
Quoted 3 lines
drivers/leds/leds-pmic8058.c new file +3
-0+ } + + led =kzalloc (sizeof (*led) * pdata->num_leds,GFP_KERNEL );Use kcalloc instead of kzalloc.
Ok.
Quoted 22 lines
Quoted 22 lines
drivers/leds/leds-pmic8058.c new file +22
-0+ + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_DRV_KEYPAD , ®_kp, +1 ); +if (rc) { +dev_err (&pdev->dev,"can't get keypad backlight level\n" ); + goto err_reg_read; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_LED_CTRL_BASE , + reg_led_ctrl,3 ); +if (rc) { +dev_err (&pdev->dev,"can't get led levels\n" ); + goto err_reg_read; + } + + rc =pm8058_read (pm_chip,SSBI_REG_ADDR_FLASH_DRV0 , + ®_flash_led0,1 ); +if (rc) { +dev_err (&pdev->dev,"can't read flash led0\n" ); + goto err_reg_read; + } +
Quoted 8 lines
drivers/leds/leds-pmic8058.c line 308
Quoted 6 lines
drivers/leds/leds-pmic8058.c new file +6
-0+ rc =pm8058_read (pm_chip,SSBI_REG_ADDR_FLASH_DRV1 , + ®_flash_led1,1 ); +if (rc) { +dev_err (&pdev->dev,"can't get flash led1\n" ); + goto err_reg_read; + }How about adding a helper function which will initializes the leds 'reg' field depending on its id? It will certainly to improve code readability.
Sure. I will add it.
Quoted 6 lines
Quoted 6 lines
drivers/leds/leds-pmic8058.c new file +6
-0+ +static int __devexit pmic8058_led_remove(struct platform_device *pdev) +{ +int i; +struct pmic8058_leds_platform_data *pdata = pdev->dev.platform_data; +struct pmic8058_led_data *led =platform_get_drvdata (pdev);
Quoted 8 lines
drivers/leds/leds-pmic8058.c line 375
Quoted 6 lines
drivers/leds/leds-pmic8058.c new file +6
-0+ +for (i =0 ; i < pdata->num_leds; i++) { +mutex_destroy (&led[led->id].lock); +led_classdev_unregister (&led[led->id].cdev); +cancel_work_sync (&led[led->id].work); + }You need to free the 'led' array.
Thanks. Missed it.
Quoted 15 lines
include/linux/leds-pmic8058.h line 49
Quoted 12 lines
include/linux/leds-pmic8058.h new file +12
-0+ +/** +* struct pmic8058_led - per led data +* @name - name of the led +* @default_trigger - default trigger which needs to e attached +* @max_brightness - maximum brightness level supported by the led +* @id - supported led id +*/ +struct pmic8058_led { +const char *name; +const char *default_trigger; +unsigned max_brightness;Should
max_brightnessnot rather be hardcoded in the driver? As far as I can tell it depend on the hardware and is 4 bits wide for flash and bl leds and 5 bits for the others.
Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ int id;enum
pmic8058_ledsinstead of int
Ack.
Quoted 3 lines
include/linux/leds-pmic8058.h line 59
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_leds_platform_data { +int num_leds;
size_t
Ack.
Quoted 6 lines
include/linux/leds-pmic8058.h line 61
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_led *leds; +};If
max_brightnessis hardcoded in the driver you can reuse "structled_info" and "struct structled_platform_data" instead of adding your own structs.
I will check this and see if I can add it in next version.
Thanks for the review.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Hi Peter,
Quoted 20 lines
Quoted 16 lines
include/linux/leds-pmic8058.h line 49
Quoted 13 lines
include/linux/leds-pmic8058.h new file +12
-0+ +/** +* struct pmic8058_led - per led data +* @name - name of the led +* @default_trigger - default trigger which needs to e attached +* @max_brightness - maximum brightness level supported by the led +* @id - supported led id +*/ +struct pmic8058_led { +const char *name; +const char *default_trigger; +unsigned max_brightness;Should
max_brightnessnot rather be hardcoded in the driver? As far as I can tell it depend on the hardware and is 4 bits wide for flash and bl leds and 5 bits for the others.Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ int id;enum
pmic8058_ledsinstead of int
Quoted 15 lines
Ack.
Quoted 3 lines
include/linux/leds-pmic8058.h line 59
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_leds_platform_data { +int num_leds;
size_tAck.
Quoted 6 lines
include/linux/leds-pmic8058.h line 61
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_led *leds; +};If
max_brightnessis hardcoded in the driver you can reuse "structled_info" and "struct structled_platform_data" instead of adding your own structs.
I couldn't remove these pmic8058_led structure due to the "enum pmic8058_led id" member info which I need from every led. This can be removed completely only if I abuse the "flags" parameter in struct led_info to pass the led id. Let me know what you think.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Quoted 38 lines · Trilok Soni
Hi Peter,
Quoted 20 lines
Quoted 16 lines
include/linux/leds-pmic8058.h line 49
Quoted 13 lines
include/linux/leds-pmic8058.h new file +12
-0+ +/** +* struct pmic8058_led - per led data +* @name - name of the led +* @default_trigger - default trigger which needs to e attached +* @max_brightness - maximum brightness level supported by the led +* @id - supported led id +*/ +struct pmic8058_led { +const char *name; +const char *default_trigger; +unsigned max_brightness;Should
max_brightnessnot rather be hardcoded in the driver? As far as I can tell it depend on the hardware and is 4 bits wide for flash and bl leds and 5 bits for the others.Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ int id;enum
pmic8058_ledsinstead of intQuoted 15 lines
Ack.
Quoted 3 lines
include/linux/leds-pmic8058.h line 59
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_leds_platform_data { +int num_leds;
size_tAck.
Quoted 6 lines
include/linux/leds-pmic8058.h line 61
Quoted 2 lines
include/linux/leds-pmic8058.h new file +2
-0+struct pmic8058_led *leds; +};If
max_brightnessis hardcoded in the driver you can reuse "structled_info" and "struct structled_platform_data" instead of adding your own structs.
Quoted 6 lines
I couldn't remove these
pmic8058_ledstructure due to the "enumpmic8058_ledid" member info which I need from every led. This can be removed completely only if I abuse the "flags" parameter in structled_infoto pass the led id. Let me know what you think.---Trilok Soni
Hi
I think that would be ok, other drivers seem to do the same.
- Lars
Re: [RFC v1 PATCH 3/6] led: pmic8058: Add PMIC8058 leds driver
Hi Peter,
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 3 lines
If
max_brightnessis hardcoded in the driver you can reuse "structled_info" and "struct structled_platform_data" instead of adding your own structs.
Quoted 7 lines
Quoted 3 lines
I couldn't remove these
pmic8058_ledstructure due to the "enumpmic8058_ledid" member info which I need from every led. This can be removed completely only if I abuse the "flags" parameter in structled_infoto pass the led id. Let me know what you think.Hi
I think that would be ok, other drivers seem to do the same.
Thanks. I will use "flags" parameter for "id" then and submit the re-worked version as V2.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
RFC PATCH 4/6 input: pmic8058_pwrkey: Add support for power key
In reply to Trilok SoniAdd support for PMIC8058 power key driven over dedicated KYPD_PWR_N pin. It allows the user to specify the amount of time by which the power key reporting can be delayed.
--- drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-pwrkey.c | 322 +++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-pwrkey.h | 37 ++++ 4 files changed, 371 insertions(+), 0 deletions(-) create mode 100644 drivers/input/misc/pmic8058-pwrkey.c create mode 100644 include/linux/input/pmic8058-pwrkey.h
drivers/input/misc/Kconfig +11 -0
@@ -348,6 +348,17 @@ config INPUT_PWM_BEEPER To compile this driver as a module, choose M here: the module will be called pwm-beeper. +config INPUT_PMIC8058_PWRKEY + tristate "PMIC8058 power key support" + depends on PMIC8058 + help + Say Y here if you want support for the PMIC8058 power key. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called pmic8058-pwrkey. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIO
drivers/input/misc/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o +obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.o obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
drivers/input/misc/pmic8058-pwrkey.c new file +322 -0
322 lines not on this page · raw message
include/linux/input/pmic8058-pwrkey.h new file +37 -0
@@ -0,0 +1,37 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __PMIC8058_PWRKEY_H__ +#define __PMIC8058_PWRKEY_H__ +/** +* struct pmic8058_pwrkey_pdata - platform data for pwrkey driver +* @pull up: power on register control for pull up/down configuration +* @pwrkey_time_ms: time after which power key event should be generated, if +* key is released before then end key is reported. +* Supply zero for only power key reporting. +* @kpd_trigger_delay_us: time delay for power key state change interrupt +* trigger. +* @wakeup: configure power key as wakeup source +*/ +struct pmic8058_pwrkey_pdata { +bool pull_up; +u16 pwrkey_time_ms; +u32 kpd_trigger_delay_us; +u32 wakeup; +}; + +#endif /* __PMIC8058_PWRKEY_H__ */
Signature · 1 line
1.7.0.2
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 4/6] input: pmic8058_pwrkey: Add support for power key
Hi Trilkok,
Quoted 4 lines · Trilok Soni
Add support for PMIC8058 power key driven over dedicated
KYPD_PWR_Npin. It allows the user to specify the amount of time by which the power key reporting can be delayed.
Why do we need to delay KEY_POWER reporting? Do we need to use high resolution timers or regular timers would do as well? KEY_END appears to be abused (you don't want to move your cursor to the end of line, do you?). Also I wonder if header file should reside in linux/mfd with the rest of pmic8058 components.
Thanks.
Quoted 419 lines
Cc Dmitry Torokhov <[email protected]>Signed-off-by Trilok Soni <[email protected]>--- drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-pwrkey.c | 322 +++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-pwrkey.h | 37 ++++ 4 files changed, 371 insertions(+), 0 deletions(-) create mode 100644 drivers/input/misc/pmic8058-pwrkey.c create mode 100644 include/linux/input/pmic8058-pwrkey.hdrivers/input/misc/Kconfig +11
-0@@ -348,6 +348,17 @@ config INPUT_PWM_BEEPER To compile this driver as a module, choose M here: the module will be called pwm-beeper. +config INPUT_PMIC8058_PWRKEY + tristate "PMIC8058 power key support" + depends on PMIC8058 + help + Say Y here if you want support for the PMIC8058 power key. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called pmic8058-pwrkey. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIOdrivers/input/misc/Makefile +1
-0@@ -31,6 +31,7 @@ obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o +obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.o obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.odrivers/input/misc/pmic8058-pwrkey.c new file +322
-0@@ -0,0 +1,322 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/slab.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/mfd/pmic8058.h> +#include <linux/log2.h> +#include <linux/spinlock.h> +#include <linux/hrtimer.h> + +#include <linux/input/pmic8058-pwrkey.h> + +#define PON_CNTL_1 0x1C +#define PON_CNTL_PULL_UP BIT(7) +#define PON_CNTL_TRIG_DELAY_MASK (0x7) + +/** +* struct pmic8058_pwrkey - pmic8058 pwrkey information +* @key_press_irq: key press irq number +* @pm_chip: pmic8058 parent +* @timer: timer for end key simulation +* @key_pressed: flag to keep track for power key reporting +* @pdata: platform data +* @lock: protect key press update and end key simulation +*/ +struct pmic8058_pwrkey { +struct input_dev *pwr; +int key_press_irq; +struct pm8058_chip *pm_chip; +struct hrtimer timer; +bool key_pressed; +struct pmic8058_pwrkey_pdata *pdata; +spinlock_t lock; +}; + +static enum hrtimer_restart pmic8058_pwrkey_timer (struct hrtimer *timer) +{ +unsigned long flags; +struct pmic8058_pwrkey *pwrkey =container_of (timer, + struct pmic8058_pwrkey, timer); + +spin_lock_irqsave (&pwrkey->lock, flags); + pwrkey->key_pressed = true; + +input_report_key (pwrkey->pwr,KEY_POWER ,1 ); +input_sync (pwrkey->pwr); +spin_unlock_irqrestore (&pwrkey->lock, flags); + +return HRTIMER_NORESTART ; +} + +static irqreturn_t pwrkey_press_irq (int irq,void *_pwrkey) +{ +struct pmic8058_pwrkey *pwrkey = _pwrkey; +struct pmic8058_pwrkey_pdata *pdata = pwrkey->pdata; +unsigned long flags; + +/* no pwrkey time duration, means no end key simulation */ +if (!pwrkey->pdata->pwrkey_time_ms) { +input_report_key (pwrkey->pwr,KEY_POWER ,1 ); +input_sync (pwrkey->pwr); +return IRQ_HANDLED ; + } + +spin_lock_irqsave (&pwrkey->lock, flags); + +input_report_key (pwrkey->pwr,KEY_END ,1 ); +input_sync (pwrkey->pwr); + +hrtimer_start (&pwrkey->timer, +ktime_set (pdata->pwrkey_time_ms /1000 , + (pdata->pwrkey_time_ms %1000 ) *1000000 ), +HRTIMER_MODE_REL ); +spin_unlock_irqrestore (&pwrkey->lock, flags); + +return IRQ_HANDLED ; +} + +static irqreturn_t pwrkey_release_irq (int irq,void *_pwrkey) +{ +struct pmic8058_pwrkey *pwrkey = _pwrkey; +unsigned long flags; + +/* no pwrkey time, means no delay in pwr key reporting */ +if (!pwrkey->pdata->pwrkey_time_ms) { +input_report_key (pwrkey->pwr,KEY_POWER ,0 ); +input_sync (pwrkey->pwr); +return IRQ_HANDLED ; + } + +spin_lock_irqsave (&pwrkey->lock, flags); +hrtimer_cancel (&pwrkey->timer); + +if (pwrkey->key_pressed) { + pwrkey->key_pressed = false; +input_report_key (pwrkey->pwr,KEY_POWER ,0 ); +input_sync (pwrkey->pwr); + } + +input_report_key (pwrkey->pwr,KEY_END ,0 ); +input_sync (pwrkey->pwr); + +spin_unlock_irqrestore (&pwrkey->lock, flags); + +return IRQ_HANDLED ; +} + +#ifdef CONFIG_PM +static int pmic8058_pwrkey_suspend (struct device *dev) +{ +struct pmic8058_pwrkey *pwrkey =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (pwrkey->key_press_irq); + +return 0 ; +} + +static int pmic8058_pwrkey_resume (struct device *dev) +{ +struct pmic8058_pwrkey *pwrkey =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (pwrkey->key_press_irq); + +return 0 ; +} + +static const struct dev_pm_ops pm8058_pwr_key_pm_ops = { + .suspend = pmic8058_pwrkey_suspend, + .resume = pmic8058_pwrkey_resume, +}; +#endif + +static int __devinit pmic8058_pwrkey_probe (struct platform_device *pdev) +{ +struct input_dev *pwr; +int key_release_irq =platform_get_irq (pdev,0 ); +int key_press_irq =platform_get_irq (pdev,1 ); +int err; +unsigned int delay; +u8 pon_cntl; +struct pmic8058_pwrkey *pwrkey; +struct pmic8058_pwrkey_pdata *pdata = pdev->dev.platform_data; +struct pm8058_chip *pm_chip; + + pm_chip =platform_get_drvdata (pdev); +if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"no parent data passed in\n" ); +return -EFAULT ; + } + +if (!pdata) { +dev_err (&pdev->dev,"power key platform data not supplied\n" ); +return -EINVAL ; + } + +if (pdata->kpd_trigger_delay_us >62500 ) { +dev_err (&pdev->dev,"invalid pwr key trigger delay\n" ); +return -EINVAL ; + } + +if (pdata->pwrkey_time_ms && + (pdata->pwrkey_time_ms <500 || pdata->pwrkey_time_ms >1000 )) { +dev_err (&pdev->dev,"invalid pwr key time supplied\n" ); +return -EINVAL ; + } + + pwrkey =kzalloc (sizeof (*pwrkey),GFP_KERNEL ); +if (!pwrkey) +return -ENOMEM ; + + pwrkey->pm_chip = pm_chip; + pwrkey->pdata = pdata; + + pwr =input_allocate_device (); +if (!pwr) { +dev_dbg (&pdev->dev,"Can't allocate power button\n" ); + err = -ENOMEM ; + goto free_pwrkey; + } + +input_set_capability (pwr,EV_KEY ,KEY_POWER ); +input_set_capability (pwr,EV_KEY ,KEY_END ); + + pwr->name ="pmic8058_pwrkey" ; + pwr->phys ="pmic8058_pwrkey/input0" ; + pwr->dev.parent = &pdev->dev; + + delay = (pdata->kpd_trigger_delay_us <<10 ) /USEC_PER_SEC ; + delay =1 +ilog2 (delay); + + err =pm8058_read (pwrkey->pm_chip,PON_CNTL_1 , &pon_cntl,1 ); +if (err <0 ) { +dev_err (&pdev->dev,"failed reading PON_CNTL_1 err=%d\n" , err); + goto free_input_dev; + } + + + pon_cntl &= ~PON_CNTL_TRIG_DELAY_MASK ; + pon_cntl |= (delay &PON_CNTL_TRIG_DELAY_MASK ); + pon_cntl |= (pdata->pull_up ?PON_CNTL_PULL_UP : ~PON_CNTL_PULL_UP ); + err =pm8058_write (pwrkey->pm_chip,PON_CNTL_1 , &pon_cntl,1 ); +if (err <0 ) { +dev_err (&pdev->dev,"failed writing PON_CNTL_1 err=%d\n" , err); + goto free_input_dev; + } + +hrtimer_init (&pwrkey->timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); + pwrkey->timer.function = pmic8058_pwrkey_timer; + +spin_lock_init (&pwrkey->lock); + + err =input_register_device (pwr); +if (err) { +dev_dbg (&pdev->dev,"Can't register power key: %d\n" , err); + goto free_input_dev; + } + + pwrkey->key_press_irq = key_press_irq; + pwrkey->pwr = pwr; + +platform_set_drvdata (pdev, pwrkey); + + err =request_any_context_irq (key_press_irq, pwrkey_press_irq, +IRQF_TRIGGER_RISING ,"pmic8058_pwrkey_press" , pwrkey); +if (err <0 ) { +dev_dbg (&pdev->dev,"Can't get %d IRQ for pwrkey: %d\n" , + key_press_irq, err); + goto unreg_input_dev; + } + + err =request_any_context_irq (key_release_irq, pwrkey_release_irq, +IRQF_TRIGGER_RISING ,"pmic8058_pwrkey_release" , + pwrkey); +if (err <0 ) { +dev_dbg (&pdev->dev,"Can't get %d IRQ for pwrkey: %d\n" , + key_release_irq, err); + + goto free_press_irq; + } + +device_init_wakeup (&pdev->dev, pdata->wakeup); + +return 0 ; + +free_press_irq: +free_irq (key_press_irq,NULL ); +unreg_input_dev: +input_unregister_device (pwr); + pwr =NULL ; +free_input_dev: +input_free_device (pwr); +free_pwrkey: +kfree (pwrkey); +return err; +} + +static int __devexit pmic8058_pwrkey_remove(struct platform_device *pdev) +{ +struct pmic8058_pwrkey *pwrkey =platform_get_drvdata (pdev); +int key_release_irq =platform_get_irq (pdev,0 ); +int key_press_irq =platform_get_irq (pdev,1 ); + +device_init_wakeup (&pdev->dev,0 ); + +free_irq (key_press_irq, pwrkey); +free_irq (key_release_irq, pwrkey); +input_unregister_device (pwrkey->pwr); +kfree (pwrkey); + +return 0 ; +} + +static struct platform_driver pmic8058_pwrkey_driver = { + .probe = pmic8058_pwrkey_probe, + .remove =__devexit_p (pmic8058_pwrkey_remove), + .driver = { + .name ="pm8058-pwrkey" , + .owner =THIS_MODULE , +#ifdef CONFIG_PM + .pm = &pm8058_pwr_key_pm_ops, +#endif + }, +}; + +static int __init pmic8058_pwrkey_init (void ) +{ +return platform_driver_register (&pmic8058_pwrkey_driver); +} +module_init (pmic8058_pwrkey_init); + +static void __exit pmic8058_pwrkey_exit(void) +{ +platform_driver_unregister (&pmic8058_pwrkey_driver); +} +module_exit (pmic8058_pwrkey_exit); + +MODULE_ALIAS ("platform:pmic8058_pwrkey" ); +MODULE_DESCRIPTION ("PMIC8058 Power Key driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Trilok Soni <[email protected]>" );include/linux/input/pmic8058-pwrkey.h new file +37
-0@@ -0,0 +1,37 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __PMIC8058_PWRKEY_H__ +#define __PMIC8058_PWRKEY_H__ +/** +* struct pmic8058_pwrkey_pdata - platform data for pwrkey driver +* @pull up: power on register control for pull up/down configuration +* @pwrkey_time_ms: time after which power key event should be generated, if +* key is released before then end key is reported. +* Supply zero for only power key reporting. +* @kpd_trigger_delay_us: time delay for power key state change interrupt +* trigger. +* @wakeup: configure power key as wakeup source +*/ +struct pmic8058_pwrkey_pdata { +bool pull_up; +u16 pwrkey_time_ms; +u32 kpd_trigger_delay_us; +u32 wakeup; +}; + +#endif /* __PMIC8058_PWRKEY_H__ */ Signature · 1 line
1.7.0.2
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 4/6] input: pmic8058_pwrkey: Add support for power key
Hi Dmitry,
Quoted 8 lines · Dmitry Torokhov
Hi Trilkok,
Quoted 4 lines · Trilok Soni
Add support for PMIC8058 power key driven over dedicated
KYPD_PWR_Npin. It allows the user to specify the amount of time by which the power key reporting can be delayed.
Quoted 5 lines
Why do we need to delay
KEY_POWERreporting? Do we need to use high resolution timers or regular timers would do as well?KEY_ENDappears to be abused (you don't want to move your cursor to the end of line, do you?). Also I wonder if header file should reside in linux/mfd with the rest of pmic8058 components.
Most of the time Mobile devices come with single physical key for POWER, which if pressed for less than 500ms (configurable) then it will only report KEY_END (which say locks the screen on mobile) and if it pressed more than 500ms then it will also report KEY_POWER event too, which will say display menu on your mobile for asking you to suspend/switch off/etc, operations.
For the timers I can move from hrtimers to regular timers.
For the header file, I can move them to include/linux/mfd too. No problem on that.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 4/6] input: pmic8058_pwrkey: Add support for power key
Quoted 17 lines · Trilok Soni
Hi Dmitry,
Quoted 8 lines · Dmitry Torokhov
Hi Trilkok,
Quoted 4 lines · Trilok Soni
Add support for PMIC8058 power key driven over dedicated
KYPD_PWR_Npin. It allows the user to specify the amount of time by which the power key reporting can be delayed.Quoted 5 lines
Why do we need to delay
KEY_POWERreporting? Do we need to use high resolution timers or regular timers would do as well?KEY_ENDappears to be abused (you don't want to move your cursor to the end of line, do you?). Also I wonder if header file should reside in linux/mfd with the rest of pmic8058 components.
Quoted 7 lines
Most of the time Mobile devices come with single physical key for POWER, which if pressed for less than 500ms (configurable) then it will only report
KEY_END(which say locks the screen on mobile) and if it pressed more than 500ms then it will also reportKEY_POWERevent too, which will say display menu on your mobile for asking you to suspend/switch off/etc, operations.
I see,. If you would have used KEY_SCREENLOCK iinstead of KEY_END I would likely not ask this question ;)
Quoted 5 lines
For the timers I can move from hrtimers to regular timers.
For the header file, I can move them to
include/linux/mfdtoo. No problem on that.
I am not even sure we need to keep them in separate header files, but it is up to you.
Thanks.
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 4/6] input: pmic8058_pwrkey: Add support for power key
Hi Dmitry,
Quoted 26 lines · Dmitry Torokhov
Quoted 17 lines · Trilok Soni
Hi Dmitry,
Quoted 8 lines · Dmitry Torokhov
Hi Trilkok,
Quoted 4 lines · Trilok Soni
Add support for PMIC8058 power key driven over dedicated
KYPD_PWR_Npin. It allows the user to specify the amount of time by which the power key reporting can be delayed.Quoted 5 lines
Why do we need to delay
KEY_POWERreporting? Do we need to use high resolution timers or regular timers would do as well?KEY_ENDappears to be abused (you don't want to move your cursor to the end of line, do you?). Also I wonder if header file should reside in linux/mfd with the rest of pmic8058 components.Quoted 7 lines
Most of the time Mobile devices come with single physical key for POWER, which if pressed for less than 500ms (configurable) then it will only report
KEY_END(which say locks the screen on mobile) and if it pressed more than 500ms then it will also reportKEY_POWERevent too, which will say display menu on your mobile for asking you to suspend/switch off/etc, operations.
Quoted 3 lines
I see,. If you would have used
KEY_SCREENLOCKiinstead ofKEY_ENDI would likely not ask this question ;)
KEY_SCRENNLOCK looks good, let me analyze the impact on userspace framework which I have. I will come back on this in a day.
Quoted 8 lines
Quoted 5 lines
For the timers I can move from hrtimers to regular timers.
For the header file, I can move them to
include/linux/mfdtoo. No problem on that.I am not even sure we need to keep them in separate header files, but it is up to you.
Do you suggest that all the MFD sub-devices's platform data structures should come from single header file?
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 4/6] input: pmic8058_pwrkey: Add support for power key
Quoted 42 lines · Trilok Soni
Hi Dmitry,
Quoted 26 lines · Dmitry Torokhov
Quoted 17 lines · Trilok Soni
Hi Dmitry,
Quoted 8 lines · Dmitry Torokhov
Hi Trilkok,
Quoted 4 lines · Trilok Soni
Add support for PMIC8058 power key driven over dedicated
KYPD_PWR_Npin. It allows the user to specify the amount of time by which the power key reporting can be delayed.Quoted 5 lines
Why do we need to delay
KEY_POWERreporting? Do we need to use high resolution timers or regular timers would do as well?KEY_ENDappears to be abused (you don't want to move your cursor to the end of line, do you?). Also I wonder if header file should reside in linux/mfd with the rest of pmic8058 components.Quoted 7 lines
Most of the time Mobile devices come with single physical key for POWER, which if pressed for less than 500ms (configurable) then it will only report
KEY_END(which say locks the screen on mobile) and if it pressed more than 500ms then it will also reportKEY_POWERevent too, which will say display menu on your mobile for asking you to suspend/switch off/etc, operations.Quoted 3 lines
I see,. If you would have used
KEY_SCREENLOCKiinstead ofKEY_ENDI would likely not ask this question ;)
KEY_SCRENNLOCKlooks good, let me analyze the impact on userspace framework which I have. I will come back on this in a day.Quoted 6 lines
Quoted 5 lines
For the timers I can move from hrtimers to regular timers.
For the header file, I can move them to
include/linux/mfdtoo. No problem on that.
Quoted 6 lines
Quoted 2 lines
I am not even sure we need to keep them in separate header files, but it is up to you.
Do you suggest that all the MFD sub-devices's platform data structures should come from single header file?
It is an option, depends on how many external headers are needed, etc.
When I looked at this particular file I got the feeling that it could be folded together with the rest. I expect that the board code that will specify platform resources will include every one of this sub-files anyway. But maybe if I was presented with the combined header I'd say "wow, thats too big"...
Like I said, it is up to you.
Signature · 1 line
Dmitry
RFC PATCH 5/6 input: pmic8058-othc: Add support for PM8058 based OTHC
In reply to Trilok SoniFrom: Anirudh Ghayal <[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.
--- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-othc.c | 544 +++++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-othc.h | 117 ++++++++ 4 files changed, 672 insertions(+), 0 deletions(-) create mode 100644 drivers/input/misc/pmic8058-othc.c create mode 100644 include/linux/input/pmic8058-othc.h
drivers/input/misc/Kconfig +10 -0
@@ -359,6 +359,16 @@ config INPUT_PMIC8058_PWRKEY To compile this driver as a module, choose M here: the module will be called pmic8058-pwrkey. +config INPUT_PMIC8058_OTHC + tristate "Qualcomm PMIC8058 OTHC support" + depends on PMIC8058 + help + Say Y here if you want support PMIC8058 One-touch Headset Controller + (OTHC) + + To compile this driver as a module, choose M here: the + module will be called pmic8058-othc. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIO
drivers/input/misc/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o +obj-$(CONFIG_INPUT_PMIC8058_OTHC) += pmic8058-othc.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.o
drivers/input/misc/pmic8058-othc.c new file +544 -0
544 lines not on this page · raw message
include/linux/input/pmic8058-othc.h new file +117 -0
117 lines not on this page · raw message
Signature · 1 line
1.7.0.2
Re: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Hi Dmitry,
Quoted 10 lines · Trilok Soni
From: Anirudh Ghayal <[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Anirudh Ghayal <[email protected]>---
Any comments on this patch?
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
RE: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
In reply to Trilok SoniHi Anirudh,
Quoted 10 lines
-----Original Message-----
From: [email protected] [mailto:linux-input- [email protected]] On Behalf Of Trilok Soni
Sent: Wednesday, November 10, 2010 6:18 PM
To: [email protected]
Cc: [email protected]; [email protected]; linux-arm- [email protected]; Anirudh Ghayal; Dmitry Torokhov
Subject: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Quoted 7 lines
From: Anirudh Ghayal <[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events
over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.
Could you help with the datasheet link if it is free.
Quoted 400 lines
Cc Dmitry Torokhov <[email protected]>Signed-off-by Anirudh Ghayal <[email protected]>--- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-othc.c | 544 +++++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-othc.h | 117 ++++++++ 4 files changed, 672 insertions(+), 0 deletions(-) create mode 100644 drivers/input/misc/pmic8058-othc.c create mode 100644 include/linux/input/pmic8058-othc.hdrivers/input/misc/Kconfig +5
-0@@ -359,6 +359,16 @@ config INPUT_PMIC8058_PWRKEY To compile this driver as a module, choose M here: the module will be called pmic8058-pwrkey. +config INPUT_PMIC8058_OTHC + tristate "Qualcomm PMIC8058 OTHC support" + depends on PMIC8058 + help + Say Y here if you want support PMIC8058 One-touch HeadsetController
drivers/input/misc/Kconfig +5
-0+ (OTHC) + + To compile this driver as a module, choose M here: the + module will be called pmic8058-othc. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIOdrivers/input/misc/Makefile +1
-0@@ -29,6 +29,7 @@ obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o +obj-$(CONFIG_INPUT_PMIC8058_OTHC) += pmic8058-othc.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.odrivers/input/misc/pmic8058-othc.c new file +86
-0@@ -0,0 +1,544 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#define pr_fmt (fmt) "%s:" fmt, __func__ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/platform_device.h> +#include <linux/pm.h> + +#include <linux/mfd/pmic8058.h> +#include <linux/input/pmic8058-othc.h> + +#define PM8058_OTHC_LOW_CURR_MASK 0xF0 +#define PM8058_OTHC_HIGH_CURR_MASK 0x0F +#define PM8058_OTHC_EN_SIG_MASK 0x3F +#define PM8058_OTHC_HYST_PREDIV_MASK 0xC7 +#define PM8058_OTHC_CLK_PREDIV_MASK 0xF8 +#define PM8058_OTHC_HYST_CLK_MASK 0x0F +#define PM8058_OTHC_PERIOD_CLK_MASK 0xF0 + +#define PM8058_OTHC_LOW_CURR_SHIFT 0x4 +#define PM8058_OTHC_EN_SIG_SHIFT 0x6 +#define PM8058_OTHC_HYST_PREDIV_SHIFT 0x3 +#define PM8058_OTHC_HYST_CLK_SHIFT 0x4 + +#define PM8058_OTHC_LOW_CURR_MIRROR 10 +#define PM8058_OTHC_HIGH_CURR_MIRROR 100 +#define PM8058_OTHC_CLK_SRC_SHIFT 10 + +/** +* struct pm8058_othc - othc driver data structure +* @othc_ipd: input device for othc +* @othc_pdata: a pointer to the platform data +* @othc_base: base address of the OTHC controller +* @othc_irq_sw: switch detect irq number +* @othc_irq_ir: headset jack detect irq number +* @othc_sw_state: current state of the switch +* @othc_ir_state: current state of the headset +* @switch_reject: indicates if valid switch press +* @switch_debounce_ms: the debounce time for the switch +* @lock: spin lock variable +* @timer: timer for switch debounce time +* @pm_chip: pointer to the pm8058 parent chip +*/ +struct pm8058_othc { +struct input_dev *othc_ipd; +struct pmic8058_othc_config_pdata *othc_pdata; +int othc_base; +int othc_irq_sw; +int othc_irq_ir; +bool othc_sw_state; +bool othc_ir_state; +bool switch_reject; +unsigned long switch_debounce_ms; +spinlock_t lock; +struct timer_list timer; +struct pm8058_chip *pm_chip; +}; + +static struct pm8058_othc *config[OTHC_MICBIAS_MAX ]; + +/** +* pm8058_micbias_enable() - Enables/Disables the MIC_BIAS +* @micbias: MIC BIAS line which needs to be enabled +* @enable: operational state for the MIC BIAS line +* +* The API pm8058_micbias_enable() configures the MIC_BIAS. Only the lines
+ * which are not used for headset detection can be configured using this API.
+ * The API returns an error code if it fails to configure, else it returns 0.
+ */drivers/input/misc/pmic8058-othc.c new file +254
-0+int pm8058_micbias_enable (enum othc_micbias micbias, +enum othc_micbias_enable enable) +{ +int rc; +u8 reg; +struct pm8058_othc *dd = config[micbias]; + +if (dd ==NULL ) { +pr_err ("MIC_BIAS not registered, cannot enable\n" ); +return -ENODEV ; + } + +if (dd->othc_pdata->micbias_capability !=OTHC_MICBIAS ) { +pr_err ("MIC_BIAS enable capability not supported\n" ); +return -EINVAL ; + } + + rc =pm8058_read (dd->pm_chip, dd->othc_base +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + reg &=PM8058_OTHC_EN_SIG_MASK ; + reg |= (enable <<PM8058_OTHC_EN_SIG_SHIFT ); + + rc =pm8058_write (dd->pm_chip, dd->othc_base +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +return rc; +} +EXPORT_SYMBOL (pm8058_micbias_enable); + +#ifdef CONFIG_PM +static int pm8058_othc_suspend (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +enable_irq_wake (dd->othc_irq_sw); +enable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static int pm8058_othc_resume (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +disable_irq_wake (dd->othc_irq_sw); +disable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static const struct dev_pm_ops pm8058_othc_pm_ops = { + .suspend = pm8058_othc_suspend, + .resume = pm8058_othc_resume, +}; +#endif + +static int __devexit pm8058_othc_remove(struct platform_device *pd) +{ +struct pm8058_othc *dd =platform_get_drvdata (pd); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +device_init_wakeup (&pd->dev,0 ); +free_irq (dd->othc_irq_sw, dd); +free_irq (dd->othc_irq_ir, dd); +del_timer_sync (&dd->timer); +input_unregister_device (dd->othc_ipd); + } + +kfree (dd); + +return 0 ; +} + +static void pm8058_othc_timer (unsigned long handle) +{ +unsigned long flags; +struct pm8058_othc *dd = (struct pm8058_othc *)handle; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = false; +spin_unlock_irqrestore (&dd->lock, flags); +} + +static irqreturn_t pm8058_no_sw (int irq,void *dev_id) +{ +struct pm8058_othc *dd = dev_id; +unsigned long flags; + +/* +* Due to a hardware bug, spurious switch interrutps are seen while +* inserting the headset slowly. A timer based logic rejects these +* switch interrutps. +*/ +spin_lock_irqsave (&dd->lock, flags); +if (dd->switch_reject == true) { +spin_unlock_irqrestore (&dd->lock, flags); +return IRQ_HANDLED ; + } +spin_unlock_irqrestore (&dd->lock, flags); + +if (dd->othc_sw_state == false) { + dd->othc_sw_state = true; +input_report_key (dd->othc_ipd,KEY_MEDIA ,1 ); + }else if (dd->othc_sw_state == true) { + dd->othc_sw_state = false; +input_report_key (dd->othc_ipd,KEY_MEDIA ,0 ); + } +input_sync (dd->othc_ipd); + +return IRQ_HANDLED ; +} + +static irqreturn_t pm8058_nc_ir (int irq,void *dev_id) +{ +unsigned long flags; +struct pm8058_othc *dd = dev_id; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = true; +spin_unlock_irqrestore (&dd->lock, flags); + +mod_timer (&dd->timer, jiffies + +msecs_to_jiffies (dd->switch_debounce_ms)); + +if (dd->othc_ir_state == false) { + dd->othc_ir_state = true; +input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); + }else { + dd->othc_ir_state = false; +input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,0 ); + } + +input_sync (dd->othc_ipd); + +return IRQ_HANDLED ; +} + +static int pm8058_configure_othc (struct pm8058_othc *dd) +{ +int rc; +u8 reg, value; +u32 value1; +u16 base_addr = dd->othc_base; +struct othc_hsed_config *hsed_config = dd->othc_pdata->hsed_config; + +/* Control Register 1*/ + rc =pm8058_read (dd->pm_chip, base_addr, ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +if (hsed_config->othc_headset ==OTHC_HEADSET_NO ) { +/* set iDAC high current threshold */ + value = (hsed_config->othc_highcurr_thresh_uA / +PM8058_OTHC_HIGH_CURR_MIRROR ) -2 ; + reg = (reg &PM8058_OTHC_HIGH_CURR_MASK ) | value; + }else { +/* set iDAC low current threshold */ + value = (hsed_config->othc_lowcurr_thresh_uA / +PM8058_OTHC_LOW_CURR_MIRROR ) -1 ; + reg &=PM8058_OTHC_LOW_CURR_MASK ; + reg |= (value <<PM8058_OTHC_LOW_CURR_SHIFT ); + } + + rc =pm8058_write (dd->pm_chip, base_addr, ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 2*/ + rc =pm8058_read (dd->pm_chip, base_addr +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = dd->othc_pdata->micbias_enable; + reg &=PM8058_OTHC_EN_SIG_MASK ; + reg |= (value <<PM8058_OTHC_EN_SIG_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_hyst_prediv_us << +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=0 ) { + value1 = value1 >>1 ; + value++; + } +if (value >7 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg &=PM8058_OTHC_HYST_PREDIV_MASK ; + reg |= (value <<PM8058_OTHC_HYST_PREDIV_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_period_clkdiv_us << +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=1 ) { + value1 = value1 >>1 ; + value++; + } +if (value >8 ) { +pr_err ("Invalid input argument - othc_period_clkdiv_us\n" ); +return -EINVAL ; + } + reg = (reg &PM8058_OTHC_CLK_PREDIV_MASK ) | (value -1 ); + + rc =pm8058_write (dd->pm_chip, base_addr +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 3 */ + rc =pm8058_read (dd->pm_chip, base_addr +2 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = hsed_config->othc_hyst_clk_us / + hsed_config->othc_hyst_prediv_us; +if (value >15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg &=PM8058_OTHC_HYST_CLK_MASK ; + reg |= value <<PM8058_OTHC_HYST_CLK_SHIFT ; + + value = hsed_config->othc_period_clk_us / + hsed_config->othc_period_clkdiv_us; +if (value >15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg = (reg &PM8058_OTHC_PERIOD_CLK_MASK ) | value; +
drivers/input/misc/pmic8058-othc.c line 353
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ rc =pm8058_write (dd->pm_chip, base_addr +2 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +return 0 ; +} + +static int
If this is called only at init it can also be a devinit ?
Quoted 52 lines
+pm8058_othc_configure_hsed(struct
pm8058_othc*dd, structplatform_device*pd)drivers/input/misc/pmic8058-othc.c new file +9
-0+{ +int rc; +struct input_dev *ipd; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data; +struct othc_hsed_config *hsed_config = pdata->hsed_config; + + ipd =input_allocate_device (); +if (ipd ==NULL ) { + dev_err(&pd->dev, "Memory allocate to input devicefailed!\n");
drivers/input/misc/pmic8058-othc.c new file +40
-0+ rc = -ENOMEM ; + goto fail_input_alloc; + } + + dd->othc_irq_sw =platform_get_irq (pd,0 ); + dd->othc_irq_ir =platform_get_irq (pd,1 ); +if (dd->othc_irq_ir <0 || dd->othc_irq_sw <0 ) { +dev_err (&pd->dev,"othc resource:IRQ_IR absent!\n" ); + rc = -ENXIO ; + goto fail_othc_config; + } + + ipd->name ="pmic8058_othc" ; + ipd->phys ="pmic8058_othc/input0" ; + ipd->dev.parent = &pd->dev; + +input_set_capability (ipd,EV_SW ,SW_HEADPHONE_INSERT ); +input_set_capability (ipd,EV_KEY ,KEY_MEDIA ); + +input_set_drvdata (ipd, dd); + + dd->othc_ipd = ipd; + dd->othc_sw_state = false; + dd->othc_ir_state = false; +spin_lock_init (&dd->lock); + dd->switch_debounce_ms = hsed_config->switch_debounce_ms; +setup_timer (&dd->timer, pm8058_othc_timer, (unsigned long ) dd); + + rc =pm8058_configure_othc (dd); +if (rc <0 ) + goto fail_othc_config; + + rc =input_register_device (ipd); +if (rc) { +dev_err (&pd->dev,"Register OTHC device failed!\n" ); + goto fail_othc_config; + } + +/* Check if the headset is already inserted during boot up */ + rc =pm8058_irq_get_rt_status (dd->pm_chip, dd->othc_irq_ir);
drivers/input/misc/pmic8058-othc.c line 413
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+if (rc <0 ) { +dev_err (&pd->dev,"Unable to get headset status at boot!\n" ); + goto fail_ir_irq; + } +if (rc) { +dev_dbg (&pd->dev,"Headset inserted during boot up!\n" ); + dd->othc_ir_state = true; +input_report_switch (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); +input_sync (dd->othc_ipd); + }
Not a comment. However I did not understand why the status at boot is required here.
Quoted 15 lines
drivers/input/misc/pmic8058-othc.c new file +15
-0+ + rc =request_any_context_irq (dd->othc_irq_ir, pm8058_nc_ir, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_ir" , dd); +if (rc <0 ) { +dev_err (&pd->dev,"Request pm8058_othc_ir IRQ failed!\n" ); + goto fail_ir_irq; + } + + rc =request_any_context_irq (dd->othc_irq_sw, pm8058_no_sw, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_sw" , dd); +if (rc <0 ) { +dev_err (&pd->dev,"Request pm8058_othc_sw IRQ failed!\n" ); + goto fail_sw_irq;
drivers/input/misc/pmic8058-othc.c line 438
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ } + +device_init_wakeup (&pd->dev, hsed_config->othc_wakeup); + +return 0 ; + +fail_sw_irq: +free_irq (dd->othc_irq_ir, dd); +fail_ir_irq: +input_unregister_device (ipd);
Unregister and then falling back to free may not be what you intended.
Quoted 239 lines
drivers/input/misc/pmic8058-othc.c new file +106
-0+ dd->othc_ipd =NULL ; +fail_othc_config: +input_free_device (ipd); +fail_input_alloc: +return rc; +} + +static int __devinit pm8058_othc_probe (struct platform_device *pd) +{ +int rc; +struct pm8058_othc *dd; +struct pm8058_chip *chip; +struct resource *res; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data; + + chip =platform_get_drvdata (pd); +if (chip ==NULL ) { +dev_err (&pd->dev,"Invalid driver information!\n" ); +return -EINVAL ; + } + +/* PMIC8058 version A0 not supported */ +if (pm8058_rev (chip) == PM_8058_REV_1p0) { +dev_err (&pd->dev,"PMIC8058 version not supported!\n" ); +return -ENODEV ; + } + +if (pdata ==NULL ) { +dev_err (&pd->dev,"Platform data not present!\n" ); +return -EINVAL ; + } + + dd =kzalloc (sizeof (*dd),GFP_KERNEL ); +if (dd ==NULL ) { +dev_err (&pd->dev,"Unable to allocate memory!\n" ); +return -ENOMEM ; + } + + res =platform_get_resource_byname (pd,IORESOURCE_IO ,"othc_base" ); +if (res ==NULL ) { +dev_err (&pd->dev,"OTHC Base address, resource absent!\n" ); + rc = -ENXIO ; + goto fail_get_res; + } + + dd->othc_pdata = pdata; + dd->pm_chip = chip; + dd->othc_base = res->start; + +platform_set_drvdata (pd, dd); + +if (pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +/* HSED to be supported on this MICBIAS line */ +if (pdata->hsed_config !=NULL ) { + rc =pm8058_othc_configure_hsed (dd, pd); +if (rc <0 ) + goto fail_get_res; + }else { +dev_err (&pd->dev,"HSED config data absent!\n" ); + rc = -EINVAL ; + goto fail_get_res; + } + } + +/* Store the local driver data structure */ +if (dd->othc_pdata->micbias_select <OTHC_MICBIAS_MAX ) + config[dd->othc_pdata->micbias_select] = dd; + +dev_dbg (&pd->dev,"Device %s:%d successfully registered\n" , + pd->name, pd->id); +return 0 ; + +fail_get_res: +kfree (dd); +return rc; +} + +static struct platform_driver pm8058_othc_driver = { + .driver = { + .name ="pm8058-othc" , + .owner =THIS_MODULE , +#ifdef CONFIG_PM + .pm = &pm8058_othc_pm_ops, +#endif + }, + .probe = pm8058_othc_probe, + .remove =__devexit_p (pm8058_othc_remove), +}; + +static int __init pm8058_othc_init (void ) +{ +return platform_driver_register (&pm8058_othc_driver); +} + +static void __exit pm8058_othc_exit(void) +{ +platform_driver_unregister (&pm8058_othc_driver); +} + +module_init (pm8058_othc_init); +module_exit (pm8058_othc_exit); + +MODULE_ALIAS ("platform:pmic8058_othc" ); +MODULE_DESCRIPTION ("PMIC8058 OTHC" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Anirudh Ghayal <[email protected]>" );include/linux/input/pmic8058-othc.h new file +62
-0@@ -0,0 +1,117 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __PMIC8058_OTHC_H__ +#define __PMIC8058_OTHC_H__ + +/** +* enum othc_micbias_enable - MIC BIAS operational states +* +* This enum describes the different configurations of the BIAS line. +*/ +enum othc_micbias_enable { +/* Turn off BIAS */ +OTHC_SIGNAL_OFF , +/* Turn on BIAS if TCXO_EN is high */ +OTHC_SIGNAL_TCXO , +/* Turn on BIAS if TCXO_EN or PWN is high */ +OTHC_SIGNAL_PWM_TCXO , +/* Turn on BIAS always */ +OTHC_SIGNAL_ALWAYS_ON , +}; + +/** +* enum othc_headset_type - Different type of supported headset +* +* This enum describes the different types of supported headsets. +*/ +enum othc_headset_type { +OTHC_HEADSET_NO , +OTHC_HEADSET_NC , +}; + +/** +* enum othc_micbias - Lists the number of MIC BIAS lines. +* +* This enum lists all the total number of BIAS lines. +*/ +enum othc_micbias { +OTHC_MICBIAS_0 , +OTHC_MICBIAS_1 , +OTHC_MICBIAS_2 , +OTHC_MICBIAS_MAX , +}; + +/** +* enum othc_micbias_capability - Capability of the MIC BIAS line +* +* This enum describes the capability of the MIC BIAS line, it can either be
+ * used for headset or a regular speaker MIC BIAS.
+ */include/linux/input/pmic8058-othc.h new file +19
-0+enum othc_micbias_capability { +OTHC_MICBIAS , +OTHC_MICBIAS_HSED , +}; + +/** +* struct othc_hsed_config - headset specific configuration structure +* @othc_headset: type of headset +* @othc_lowcurr_thresh_uA: low current threshold for the headset +* @othc_highcurr_thresh_uA: high current threshold for the headset +* @othc_hyst_prediv_us: hysterisis time pre-divider +* @othc_period_clkdiv_us: pwm period pre-divider +* @othc_hyst_clk_us: hysterisis clock period +* @othc_hyst_clk_us: hysterisis clock period +* @othc_period_clk_us: pwm clock period +* @othc_wakeup: wakeup capability +* @switch_debounce_ms: specifies the switch debounce time +* +* This structure provides the configurable parameters for headset. This is a
+ * part of the platform data.
+ */include/linux/input/pmic8058-othc.h new file +32
-1+struct othc_hsed_config { +enum othc_headset_type othc_headset; +u16 othc_lowcurr_thresh_uA; +u16 othc_highcurr_thresh_uA; +u32 othc_hyst_prediv_us; +u32 othc_period_clkdiv_us; +u32 othc_hyst_clk_us; +u32 othc_period_clk_us; +int othc_wakeup; +unsigned long switch_debounce_ms; +}; + +/** +* struct pmic8058_othc_config_pdata - platform data for OTHC +* @micbias_select: selects the MIC BIAS +* @micbias_enable: default operational configuration of the MIC BIAS +* @micbias_capability: capability supported by the MIC BIAS +* @hsed_config: pointer to headset configuration +* +* This structure is the platform data provided to the OTHC driver +*/ +struct pmic8058_othc_config_pdata { +enum othc_micbias micbias_select; +enum othc_micbias_enable micbias_enable; +enum othc_micbias_capability micbias_capability; +struct othc_hsed_config *hsed_config; +}; + +int pm8058_micbias_enable (enum othc_micbias micbias, +enum othc_micbias_enable enable); + +#endif /* __PMIC8058_OTHC_H__ */ --1.7.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Hi Shubhrajyoti,
Quoted 12 lines · Shubhrajyoti
Hi Anirudh,
Quoted 10 lines
-----Original Message-----
From: [email protected] [mailto:linux-input- [email protected]] On Behalf Of Trilok Soni
Sent: Wednesday, November 10, 2010 6:18 PM
To: [email protected]
Cc: [email protected]; [email protected]; linux-arm- [email protected]; Anirudh Ghayal; Dmitry Torokhov
Subject: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Quoted 9 lines
Quoted 7 lines
From: Anirudh Ghayal <[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events
over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.Could you help with the datasheet link if it is free.
datasheets are not available for open access.
Quoted 3 lines
drivers/input/misc/pmic8058-othc.c line 353
Quoted 2 lines
drivers/input/misc/pmic8058-othc.c new file +2
-0+ +static intIf this is called only at init it can also be a devinit ?
Ok.
Quoted 7 lines
drivers/input/misc/pmic8058-othc.c line 413
Quoted 6 lines
drivers/input/misc/pmic8058-othc.c new file +6
-0+if (rc) { +dev_dbg (&pd->dev,"Headset inserted during boot up!\n" ); + dd->othc_ir_state = true; +input_report_switch (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); +input_sync (dd->othc_ipd); + }Not a comment. However I did not understand why the status at boot is required here.
We need to report right status when the system boots up with headset inserted.
Quoted 7 lines
drivers/input/misc/pmic8058-othc.c line 438
Quoted 5 lines
drivers/input/misc/pmic8058-othc.c new file +5
-0+ +fail_sw_irq: +free_irq (dd->othc_irq_ir, dd); +fail_ir_irq: +input_unregister_device (ipd);Unregister and then falling back to free may not be what you intended.
Nope. Please see we are making othc_ipd = NULL, so everything should be fine.
Thanks for the review comments.
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Hi Dimitry,
Please me know your comments this patch.
Thank you,
Anirudh
Quoted 56 lines · Trilok Soni
Hi Shubhrajyoti,
Quoted 12 lines · Shubhrajyoti
Hi Anirudh,
Quoted 10 lines
-----Original Message-----
From: [email protected] [mailto:linux-input- [email protected]] On Behalf Of Trilok Soni
Sent: Wednesday, November 10, 2010 6:18 PM
To: [email protected]
Cc: [email protected]; [email protected]; linux-arm- [email protected]; Anirudh Ghayal; Dmitry Torokhov
Subject: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHCQuoted 9 lines
Quoted 7 lines
From: Anirudh Ghayal<[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events
over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.Could you help with the datasheet link if it is free.
datasheets are not available for open access.
Quoted 3 lines
drivers/input/misc/pmic8058-othc.c line 353
Quoted 2 lines
drivers/input/misc/pmic8058-othc.c new file +2
-0+ +static intIf this is called only at init it can also be a devinit ?
Ok.
Quoted 7 lines
drivers/input/misc/pmic8058-othc.c line 413
Quoted 6 lines
drivers/input/misc/pmic8058-othc.c new file +6
-0+if (rc) { +dev_dbg (&pd->dev,"Headset inserted during boot up!\n" ); + dd->othc_ir_state = true; +input_report_switch (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); +input_sync (dd->othc_ipd); + }Not a comment. However I did not understand why the status at boot is required here.
We need to report right status when the system boots up with headset inserted.
Quoted 7 lines
drivers/input/misc/pmic8058-othc.c line 438
Quoted 5 lines
drivers/input/misc/pmic8058-othc.c new file +5
-0+ +fail_sw_irq: +free_irq (dd->othc_irq_ir, dd); +fail_ir_irq: +input_unregister_device (ipd);Unregister and then falling back to free may not be what you intended.
Nope. Please see we are making
othc_ipd= NULL, so everything should be fine.Thanks for the review comments.
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Dmitry Torokhov
maintainerRe: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
In reply to Trilok SoniHi Trilok,
Quoted 113 lines · Trilok Soni
From: Anirudh Ghayal <[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Anirudh Ghayal <[email protected]>--- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-othc.c | 544 +++++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-othc.h | 117 ++++++++ 4 files changed, 672 insertions(+), 0 deletions(-) create mode 100644 drivers/input/misc/pmic8058-othc.c create mode 100644 include/linux/input/pmic8058-othc.hdrivers/input/misc/Kconfig +10
-0@@ -359,6 +359,16 @@ config INPUT_PMIC8058_PWRKEY To compile this driver as a module, choose M here: the module will be called pmic8058-pwrkey. +config INPUT_PMIC8058_OTHC + tristate "Qualcomm PMIC8058 OTHC support" + depends on PMIC8058 + help + Say Y here if you want support PMIC8058 One-touch Headset Controller + (OTHC) + + To compile this driver as a module, choose M here: the + module will be called pmic8058-othc. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB && GENERIC_GPIOdrivers/input/misc/Makefile +1
-0@@ -29,6 +29,7 @@ obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o +obj-$(CONFIG_INPUT_PMIC8058_OTHC) += pmic8058-othc.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.odrivers/input/misc/pmic8058-othc.c new file +56
-0@@ -0,0 +1,544 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#define pr_fmt (fmt) "%s:" fmt, __func__ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/platform_device.h> +#include <linux/pm.h> + +#include <linux/mfd/pmic8058.h> +#include <linux/input/pmic8058-othc.h> + +#define PM8058_OTHC_LOW_CURR_MASK 0xF0 +#define PM8058_OTHC_HIGH_CURR_MASK 0x0F +#define PM8058_OTHC_EN_SIG_MASK 0x3F +#define PM8058_OTHC_HYST_PREDIV_MASK 0xC7 +#define PM8058_OTHC_CLK_PREDIV_MASK 0xF8 +#define PM8058_OTHC_HYST_CLK_MASK 0x0F +#define PM8058_OTHC_PERIOD_CLK_MASK 0xF0 + +#define PM8058_OTHC_LOW_CURR_SHIFT 0x4 +#define PM8058_OTHC_EN_SIG_SHIFT 0x6 +#define PM8058_OTHC_HYST_PREDIV_SHIFT 0x3 +#define PM8058_OTHC_HYST_CLK_SHIFT 0x4 + +#define PM8058_OTHC_LOW_CURR_MIRROR 10 +#define PM8058_OTHC_HIGH_CURR_MIRROR 100 +#define PM8058_OTHC_CLK_SRC_SHIFT 10 + +/** +* struct pm8058_othc - othc driver data structure +* @othc_ipd: input device for othc +* @othc_pdata: a pointer to the platform data +* @othc_base: base address of the OTHC controller +* @othc_irq_sw: switch detect irq number +* @othc_irq_ir: headset jack detect irq number +* @othc_sw_state: current state of the switch
drivers/input/misc/pmic8058-othc.c line 66
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+* @othc_ir_state: current state of the headset +* @switch_reject: indicates if valid switch press +* @switch_debounce_ms: the debounce time for the switch +* @lock: spin lock variable +* @timer: timer for switch debounce time +* @pm_chip: pointer to the pm8058 parent chip +*/ +struct pm8058_othc { +struct input_dev *othc_ipd; +struct pmic8058_othc_config_pdata *othc_pdata;
const?
Quoted 89 lines
drivers/input/misc/pmic8058-othc.c new file +89
-0+int othc_base; +int othc_irq_sw; +int othc_irq_ir; +bool othc_sw_state; +bool othc_ir_state; +bool switch_reject; +unsigned long switch_debounce_ms; +spinlock_t lock; +struct timer_list timer; +struct pm8058_chip *pm_chip; +}; + +static struct pm8058_othc *config[OTHC_MICBIAS_MAX ]; + +/** +* pm8058_micbias_enable() - Enables/Disables the MIC_BIAS +* @micbias: MIC BIAS line which needs to be enabled +* @enable: operational state for the MIC BIAS line +* +* The API pm8058_micbias_enable() configures the MIC_BIAS. Only the lines +* which are not used for headset detection can be configured using this API. +* The API returns an error code if it fails to configure, else it returns 0. +*/ +int pm8058_micbias_enable (enum othc_micbias micbias, +enum othc_micbias_enable enable) +{ +int rc; +u8 reg; +struct pm8058_othc *dd = config[micbias]; + +if (dd ==NULL ) { +pr_err ("MIC_BIAS not registered, cannot enable\n" ); +return -ENODEV ; + } + +if (dd->othc_pdata->micbias_capability !=OTHC_MICBIAS ) { +pr_err ("MIC_BIAS enable capability not supported\n" ); +return -EINVAL ; + } + + rc =pm8058_read (dd->pm_chip, dd->othc_base +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + reg &=PM8058_OTHC_EN_SIG_MASK ; + reg |= (enable <<PM8058_OTHC_EN_SIG_SHIFT ); + + rc =pm8058_write (dd->pm_chip, dd->othc_base +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +return rc; +} +EXPORT_SYMBOL (pm8058_micbias_enable); + +#ifdef CONFIG_PM +static int pm8058_othc_suspend (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +enable_irq_wake (dd->othc_irq_sw); +enable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static int pm8058_othc_resume (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +disable_irq_wake (dd->othc_irq_sw); +disable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static const struct dev_pm_ops pm8058_othc_pm_ops = {
drivers/input/misc/pmic8058-othc.c line 165
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ .suspend = pm8058_othc_suspend, + .resume = pm8058_othc_resume, +}; +#endif + +static int __devexit pm8058_othc_remove(struct platform_device *pd) +{ +struct pm8058_othc *dd =platform_get_drvdata (pd); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) {
Why do we even bind to devices that are not OTHC_MICBIAS_HSED?
Quoted 28 lines
drivers/input/misc/pmic8058-othc.c new file +28
-0+device_init_wakeup (&pd->dev,0 ); +free_irq (dd->othc_irq_sw, dd); +free_irq (dd->othc_irq_ir, dd); +del_timer_sync (&dd->timer); +input_unregister_device (dd->othc_ipd); + } + +kfree (dd); + +return 0 ; +} + +static void pm8058_othc_timer (unsigned long handle) +{ +unsigned long flags; +struct pm8058_othc *dd = (struct pm8058_othc *)handle; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = false; +spin_unlock_irqrestore (&dd->lock, flags); +} + +static irqreturn_t pm8058_no_sw (int irq,void *dev_id) +{ +struct pm8058_othc *dd = dev_id; +unsigned long flags; + +/*
drivers/input/misc/pmic8058-othc.c line 203
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+* Due to a hardware bug, spurious switch interrutps are seen while +* inserting the headset slowly. A timer based logic rejects these +* switch interrutps. +*/ +spin_lock_irqsave (&dd->lock, flags); +if (dd->switch_reject == true) { +spin_unlock_irqrestore (&dd->lock, flags); +return IRQ_HANDLED ; + } +spin_unlock_irqrestore (&dd->lock, flags);
I am not quite sure whether this locking helps anything... You do protect the check by condition can change once you leave the protected section since both IRQ handles and timer can run simultaneously...
Quoted 24 lines
drivers/input/misc/pmic8058-othc.c new file +24
-0+ +if (dd->othc_sw_state == false) { + dd->othc_sw_state = true; +input_report_key (dd->othc_ipd,KEY_MEDIA ,1 ); + }else if (dd->othc_sw_state == true) { + dd->othc_sw_state = false; +input_report_key (dd->othc_ipd,KEY_MEDIA ,0 ); + } +input_sync (dd->othc_ipd); + +return IRQ_HANDLED ; +} + +static irqreturn_t pm8058_nc_ir (int irq,void *dev_id) +{ +unsigned long flags; +struct pm8058_othc *dd = dev_id; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = true; +spin_unlock_irqrestore (&dd->lock, flags); + +mod_timer (&dd->timer, jiffies + +msecs_to_jiffies (dd->switch_debounce_ms));
drivers/input/misc/pmic8058-othc.c line 237
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ +if (dd->othc_ir_state == false) { + dd->othc_ir_state = true; +input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); + }else { + dd->othc_ir_state = false; +input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,0 ); + } + +input_sync (dd->othc_ipd);
dd->othc_ir_state = !dd->othc_ir_state; input_report_key(dd->othc_ipd, SW_HEADPHONE_INSERT, dd->othc_ir_state); input_sync(dd->othc_ipd);
Quoted 111 lines
drivers/input/misc/pmic8058-othc.c new file +111
-0+ +return IRQ_HANDLED ; +} + +static int pm8058_configure_othc (struct pm8058_othc *dd) +{ +int rc; +u8 reg, value; +u32 value1; +u16 base_addr = dd->othc_base; +struct othc_hsed_config *hsed_config = dd->othc_pdata->hsed_config; + +/* Control Register 1*/ + rc =pm8058_read (dd->pm_chip, base_addr, ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +if (hsed_config->othc_headset ==OTHC_HEADSET_NO ) { +/* set iDAC high current threshold */ + value = (hsed_config->othc_highcurr_thresh_uA / +PM8058_OTHC_HIGH_CURR_MIRROR ) -2 ; + reg = (reg &PM8058_OTHC_HIGH_CURR_MASK ) | value; + }else { +/* set iDAC low current threshold */ + value = (hsed_config->othc_lowcurr_thresh_uA / +PM8058_OTHC_LOW_CURR_MIRROR ) -1 ; + reg &=PM8058_OTHC_LOW_CURR_MASK ; + reg |= (value <<PM8058_OTHC_LOW_CURR_SHIFT ); + } + + rc =pm8058_write (dd->pm_chip, base_addr, ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 2*/ + rc =pm8058_read (dd->pm_chip, base_addr +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = dd->othc_pdata->micbias_enable; + reg &=PM8058_OTHC_EN_SIG_MASK ; + reg |= (value <<PM8058_OTHC_EN_SIG_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_hyst_prediv_us << +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=0 ) { + value1 = value1 >>1 ; + value++; + } +if (value >7 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg &=PM8058_OTHC_HYST_PREDIV_MASK ; + reg |= (value <<PM8058_OTHC_HYST_PREDIV_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_period_clkdiv_us << +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=1 ) { + value1 = value1 >>1 ; + value++; + } +if (value >8 ) { +pr_err ("Invalid input argument - othc_period_clkdiv_us\n" ); +return -EINVAL ; + } + reg = (reg &PM8058_OTHC_CLK_PREDIV_MASK ) | (value -1 ); + + rc =pm8058_write (dd->pm_chip, base_addr +1 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 3 */ + rc =pm8058_read (dd->pm_chip, base_addr +2 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = hsed_config->othc_hyst_clk_us / + hsed_config->othc_hyst_prediv_us; +if (value >15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg &=PM8058_OTHC_HYST_CLK_MASK ; + reg |= value <<PM8058_OTHC_HYST_CLK_SHIFT ; + + value = hsed_config->othc_period_clk_us / + hsed_config->othc_period_clkdiv_us; +if (value >15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg = (reg &PM8058_OTHC_PERIOD_CLK_MASK ) | value; + + rc =pm8058_write (dd->pm_chip, base_addr +2 , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + }
drivers/input/misc/pmic8058-othc.c line 358
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ +return 0 ; +} + +static int +pm8058_othc_configure_hsed (struct pm8058_othc *dd,struct platform_device *pd) +{ +int rc; +struct input_dev *ipd; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data;
const?
drivers/input/misc/pmic8058-othc.c line 359
Quoted 1 line
drivers/input/misc/pmic8058-othc.c new file +1
-0+struct othc_hsed_config *hsed_config = pdata->hsed_config;
And here as well?
Quoted 12 lines
drivers/input/misc/pmic8058-othc.c new file +12
-0+ + ipd =input_allocate_device (); +if (ipd ==NULL ) { +dev_err (&pd->dev,"Memory allocate to input device failed!\n" ); + rc = -ENOMEM ; + goto fail_input_alloc; + } + + dd->othc_irq_sw =platform_get_irq (pd,0 ); + dd->othc_irq_ir =platform_get_irq (pd,1 ); +if (dd->othc_irq_ir <0 || dd->othc_irq_sw <0 ) { +dev_err (&pd->dev,"othc resource:IRQ_IR absent!\n" );
drivers/input/misc/pmic8058-othc.c line 381
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ rc = -ENXIO ; + goto fail_othc_config; + } + + ipd->name ="pmic8058_othc" ; + ipd->phys ="pmic8058_othc/input0" ; + ipd->dev.parent = &pd->dev; + +input_set_capability (ipd,EV_SW ,SW_HEADPHONE_INSERT ); +input_set_capability (ipd,EV_KEY ,KEY_MEDIA );
What exactly this button is supposed to do? I do not think KEY_MEDIA is the one you need here.
Quoted 26 lines
drivers/input/misc/pmic8058-othc.c new file +26
-0+ +input_set_drvdata (ipd, dd); + + dd->othc_ipd = ipd; + dd->othc_sw_state = false; + dd->othc_ir_state = false; +spin_lock_init (&dd->lock); + dd->switch_debounce_ms = hsed_config->switch_debounce_ms; +setup_timer (&dd->timer, pm8058_othc_timer, (unsigned long ) dd); + + rc =pm8058_configure_othc (dd); +if (rc <0 ) + goto fail_othc_config; + + rc =input_register_device (ipd); +if (rc) { +dev_err (&pd->dev,"Register OTHC device failed!\n" ); + goto fail_othc_config; + } + +/* Check if the headset is already inserted during boot up */ + rc =pm8058_irq_get_rt_status (dd->pm_chip, dd->othc_irq_ir); +if (rc <0 ) { +dev_err (&pd->dev,"Unable to get headset status at boot!\n" ); + goto fail_ir_irq; + }
drivers/input/misc/pmic8058-othc.c line 417
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+if (rc) { +dev_dbg (&pd->dev,"Headset inserted during boot up!\n" ); + dd->othc_ir_state = true; +input_report_switch (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); +input_sync (dd->othc_ipd); + } + + rc =request_any_context_irq (dd->othc_irq_ir, pm8058_nc_ir, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_ir" , dd);
Hmm, non-threaded IRQs do not support IRQF_ONESHOT, do they? BTW, is oneshot really needed here?
Quoted 88 lines
drivers/input/misc/pmic8058-othc.c new file +88
-0+if (rc <0 ) { +dev_err (&pd->dev,"Request pm8058_othc_ir IRQ failed!\n" ); + goto fail_ir_irq; + } + + rc =request_any_context_irq (dd->othc_irq_sw, pm8058_no_sw, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_sw" , dd); +if (rc <0 ) { +dev_err (&pd->dev,"Request pm8058_othc_sw IRQ failed!\n" ); + goto fail_sw_irq; + } + +device_init_wakeup (&pd->dev, hsed_config->othc_wakeup); + +return 0 ; + +fail_sw_irq: +free_irq (dd->othc_irq_ir, dd); +fail_ir_irq: +input_unregister_device (ipd); + dd->othc_ipd =NULL ; +fail_othc_config: +input_free_device (ipd); +fail_input_alloc: +return rc; +} + +static int __devinit pm8058_othc_probe (struct platform_device *pd) +{ +int rc; +struct pm8058_othc *dd; +struct pm8058_chip *chip; +struct resource *res; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data; + + chip =platform_get_drvdata (pd); +if (chip ==NULL ) { +dev_err (&pd->dev,"Invalid driver information!\n" ); +return -EINVAL ; + } + +/* PMIC8058 version A0 not supported */ +if (pm8058_rev (chip) == PM_8058_REV_1p0) { +dev_err (&pd->dev,"PMIC8058 version not supported!\n" ); +return -ENODEV ; + } + +if (pdata ==NULL ) { +dev_err (&pd->dev,"Platform data not present!\n" ); +return -EINVAL ; + } + + dd =kzalloc (sizeof (*dd),GFP_KERNEL ); +if (dd ==NULL ) { +dev_err (&pd->dev,"Unable to allocate memory!\n" ); +return -ENOMEM ; + } + + res =platform_get_resource_byname (pd,IORESOURCE_IO ,"othc_base" ); +if (res ==NULL ) { +dev_err (&pd->dev,"OTHC Base address, resource absent!\n" ); + rc = -ENXIO ; + goto fail_get_res; + } + + dd->othc_pdata = pdata; + dd->pm_chip = chip; + dd->othc_base = res->start; + +platform_set_drvdata (pd, dd); + +if (pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +/* HSED to be supported on this MICBIAS line */ +if (pdata->hsed_config !=NULL ) { + rc =pm8058_othc_configure_hsed (dd, pd); +if (rc <0 ) + goto fail_get_res; + }else { +dev_err (&pd->dev,"HSED config data absent!\n" ); + rc = -EINVAL ; + goto fail_get_res; + } + } + +/* Store the local driver data structure */ +if (dd->othc_pdata->micbias_select <OTHC_MICBIAS_MAX ) + config[dd->othc_pdata->micbias_select] = dd;
drivers/input/misc/pmic8058-othc.c line 515
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ +dev_dbg (&pd->dev,"Device %s:%d successfully registered\n" , + pd->name, pd->id); +return 0 ; + +fail_get_res: +kfree (dd); +return rc; +} +
Thanks.
Signature · 1 line
Dmitry
Re: [RFC v1 PATCH 5/6] input: pmic8058-othc: Add support for PM8058 based OTHC
Hi Dimitry,
Thanks for your comments.
Quoted 120 lines · Dmitry Torokhov
Hi Trilok,
Quoted 117 lines · Trilok Soni
From: Anirudh Ghayal<[email protected]>
One-touch headset controller is a hardware module in Qualcomm's PMIC8058. It supports headset insert/remove and switch press/release detection events over 3 MIC BIAS lines. The MIC BIAS lines can be configured to support headset detection or act as regular BIAS lines.
Cc Dmitry Torokhov<[email protected]>Signed-off-by Anirudh Ghayal<[email protected]>--- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/pmic8058-othc.c | 544 +++++++++++++++++++++++++++++++++++ include/linux/input/pmic8058-othc.h | 117 ++++++++ 4 files changed, 672 insertions(+), 0 deletions(-)create mode 100644
drivers/input/misc/pmic8058-othc.ccreate mode 100644include/linux/input/pmic8058-othc.hdrivers/input/misc/Kconfig +10
-0@@ -359,6 +359,16 @@ config INPUT_PMIC8058_PWRKEY To compile this driver as a module, choose M here: the module will be called pmic8058-pwrkey. +config INPUT_PMIC8058_OTHC + tristate "Qualcomm PMIC8058 OTHC support" + depends on PMIC8058 + help + Say Y here if you want support PMIC8058 One-touch Headset Controller + (OTHC) + + To compile this driver as a module, choose M here: the + module will be called pmic8058-othc. + config INPUT_GPIO_ROTARY_ENCODER tristate "Rotary encoders connected to GPIO pins" depends on GPIOLIB&& GENERIC_GPIOdrivers/input/misc/Makefile +1
-0@@ -29,6 +29,7 @@ obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o +obj-$(CONFIG_INPUT_PMIC8058_OTHC) += pmic8058-othc.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_PMIC8058_PWRKEY) += pmic8058-pwrkey.odrivers/input/misc/pmic8058-othc.c new file +60
-0@@ -0,0 +1,544 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#define pr_fmt (fmt) "%s:" fmt, __func__ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/platform_device.h> +#include <linux/pm.h> + +#include <linux/mfd/pmic8058.h> +#include <linux/input/pmic8058-othc.h> + +#define PM8058_OTHC_LOW_CURR_MASK 0xF0 +#define PM8058_OTHC_HIGH_CURR_MASK 0x0F +#define PM8058_OTHC_EN_SIG_MASK 0x3F +#define PM8058_OTHC_HYST_PREDIV_MASK 0xC7 +#define PM8058_OTHC_CLK_PREDIV_MASK 0xF8 +#define PM8058_OTHC_HYST_CLK_MASK 0x0F +#define PM8058_OTHC_PERIOD_CLK_MASK 0xF0 + +#define PM8058_OTHC_LOW_CURR_SHIFT 0x4 +#define PM8058_OTHC_EN_SIG_SHIFT 0x6 +#define PM8058_OTHC_HYST_PREDIV_SHIFT 0x3 +#define PM8058_OTHC_HYST_CLK_SHIFT 0x4 + +#define PM8058_OTHC_LOW_CURR_MIRROR 10 +#define PM8058_OTHC_HIGH_CURR_MIRROR 100 +#define PM8058_OTHC_CLK_SRC_SHIFT 10 + +/** +* struct pm8058_othc - othc driver data structure +* @othc_ipd: input device for othc +* @othc_pdata: a pointer to the platform data +* @othc_base: base address of the OTHC controller +* @othc_irq_sw: switch detect irq number +* @othc_irq_ir: headset jack detect irq number +* @othc_sw_state: current state of the switch +* @othc_ir_state: current state of the headset +* @switch_reject: indicates if valid switch press +* @switch_debounce_ms: the debounce time for the switch +* @lock: spin lock variable
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 66
Quoted 6 lines
drivers/input/misc/pmic8058-othc.c new file +6
-0+* @timer: timer for switch debounce time +* @pm_chip: pointer to the pm8058 parent chip +*/ +struct pm8058_othc { +struct input_dev *othc_ipd; +struct pmic8058_othc_config_pdata *othc_pdata;const?
Ok.
Quoted 94 lines
Quoted 94 lines
drivers/input/misc/pmic8058-othc.c new file +93
-0+int othc_base; +int othc_irq_sw; +int othc_irq_ir; +bool othc_sw_state; +bool othc_ir_state; +bool switch_reject; +unsigned long switch_debounce_ms; +spinlock_t lock; +struct timer_list timer; +struct pm8058_chip *pm_chip; +}; + +static struct pm8058_othc *config[OTHC_MICBIAS_MAX ]; + +/** +* pm8058_micbias_enable() - Enables/Disables the MIC_BIAS +* @micbias: MIC BIAS line which needs to be enabled +* @enable: operational state for the MIC BIAS line +* +* The API pm8058_micbias_enable() configures the MIC_BIAS. Only the lines +* which are not used for headset detection can be configured using this API. +* The API returns an error code if it fails to configure, else it returns 0. +*/ +int pm8058_micbias_enable (enum othc_micbias micbias, +enum othc_micbias_enable enable) +{ +int rc; +u8 reg; +struct pm8058_othc *dd = config[micbias]; + +if (dd ==NULL ) { +pr_err ("MIC_BIAS not registered, cannot enable\n" ); +return -ENODEV ; + } + +if (dd->othc_pdata->micbias_capability !=OTHC_MICBIAS ) { +pr_err ("MIC_BIAS enable capability not supported\n" ); +return -EINVAL ; + } + + rc =pm8058_read (dd->pm_chip, dd->othc_base +1 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + reg&=PM8058_OTHC_EN_SIG_MASK ; + reg |= (enable<<PM8058_OTHC_EN_SIG_SHIFT ); + + rc =pm8058_write (dd->pm_chip, dd->othc_base +1 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +return rc; +} +EXPORT_SYMBOL (pm8058_micbias_enable); + +#ifdef CONFIG_PM +static int pm8058_othc_suspend (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +enable_irq_wake (dd->othc_irq_sw); +enable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static int pm8058_othc_resume (struct device *dev) +{ +struct pm8058_othc *dd =dev_get_drvdata (dev); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +if (device_may_wakeup (dev)) { +disable_irq_wake (dd->othc_irq_sw); +disable_irq_wake (dd->othc_irq_ir); + } + } + +return 0 ; +} + +static const struct dev_pm_ops pm8058_othc_pm_ops = { + .suspend = pm8058_othc_suspend, + .resume = pm8058_othc_resume, +}; +#endif
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 165
Quoted 6 lines
drivers/input/misc/pmic8058-othc.c new file +6
-0+ +static int __devexit pm8058_othc_remove(struct platform_device *pd) +{ +struct pm8058_othc *dd =platform_get_drvdata (pd); + +if (dd->othc_pdata->micbias_capability ==OTHC_MICBIAS_HSED ) {Why do we even bind to devices that are not
OTHC_MICBIAS_HSED?
On PMIC 8058 we have 3 MIC_BIAS lines and all 3 have the capability to support HSED OTHC controller. So, I register all the 3 BIAS lines, though only the ones which are enabled for HSED regitser as input devices. Also, I export an API pm8058_micbias_enable (above) which allows to configure the non-HSED lines as regualr MIC_BIAS lines.
Quoted 35 lines
Quoted 35 lines
drivers/input/misc/pmic8058-othc.c new file +34
-0+device_init_wakeup (&pd->dev,0 ); +free_irq (dd->othc_irq_sw, dd); +free_irq (dd->othc_irq_ir, dd); +del_timer_sync (&dd->timer); +input_unregister_device (dd->othc_ipd); + } + +kfree (dd); + +return 0 ; +} + +static void pm8058_othc_timer (unsigned long handle) +{ +unsigned long flags; +struct pm8058_othc *dd = (struct pm8058_othc *)handle; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = false; +spin_unlock_irqrestore (&dd->lock, flags); +} + +static irqreturn_t pm8058_no_sw (int irq,void *dev_id) +{ +struct pm8058_othc *dd = dev_id; +unsigned long flags; + +/* +* Due to a hardware bug, spurious switch interrutps are seen while +* inserting the headset slowly. A timer based logic rejects these +* switch interrutps. +*/ +spin_lock_irqsave (&dd->lock, flags); +if (dd->switch_reject == true) {
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 203
Quoted 4 lines
drivers/input/misc/pmic8058-othc.c new file +4
-0+spin_unlock_irqrestore (&dd->lock, flags); +return IRQ_HANDLED ; + } +spin_unlock_irqrestore (&dd->lock, flags);I am not quite sure whether this locking helps anything... You do protect the check by condition can change once you leave the protected section since both IRQ handles and timer can run simultaneously...
Sorry, I didn't quite get your concern. Here, only the timer updates the varible and the int. handler checks for the condition and returns. As these both can occur in parallel we need a lock.
Quoted 31 lines
Quoted 31 lines
drivers/input/misc/pmic8058-othc.c new file +30
-0+ +if (dd->othc_sw_state == false) { + dd->othc_sw_state = true; +input_report_key (dd->othc_ipd,KEY_MEDIA ,1 ); + }else if (dd->othc_sw_state == true) { + dd->othc_sw_state = false; +input_report_key (dd->othc_ipd,KEY_MEDIA ,0 ); + } +input_sync (dd->othc_ipd); + +return IRQ_HANDLED ; +} + +static irqreturn_t pm8058_nc_ir (int irq,void *dev_id) +{ +unsigned long flags; +struct pm8058_othc *dd = dev_id; + +spin_lock_irqsave (&dd->lock, flags); + dd->switch_reject = true; +spin_unlock_irqrestore (&dd->lock, flags); + +mod_timer (&dd->timer, jiffies + +msecs_to_jiffies (dd->switch_debounce_ms)); + +if (dd->othc_ir_state == false) { + dd->othc_ir_state = true; +input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); + }else { + dd->othc_ir_state = false;
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 237
Quoted 4 lines
drivers/input/misc/pmic8058-othc.c new file +4
-0+input_report_key (dd->othc_ipd,SW_HEADPHONE_INSERT ,0 ); + } + +input_sync (dd->othc_ipd);dd->othc_ir_state = !dd->othc_ir_state; input_report_key(dd->othc_ipd, SW_HEADPHONE_INSERT, dd->othc_ir_state); input_sync(dd->othc_ipd);
Simpler :).
Quoted 125 lines
Quoted 112 lines
drivers/input/misc/pmic8058-othc.c new file +111
-0+ +return IRQ_HANDLED ; +} + +static int pm8058_configure_othc (struct pm8058_othc *dd) +{ +int rc; +u8 reg, value; +u32 value1; +u16 base_addr = dd->othc_base; +struct othc_hsed_config *hsed_config = dd->othc_pdata->hsed_config; + +/* Control Register 1*/ + rc =pm8058_read (dd->pm_chip, base_addr,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +if (hsed_config->othc_headset ==OTHC_HEADSET_NO ) { +/* set iDAC high current threshold */ + value = (hsed_config->othc_highcurr_thresh_uA / +PM8058_OTHC_HIGH_CURR_MIRROR ) -2 ; + reg = (reg&PM8058_OTHC_HIGH_CURR_MASK ) | value; + }else { +/* set iDAC low current threshold */ + value = (hsed_config->othc_lowcurr_thresh_uA / +PM8058_OTHC_LOW_CURR_MIRROR ) -1 ; + reg&=PM8058_OTHC_LOW_CURR_MASK ; + reg |= (value<<PM8058_OTHC_LOW_CURR_SHIFT ); + } + + rc =pm8058_write (dd->pm_chip, base_addr,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 2*/ + rc =pm8058_read (dd->pm_chip, base_addr +1 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = dd->othc_pdata->micbias_enable; + reg&=PM8058_OTHC_EN_SIG_MASK ; + reg |= (value<<PM8058_OTHC_EN_SIG_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_hyst_prediv_us<< +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=0 ) { + value1 = value1>>1 ; + value++; + } +if (value>7 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg&=PM8058_OTHC_HYST_PREDIV_MASK ; + reg |= (value<<PM8058_OTHC_HYST_PREDIV_SHIFT ); + + value =0 ; + value1 = (hsed_config->othc_period_clkdiv_us<< +PM8058_OTHC_CLK_SRC_SHIFT ) /USEC_PER_SEC ; +while (value1 !=1 ) { + value1 = value1>>1 ; + value++; + } +if (value>8 ) { +pr_err ("Invalid input argument - othc_period_clkdiv_us\n" ); +return -EINVAL ; + } + reg = (reg&PM8058_OTHC_CLK_PREDIV_MASK ) | (value -1 ); + + rc =pm8058_write (dd->pm_chip, base_addr +1 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +/* Control register 3 */ + rc =pm8058_read (dd->pm_chip, base_addr +2 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + value = hsed_config->othc_hyst_clk_us / + hsed_config->othc_hyst_prediv_us; +if (value>15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg&=PM8058_OTHC_HYST_CLK_MASK ; + reg |= value<<PM8058_OTHC_HYST_CLK_SHIFT ; + + value = hsed_config->othc_period_clk_us / + hsed_config->othc_period_clkdiv_us; +if (value>15 ) { +pr_err ("Invalid input argument - othc_hyst_prediv_us\n" ); +return -EINVAL ; + } + reg = (reg&PM8058_OTHC_PERIOD_CLK_MASK ) | value; + + rc =pm8058_write (dd->pm_chip, base_addr +2 ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + }drivers/input/misc/pmic8058-othc.c line 358
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ +return 0 ; +} + +static int +pm8058_othc_configure_hsed (struct pm8058_othc *dd,struct platform_device *pd) +{ +int rc; +struct input_dev *ipd; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data;const?
Quoted 4 lines
drivers/input/misc/pmic8058-othc.c line 359
Quoted 1 line
drivers/input/misc/pmic8058-othc.c new file +1
-0+struct othc_hsed_config *hsed_config = pdata->hsed_config;And here as well?
Sure.
Quoted 17 lines
Quoted 17 lines
drivers/input/misc/pmic8058-othc.c new file +17
-0+ + ipd =input_allocate_device (); +if (ipd ==NULL ) { +dev_err (&pd->dev,"Memory allocate to input device failed!\n" ); + rc = -ENOMEM ; + goto fail_input_alloc; + } + + dd->othc_irq_sw =platform_get_irq (pd,0 ); + dd->othc_irq_ir =platform_get_irq (pd,1 ); +if (dd->othc_irq_ir<0 || dd->othc_irq_sw<0 ) { +dev_err (&pd->dev,"othc resource:IRQ_IR absent!\n" ); + rc = -ENXIO ; + goto fail_othc_config; + } + + ipd->name ="pmic8058_othc" ;
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 381
Quoted 5 lines
drivers/input/misc/pmic8058-othc.c new file +5
-0+ ipd->phys ="pmic8058_othc/input0" ; + ipd->dev.parent =&pd->dev; + +input_set_capability (ipd,EV_SW ,SW_HEADPHONE_INSERT ); +input_set_capability (ipd,EV_KEY ,KEY_MEDIA );What exactly this button is supposed to do? I do not think
KEY_MEDIAis the one you need here.
This key acts as send/end key while in call and play/pause in case of audio playback. So we used KEY_MEDIA as a generic media key. Could you please suggest what can be used here?
Quoted 33 lines
Quoted 33 lines
drivers/input/misc/pmic8058-othc.c new file +31
-0+ +input_set_drvdata (ipd, dd); + + dd->othc_ipd = ipd; + dd->othc_sw_state = false; + dd->othc_ir_state = false; +spin_lock_init (&dd->lock); + dd->switch_debounce_ms = hsed_config->switch_debounce_ms; +setup_timer (&dd->timer, pm8058_othc_timer, (unsigned long ) dd); + + rc =pm8058_configure_othc (dd); +if (rc<0 ) + goto fail_othc_config; + + rc =input_register_device (ipd); +if (rc) { +dev_err (&pd->dev,"Register OTHC device failed!\n" ); + goto fail_othc_config; + } + +/* Check if the headset is already inserted during boot up */ + rc =pm8058_irq_get_rt_status (dd->pm_chip, dd->othc_irq_ir); +if (rc<0 ) { +dev_err (&pd->dev,"Unable to get headset status at boot!\n" ); + goto fail_ir_irq; + } +if (rc) { +dev_dbg (&pd->dev,"Headset inserted during boot up!\n" ); + dd->othc_ir_state = true; +input_report_switch (dd->othc_ipd,SW_HEADPHONE_INSERT ,1 ); +input_sync (dd->othc_ipd);
Quoted 8 lines
drivers/input/misc/pmic8058-othc.c line 417
Quoted 5 lines
drivers/input/misc/pmic8058-othc.c new file +5
-0+ } + + rc =request_any_context_irq (dd->othc_irq_ir, pm8058_nc_ir, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_ir" , dd);Hmm, non-threaded IRQs do not support
IRQF_ONESHOT, do they? BTW, is oneshot really needed here?
Right, I donot need IRQF_ONESHOT here.
Quoted 102 lines
Quoted 89 lines
drivers/input/misc/pmic8058-othc.c new file +88
-0+if (rc<0 ) { +dev_err (&pd->dev,"Request pm8058_othc_ir IRQ failed!\n" ); + goto fail_ir_irq; + } + + rc =request_any_context_irq (dd->othc_irq_sw, pm8058_no_sw, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"pm8058_othc_sw" , dd); +if (rc<0 ) { +dev_err (&pd->dev,"Request pm8058_othc_sw IRQ failed!\n" ); + goto fail_sw_irq; + } + +device_init_wakeup (&pd->dev, hsed_config->othc_wakeup); + +return 0 ; + +fail_sw_irq: +free_irq (dd->othc_irq_ir, dd); +fail_ir_irq: +input_unregister_device (ipd); + dd->othc_ipd =NULL ; +fail_othc_config: +input_free_device (ipd); +fail_input_alloc: +return rc; +} + +static int __devinit pm8058_othc_probe (struct platform_device *pd) +{ +int rc; +struct pm8058_othc *dd; +struct pm8058_chip *chip; +struct resource *res; +struct pmic8058_othc_config_pdata *pdata = pd->dev.platform_data; + + chip =platform_get_drvdata (pd); +if (chip ==NULL ) { +dev_err (&pd->dev,"Invalid driver information!\n" ); +return -EINVAL ; + } + +/* PMIC8058 version A0 not supported */ +if (pm8058_rev (chip) == PM_8058_REV_1p0) { +dev_err (&pd->dev,"PMIC8058 version not supported!\n" ); +return -ENODEV ; + } + +if (pdata ==NULL ) { +dev_err (&pd->dev,"Platform data not present!\n" ); +return -EINVAL ; + } + + dd =kzalloc (sizeof (*dd),GFP_KERNEL ); +if (dd ==NULL ) { +dev_err (&pd->dev,"Unable to allocate memory!\n" ); +return -ENOMEM ; + } + + res =platform_get_resource_byname (pd,IORESOURCE_IO ,"othc_base" ); +if (res ==NULL ) { +dev_err (&pd->dev,"OTHC Base address, resource absent!\n" ); + rc = -ENXIO ; + goto fail_get_res; + } + + dd->othc_pdata = pdata; + dd->pm_chip = chip; + dd->othc_base = res->start; + +platform_set_drvdata (pd, dd); + +if (pdata->micbias_capability ==OTHC_MICBIAS_HSED ) { +/* HSED to be supported on this MICBIAS line */ +if (pdata->hsed_config !=NULL ) { + rc =pm8058_othc_configure_hsed (dd, pd); +if (rc<0 ) + goto fail_get_res; + }else { +dev_err (&pd->dev,"HSED config data absent!\n" ); + rc = -EINVAL ; + goto fail_get_res; + } + } + +/* Store the local driver data structure */ +if (dd->othc_pdata->micbias_select<OTHC_MICBIAS_MAX ) + config[dd->othc_pdata->micbias_select] = dd;drivers/input/misc/pmic8058-othc.c line 515
Quoted 10 lines
drivers/input/misc/pmic8058-othc.c new file +10
-0+ +dev_dbg (&pd->dev,"Device %s:%d successfully registered\n" , + pd->name, pd->id); +return 0 ; + +fail_get_res: +kfree (dd); +return rc; +} +Thanks.
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
RFC PATCH 6/6 drivers: rtc: Add support for Qualcomm PMIC8058 RTC
In reply to Trilok SoniFrom: Anirudh Ghayal <[email protected]>
PMIC8058 is Qualcomm's power management IC. A 32-bit RTC is housed inside this PMIC. The RTC driver uses SSBI to communicate with the RTC module.
--- drivers/rtc/Kconfig | 9 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pm8058.c | 487 ++++++++++++++++++++++++++++++++++++++++ include/linux/rtc/rtc-pm8058.h | 29 +++ 4 files changed, 526 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-pm8058.c create mode 100644 include/linux/rtc/rtc-pm8058.h
drivers/rtc/Kconfig +9 -0
@@ -665,6 +665,15 @@ config RTC_DRV_NUC900 If you say yes here you get support for the RTC subsystem of the NUC910/NUC920 used in embedded systems. +config RTC_DRV_PM8058 + tristate "Qualcomm PMIC8058 RTC" + depends on PMIC8058 + help + Say Y here if you want to support the Qualcomm PMIC8058 RTC. + + To compile this driver as a module, choose M here: the + module will be called pmic8058-rtc. + comment "on-CPU RTC drivers" config RTC_DRV_DAVINCI
drivers/rtc/Makefile +1 -0
@@ -73,6 +73,7 @@ obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o obj-$(CONFIG_RTC_DRV_PCF2123) += rtc-pcf2123.o obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o +obj-$(CONFIG_RTC_DRV_PM8058) += rtc-pm8058.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
drivers/rtc/rtc-pm8058.c new file +487 -0
487 lines not on this page · raw message
include/linux/rtc/rtc-pm8058.h new file +29 -0
@@ -0,0 +1,29 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __RTC_PM8058_H__ +#define __RTC_PM8058_H__ + +/** +* struct pm8058_rtc_pdata - RTC driver platform data +* @rtc_write_enable - variable stating RTC write capability +*/ +struct pm8058_rtc_pdata { +bool rtc_write_enable; +}; + +#endif /* __RTC_PM8058_H__ */
Signature · 1 line
1.7.0.2
Re: [RFC v1 PATCH 6/6] drivers: rtc: Add support for Qualcomm PMIC8058 RTC
Hi Alessandro,
Quoted 8 lines · Trilok Soni
From: Anirudh Ghayal <[email protected]>
PMIC8058 is Qualcomm's power management IC. A 32-bit RTC is housed inside this PMIC. The RTC driver uses SSBI to communicate with the RTC module.
Cc Alessandro Zummo <[email protected]>Signed-off-by Anirudh Ghayal <[email protected]>
Please review this driver. Thanks.
---Trilok Soni
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [RFC v1 PATCH 6/6] drivers: rtc: Add support for Qualcomm PMIC8058 RTC
In reply to Trilok SoniQuoted 85 lines · Trilok Soni
From: Anirudh Ghayal <[email protected]>
PMIC8058 is Qualcomm's power management IC. A 32-bit RTC is housed inside this PMIC. The RTC driver uses SSBI to communicate with the RTC module.
Cc Alessandro Zummo <[email protected]>Signed-off-by Anirudh Ghayal <[email protected]>--- drivers/rtc/Kconfig | 9 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pm8058.c | 487 ++++++++++++++++++++++++++++++++++++++++ include/linux/rtc/rtc-pm8058.h | 29 +++ 4 files changed, 526 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-pm8058.c create mode 100644 include/linux/rtc/rtc-pm8058.hdrivers/rtc/Kconfig +9
-0@@ -665,6 +665,15 @@ config RTC_DRV_NUC900 If you say yes here you get support for the RTC subsystem of the NUC910/NUC920 used in embedded systems. +config RTC_DRV_PM8058 + tristate "Qualcomm PMIC8058 RTC" + depends on PMIC8058 + help + Say Y here if you want to support the Qualcomm PMIC8058 RTC. + + To compile this driver as a module, choose M here: the + module will be called pmic8058-rtc. + comment "on-CPU RTC drivers" config RTC_DRV_DAVINCIdrivers/rtc/Makefile +1
-0@@ -73,6 +73,7 @@ obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o obj-$(CONFIG_RTC_DRV_PCF2123) += rtc-pcf2123.o obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o +obj-$(CONFIG_RTC_DRV_PM8058) += rtc-pm8058.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.odrivers/rtc/rtc-pm8058.c new file +30
-0@@ -0,0 +1,487 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#define pr_fmt (fmt) "%s: " fmt, __func__ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/rtc.h> +#include <linux/mfd/pmic8058.h> +#include <linux/pm.h> +#include <linux/slab.h> +#include <linux/rtc/rtc-pm8058.h> + +/* RTC control registers */ +#define PM8058_RTC_CTRL 0x1E8 +#define PM8058_RTC_ALARM_CTRL 0x1E9
drivers/rtc/rtc-pm8058.c line 40
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+#define PM8058_RTC_TEST 0x1F6 + +/* RTC register bases */ +#define PM8058_RTC_READ_BASE 0x1EE +#define PM8058_RTC_WRITE_BASE 0x1EA +#define PM8058_RTC_ALARM_BASE 0x1F2 + +/* RTC_CTRL register bit fields */ +#define PM8058_RTC_ENABLE BIT(7) +#define PM8058_RTC_ALARM_ENABLE BIT(1)
Are there other bits in the ctrl register which are not touch by this driver? If not you could turn the read-modify-write operations changing the ctrl register into simple writes.
drivers/rtc/rtc-pm8058.c line 52
Quoted 12 lines
drivers/rtc/rtc-pm8058.c new file +12
-0+ +#define NUM_8_BIT_RTC_REGS 0x4 + +/** +* struct pm8058_rtc - rtc driver internal structure +* @rtc0 - rtc device for this driver +* @rtc_irq - rtc irq number +* @rtc_alarm_irq - rtc alarm irq number +* @pm_chip - pointer to pm8058 parent structure +*/ +struct pm8058_rtc { +struct rtc_device *rtc0;
Is there a reason for the '0'?
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+int rtc_irq; +int rtc_alarm_irq; +struct pm8058_chip *pm_chip; +}; + +static int +pm8058_rtc_read_bytes (struct pm8058_rtc *rtc_dd,u8 *rtc_val,int base) +{
drivers/rtc/rtc-pm8058.c line 70
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+int i, rc; + +/* Read the 32-bit register value, 8 bits at a time. */ +for (i =0 ; i <NUM_8_BIT_RTC_REGS ; i++) { + rc =pm8058_read (rtc_dd->pm_chip, base + i, &rtc_val[i],1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + }
Hm, I don't know the hardware, but I would assume that pm8058_read(rtc_dd->pm_chip, base, rtc_val, NUM_8_BIT_RTC_REGS) should work as well.
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+ +return 0 ; +} + +static int +pm8058_rtc_write_bytes (struct pm8058_rtc *rtc_dd,u8 *rtc_val,int base) +{ +int i, rc;
drivers/rtc/rtc-pm8058.c line 88
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ +/* Write the 32-bit register value, 8 bits at a time. */ +for (i =0 ; i <NUM_8_BIT_RTC_REGS ; i++) { + rc =pm8058_write (rtc_dd->pm_chip, base + i, &rtc_val[i],1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + } +
Same here
Quoted 21 lines
drivers/rtc/rtc-pm8058.c new file +21
-0+return 0 ; +} + +/* +* Steps to write the RTC registers. +* 1. Disable alarm if enabled. +* 2. Write 0x00 to LSB. +* 3. Write Byte[1], Byte[2], Byte[3] then Byte[0]. +* 4. Enable alarm if disabled in step 1. +*/ +static int +pm8058_rtc0_set_time (struct device *dev,struct rtc_time *tm) +{ +int rc; +unsigned long secs =0 ; +u8 value[4 ], reg =0 , alarm_enabled =0 , ctrl_reg =0 , i; +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +rtc_tm_to_time (tm, &secs); + + value[0 ] = secs &0xFF ;
drivers/rtc/rtc-pm8058.c line 119
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ value[1 ] = (secs >>8 ) &0xFF ; + value[2 ] = (secs >>16 ) &0xFF ; + value[3 ] = (secs >>24 ) &0xFF ; + +pr_debug ("Seconds value to be written to RTC = %lu\n" , secs); + +/* Disable alarm before updating RTC */ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL , &ctrl_reg,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" );
dev_err instead of pr_err. The other pr_err should also be replaced.
Quoted 97 lines
drivers/rtc/rtc-pm8058.c new file +97
-0+return rc; + } + +if (ctrl_reg &PM8058_RTC_ALARM_ENABLE ) { + alarm_enabled =1 ; + ctrl_reg &= ~PM8058_RTC_ALARM_ENABLE ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL , + &ctrl_reg,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + } + +/* Write Byte[1], Byte[2], Byte[3], Byte[0] */ + reg =0 ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +for (i =1 ; i <NUM_8_BIT_RTC_REGS ; i++) { + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE + i, + &value[i],1 ); +if (rc <0 ) { +pr_err ("Write to RTC registers failed\n" ); +return rc; + } + } + + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE , + &value[0 ],1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +if (alarm_enabled) { + ctrl_reg |=PM8058_RTC_ALARM_ENABLE ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL , + &ctrl_reg,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + } + +return 0 ; +} + +static int +pm8058_rtc0_read_time (struct device *dev,struct rtc_time *tm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ; +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + + rc =pm8058_rtc_read_bytes (rtc_dd, value,PM8058_RTC_READ_BASE ); +if (rc <0 ) { +pr_err ("RTC time read failed\n" ); +return rc; + } + +/* +* Read the LSB again and check if there has been a carry over. +* If there is, redo the read operation. +*/ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_READ_BASE , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +if (unlikely (reg < value[0 ])) { + rc =pm8058_rtc_read_bytes (rtc_dd, value, +PM8058_RTC_READ_BASE ); +if (rc <0 ) { +pr_err ("RTC time read failed\n" ); +return rc; + } + } + + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + +rtc_time_to_tm (secs, tm); + + rc =rtc_valid_tm (tm); +if (rc <0 ) { +pr_err ("Invalid time read from PMIC8058\n" ); +return rc; + } + +pr_debug ("secs = %lu, h::m:s == %d::%d::%d, d/m/y = %d/%d/%d\n" , + secs, tm->tm_hour, tm->tm_min, tm->tm_sec, + tm->tm_mday, tm->tm_mon, tm->tm_year);
drivers/rtc/rtc-pm8058.c line 226
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ +return 0 ; +} + +static int +pm8058_rtc0_set_alarm (struct device *dev,struct rtc_wkalrm *alarm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ;
No need to initialize secs here.
drivers/rtc/rtc-pm8058.c line 234
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +/* Check if a alarm is valid */ + rc =rtc_valid_tm (&alarm->time); +if (rc <0 ) { +pr_err ("Alarm time invalid\n" ); +return -EINVAL ; + }
The upper layer will already check if alarm->time is valid, so there is no need to check it here again.
Quoted 33 lines
drivers/rtc/rtc-pm8058.c new file +33
-0+ +rtc_tm_to_time (&alarm->time, &secs); + + value[0 ] = secs &0xFF ; + value[1 ] = (secs >>8 ) &0xFF ; + value[2 ] = (secs >>16 ) &0xFF ; + value[3 ] = (secs >>24 ) &0xFF ; + + rc =pm8058_rtc_write_bytes (rtc_dd, value,PM8058_RTC_ALARM_BASE ); +if (rc <0 ) { +pr_err ("Alarm could not be set\n" ); +return rc; + } + + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + reg = (alarm->enabled) ? (reg |PM8058_RTC_ALARM_ENABLE ) : + (reg & ~PM8058_RTC_ALARM_ENABLE ); + + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +pr_debug ("Alarm Set for h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n" , + alarm->time.tm_hour, alarm->time.tm_min, + alarm->time.tm_sec, alarm->time.tm_mday, + alarm->time.tm_mon, alarm->time.tm_year);
drivers/rtc/rtc-pm8058.c line 277
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ +return 0 ; +} + +static int +pm8058_rtc0_read_alarm (struct device *dev,struct rtc_wkalrm *alarm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ;
No need to initialize secs here.
Quoted 29 lines
drivers/rtc/rtc-pm8058.c new file +29
-0+struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +/* Check if the alarm is enabled */ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL , ®,1 ); +if (rc <0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + alarm->enabled = !!(reg &PM8058_RTC_ALARM_ENABLE ); + + rc =pm8058_rtc_read_bytes (rtc_dd, value, +PM8058_RTC_ALARM_BASE ); +if (rc <0 ) { +pr_err ("RTC alarm time read failed\n" ); +return rc; + } + + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + +rtc_time_to_tm (secs, &alarm->time); + + rc =rtc_valid_tm (&alarm->time); +if (rc <0 ) { +pr_err ("Invalid time read from PMIC8058\n" ); +return rc; + } + + pr_debug("Alarm set for - h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n", + alarm->time.tm_hour, alarm->time.tm_min,
drivers/rtc/rtc-pm8058.c line 316
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ alarm->time.tm_sec, alarm->time.tm_mday, + alarm->time.tm_mon, alarm->time.tm_year); + +return 0 ; +} + +static struct rtc_class_ops pm8058_rtc0_ops = { + .read_time = pm8058_rtc0_read_time, + .set_alarm = pm8058_rtc0_set_alarm, + .read_alarm = pm8058_rtc0_read_alarm,
Implementig alarm_irq_enable might be a good idea
drivers/rtc/rtc-pm8058.c line 325
Quoted 9 lines
drivers/rtc/rtc-pm8058.c new file +9
-0+}; + +static irqreturn_t pm8058_alarm_trigger (int irq,void *dev_id) +{ +unsigned long events =0 ; +struct pm8058_rtc *rtc_dd = dev_id; + + events =RTC_IRQF |RTC_AF ; +rtc_update_irq (rtc_dd->rtc0,1 , events);
just rtc_update_irq(rtc_dd->rtc0, 1, RTC_IRQF | RTC_AF); should be fine
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+ +pr_debug ("Alarm Triggered !!\n" ); + +return IRQ_HANDLED ; +} + +static int __devinit pm8058_rtc_probe (struct platform_device *pdev) +{
drivers/rtc/rtc-pm8058.c line 343
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+int rc; +u8 reg; +struct pm8058_rtc *rtc_dd; +struct pm8058_chip *pm_chip; +struct pm8058_rtc_pdata *pdata = pdev->dev.platform_data; + +if (pdata ==NULL ) { +dev_err (&pdev->dev,"Platform data absent!\n" ); +return -ENXIO ; + }
It might be a good idea to assume a default for rtc_write_enable if pdata is not set.
Quoted 4 lines
drivers/rtc/rtc-pm8058.c new file +4
-0+ + pm_chip =platform_get_drvdata (pdev); +if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"Invalid driver information!\n" );
drivers/rtc/rtc-pm8058.c line 357
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+return -ENXIO ; + } + + rtc_dd =kzalloc (sizeof (*rtc_dd),GFP_KERNEL ); +if (rtc_dd ==NULL ) { +dev_err (&pdev->dev,"Unable to allocate memory!\n" ); +return -ENOMEM ; + } + + rtc_dd->rtc_irq =platform_get_irq (pdev,0 );
You don't seem to use this irq.
Quoted 115 lines
drivers/rtc/rtc-pm8058.c new file +115
-0+ rtc_dd->rtc_alarm_irq =platform_get_irq (pdev,1 ); +if (!rtc_dd->rtc_alarm_irq || !rtc_dd->rtc_irq) { +dev_err (&pdev->dev,"RTC / Alarm IRQ resource absent!\n" ); + rc = -ENXIO ; + goto fail_rtc_enable; + } + + rtc_dd->pm_chip = pm_chip; + +/* Check if the RTC is on, else turn it on */ + rc =pm8058_read (pm_chip,PM8058_RTC_CTRL , ®,1 ); +if (rc <0 ) { +dev_err (&pdev->dev,"PM8058 read failed!\n" ); + goto fail_rtc_enable; + } + +if (!(reg &PM8058_RTC_ENABLE )) { + reg |=PM8058_RTC_ENABLE ; + rc =pm8058_write (pm_chip,PM8058_RTC_CTRL , ®,1 ); +if (rc <0 ) { +dev_err (&pdev->dev,"PM8058 write failed!\n" ); + goto fail_rtc_enable; + } + } + +if (pdata->rtc_write_enable == true) + pm8058_rtc0_ops.set_time = pm8058_rtc0_set_time, + +/* Register the RTC device */ + rtc_dd->rtc0 =rtc_device_register ("pm8058_rtc0" , &pdev->dev, + &pm8058_rtc0_ops,THIS_MODULE ); +if (IS_ERR (rtc_dd->rtc0)) { +dev_err (&pdev->dev,"%s: RTC registration failed (%ld)\n" , + __func__,PTR_ERR (rtc_dd->rtc0)); + rc =PTR_ERR (rtc_dd->rtc0); + goto fail_rtc_enable; + } + +platform_set_drvdata (pdev, rtc_dd); + +/* Request the alarm IRQ */ + rc =request_any_context_irq (rtc_dd->rtc_alarm_irq, + pm8058_alarm_trigger,IRQF_TRIGGER_RISING , +"pm8058_rtc_alarm" , rtc_dd); +if (rc <0 ) { +dev_err (&pdev->dev,"Request IRQ failed (%d)\n" , rc); + goto fail_req_irq; + } + +device_init_wakeup (&pdev->dev,1 ); + +dev_dbg (&pdev->dev,"Probe success !!\n" ); + +return 0 ; + +fail_req_irq: +rtc_device_unregister (rtc_dd->rtc0); +fail_rtc_enable: +kfree (rtc_dd); +return rc; +} + +#ifdef CONFIG_PM +static int pm8058_rtc_resume (struct device *dev) +{ +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (rtc_dd->rtc_alarm_irq); + +return 0 ; +} + +static int pm8058_rtc_suspend (struct device *dev) +{ +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (rtc_dd->rtc_alarm_irq); + +return 0 ; +} + +static const struct dev_pm_ops pm8058_rtc_pm_ops = { + .suspend = pm8058_rtc_suspend, + .resume = pm8058_rtc_resume, +}; +#endif + +static int __devexit pm8058_rtc_remove(struct platform_device *pdev) +{ +struct pm8058_rtc *rtc_dd =platform_get_drvdata (pdev); + +device_init_wakeup (&pdev->dev,0 ); +free_irq (rtc_dd->rtc_alarm_irq, rtc_dd); +rtc_device_unregister (rtc_dd->rtc0); +kfree (rtc_dd); + +return 0 ; +} + +static struct platform_driver pm8058_rtc_driver = { + .probe = pm8058_rtc_probe, + .remove =__devexit_p (pm8058_rtc_remove), + .driver = { + .name ="pm8058-rtc" , + .owner =THIS_MODULE , +#ifdef CONFIG_PM + .pm = &pm8058_rtc_pm_ops, +#endif + }, +}; + +static int __init pm8058_rtc_init (void ) +{
drivers/rtc/rtc-pm8058.c line 482
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+return platform_driver_register (&pm8058_rtc_driver); +} + +static void __exit pm8058_rtc_exit(void) +{ +platform_driver_unregister (&pm8058_rtc_driver); +} + +module_init (pm8058_rtc_init); +module_exit (pm8058_rtc_exit);
module_{init,exit} should go right beneath the function they are referring to
Quoted 28 lines
drivers/rtc/rtc-pm8058.c new file +5
-0+ +MODULE_ALIAS ("platform:pm8058-rtc" ); +MODULE_DESCRIPTION ("PMIC8058 RTC driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR(Anirudh Ghayal "<[email protected]>");include/linux/rtc/rtc-pm8058.h new file +17
-0@@ -0,0 +1,29 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ +
include/linux/rtc/rtc-pm8058.h line 27
Quoted 10 lines
include/linux/rtc/rtc-pm8058.h new file +10
-0+#ifndef __RTC_PM8058_H__ +#define __RTC_PM8058_H__ + +/** +* struct pm8058_rtc_pdata - RTC driver platform data +* @rtc_write_enable - variable stating RTC write capability +*/ +struct pm8058_rtc_pdata { +bool rtc_write_enable; +};
Is there a technical reason why changing the rtc clocks time should be disabled or is this a policy based decision?
Quoted 2 lines
include/linux/rtc/rtc-pm8058.h new file +2
-0+ +#endif /* __RTC_PM8058_H__ */
Re: [rtc-linux] Re: [RFC v1 PATCH 6/6] drivers: rtc: Add support for Qualcomm PMIC8058 RTC
Hi Peter,
Quoted 92 lines
Quoted 91 lines · Trilok Soni
From: Anirudh Ghayal<[email protected]>
PMIC8058 is Qualcomm's power management IC. A 32-bit RTC is housed inside this PMIC. The RTC driver uses SSBI to communicate with the RTC module.
Cc Alessandro Zummo<[email protected]>Signed-off-by Anirudh Ghayal<[email protected]>--- drivers/rtc/Kconfig | 9 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pm8058.c | 487 ++++++++++++++++++++++++++++++++++++++++ include/linux/rtc/rtc-pm8058.h | 29 +++ 4 files changed, 526 insertions(+), 0 deletions(-)create mode 100644
drivers/rtc/rtc-pm8058.ccreate mode 100644include/linux/rtc/rtc-pm8058.hdrivers/rtc/Kconfig +9
-0@@ -665,6 +665,15 @@ config RTC_DRV_NUC900 If you say yes here you get support for the RTC subsystem of the NUC910/NUC920 used in embedded systems. +config RTC_DRV_PM8058 + tristate "Qualcomm PMIC8058 RTC" + depends on PMIC8058 + help + Say Y here if you want to support the Qualcomm PMIC8058 RTC. + + To compile this driver as a module, choose M here: the + module will be called pmic8058-rtc. + comment "on-CPU RTC drivers" config RTC_DRV_DAVINCIdrivers/rtc/Makefile +1
-0@@ -73,6 +73,7 @@ obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o obj-$(CONFIG_RTC_DRV_PCF2123) += rtc-pcf2123.o obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o +obj-$(CONFIG_RTC_DRV_PM8058) += rtc-pm8058.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.odrivers/rtc/rtc-pm8058.c new file +36
-0@@ -0,0 +1,487 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#define pr_fmt (fmt) "%s: " fmt, __func__ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/rtc.h> +#include <linux/mfd/pmic8058.h> +#include <linux/pm.h> +#include <linux/slab.h> +#include <linux/rtc/rtc-pm8058.h> + +/* RTC control registers */ +#define PM8058_RTC_CTRL 0x1E8 +#define PM8058_RTC_ALARM_CTRL 0x1E9 +#define PM8058_RTC_TEST 0x1F6 + +/* RTC register bases */ +#define PM8058_RTC_READ_BASE 0x1EE +#define PM8058_RTC_WRITE_BASE 0x1EA +#define PM8058_RTC_ALARM_BASE 0x1F2
Quoted 9 lines
drivers/rtc/rtc-pm8058.c line 40
Quoted 4 lines
drivers/rtc/rtc-pm8058.c new file +4
-0+ +/* RTC_CTRL register bit fields */ +#define PM8058_RTC_ENABLE BIT(7) +#define PM8058_RTC_ALARM_ENABLE BIT(1)Are there other bits in the ctrl register which are not touch by this driver? If not you could turn the read-modify-write operations changing the ctrl register into simple writes.
I will check this. I think this should be possible.
Quoted 5 lines
Quoted 5 lines
drivers/rtc/rtc-pm8058.c new file +5
-0+ +#define NUM_8_BIT_RTC_REGS 0x4 + +/** +* struct pm8058_rtc - rtc driver internal structure
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 52
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+* @rtc0 - rtc device for this driver +* @rtc_irq - rtc irq number +* @rtc_alarm_irq - rtc alarm irq number +* @pm_chip - pointer to pm8058 parent structure +*/ +struct pm8058_rtc { +struct rtc_device *rtc0;Is there a reason for the '0'?
No specific reason for this. I will remove the '0'.
Quoted 12 lines
Quoted 12 lines
drivers/rtc/rtc-pm8058.c new file +12
-0+int rtc_irq; +int rtc_alarm_irq; +struct pm8058_chip *pm_chip; +}; + +static int +pm8058_rtc_read_bytes (struct pm8058_rtc *rtc_dd,u8 *rtc_val,int base) +{ +int i, rc; + +/* Read the 32-bit register value, 8 bits at a time. */ +for (i =0 ; i<NUM_8_BIT_RTC_REGS ; i++) {
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 70
Quoted 6 lines
drivers/rtc/rtc-pm8058.c new file +6
-0+ rc =pm8058_read (rtc_dd->pm_chip, base + i,&rtc_val[i],1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + }Hm, I don't know the hardware, but I would assume that
pm8058_read(rtc_dd->pm_chip, base, rtc_val, NUM_8_BIT_RTC_REGS)should work as well.
I did try this earlier but the RTC register does not get updated/return a correct 32-bit value. It needs indivisual 8-bit SBI operations.
Quoted 43 lines
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+ +return 0 ; +} + +static int +pm8058_rtc_write_bytes (struct pm8058_rtc *rtc_dd,u8 *rtc_val,int base) +{ +int i, rc;drivers/rtc/rtc-pm8058.c line 88
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +10
-0+ +/* Write the 32-bit register value, 8 bits at a time. */ +for (i =0 ; i<NUM_8_BIT_RTC_REGS ; i++) { + rc =pm8058_write (rtc_dd->pm_chip, base + i,&rtc_val[i],1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + } +Same here
Quoted 24 lines
drivers/rtc/rtc-pm8058.c new file +24
-0+return 0 ; +} + +/* +* Steps to write the RTC registers. +* 1. Disable alarm if enabled. +* 2. Write 0x00 to LSB. +* 3. Write Byte[1], Byte[2], Byte[3] then Byte[0]. +* 4. Enable alarm if disabled in step 1. +*/ +static int +pm8058_rtc0_set_time (struct device *dev,struct rtc_time *tm) +{ +int rc; +unsigned long secs =0 ; +u8 value[4 ], reg =0 , alarm_enabled =0 , ctrl_reg =0 , i; +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +rtc_tm_to_time (tm,&secs); + + value[0 ] = secs&0xFF ; + value[1 ] = (secs>>8 )&0xFF ; + value[2 ] = (secs>>16 )&0xFF ; + value[3 ] = (secs>>24 )&0xFF ;
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 119
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+ +pr_debug ("Seconds value to be written to RTC = %lu\n" , secs); + +/* Disable alarm before updating RTC */ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL ,&ctrl_reg,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" );
dev_errinstead ofpr_err. The otherpr_errshould also be replaced.
Ok
Quoted 100 lines
Quoted 100 lines
drivers/rtc/rtc-pm8058.c new file +100
-0+return rc; + } + +if (ctrl_reg&PM8058_RTC_ALARM_ENABLE ) { + alarm_enabled =1 ; + ctrl_reg&= ~PM8058_RTC_ALARM_ENABLE ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL , + &ctrl_reg,1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + } + +/* Write Byte[1], Byte[2], Byte[3], Byte[0] */ + reg =0 ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +for (i =1 ; i<NUM_8_BIT_RTC_REGS ; i++) { + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE + i, + &value[i],1 ); +if (rc<0 ) { +pr_err ("Write to RTC registers failed\n" ); +return rc; + } + } + + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_WRITE_BASE , + &value[0 ],1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +if (alarm_enabled) { + ctrl_reg |=PM8058_RTC_ALARM_ENABLE ; + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL , + &ctrl_reg,1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + } + +return 0 ; +} + +static int +pm8058_rtc0_read_time (struct device *dev,struct rtc_time *tm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ; +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + + rc =pm8058_rtc_read_bytes (rtc_dd, value,PM8058_RTC_READ_BASE ); +if (rc<0 ) { +pr_err ("RTC time read failed\n" ); +return rc; + } + +/* +* Read the LSB again and check if there has been a carry over. +* If there is, redo the read operation. +*/ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_READ_BASE ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + +if (unlikely (reg< value[0 ])) { + rc =pm8058_rtc_read_bytes (rtc_dd, value, +PM8058_RTC_READ_BASE ); +if (rc<0 ) { +pr_err ("RTC time read failed\n" ); +return rc; + } + } + + secs = value[0 ] | (value[1 ]<<8 ) | (value[2 ]<<16 ) | (value[3 ]<<24 ); + +rtc_time_to_tm (secs, tm); + + rc =rtc_valid_tm (tm); +if (rc<0 ) { +pr_err ("Invalid time read from PMIC8058\n" ); +return rc; + } + +pr_debug ("secs = %lu, h::m:s == %d::%d::%d, d/m/y = %d/%d/%d\n" , + secs, tm->tm_hour, tm->tm_min, tm->tm_sec, + tm->tm_mday, tm->tm_mon, tm->tm_year); + +return 0 ; +}
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 226
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+ +static int +pm8058_rtc0_set_alarm (struct device *dev,struct rtc_wkalrm *alarm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ;No need to initialize secs here.
Ok
Quoted 10 lines
drivers/rtc/rtc-pm8058.c line 234
Quoted 8 lines
drivers/rtc/rtc-pm8058.c new file +8
-0+struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +/* Check if a alarm is valid */ + rc =rtc_valid_tm (&alarm->time); +if (rc<0 ) { +pr_err ("Alarm time invalid\n" ); +return -EINVAL ; + }The upper layer will already check if
alarm->timeis valid, so there is no need to check it here again.
I see. I will remove this.
Quoted 36 lines
Quoted 36 lines
drivers/rtc/rtc-pm8058.c new file +36
-0+ +rtc_tm_to_time (&alarm->time,&secs); + + value[0 ] = secs&0xFF ; + value[1 ] = (secs>>8 )&0xFF ; + value[2 ] = (secs>>16 )&0xFF ; + value[3 ] = (secs>>24 )&0xFF ; + + rc =pm8058_rtc_write_bytes (rtc_dd, value,PM8058_RTC_ALARM_BASE ); +if (rc<0 ) { +pr_err ("Alarm could not be set\n" ); +return rc; + } + + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + + reg = (alarm->enabled) ? (reg |PM8058_RTC_ALARM_ENABLE ) : + (reg& ~PM8058_RTC_ALARM_ENABLE ); + + rc =pm8058_write (rtc_dd->pm_chip,PM8058_RTC_CTRL ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 write failed\n" ); +return rc; + } + +pr_debug ("Alarm Set for h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n" , + alarm->time.tm_hour, alarm->time.tm_min, + alarm->time.tm_sec, alarm->time.tm_mday, + alarm->time.tm_mon, alarm->time.tm_year); + +return 0 ; +}
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 277
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+ +static int +pm8058_rtc0_read_alarm (struct device *dev,struct rtc_wkalrm *alarm) +{ +int rc; +u8 value[4 ], reg; +unsigned long secs =0 ;No need to initialize secs here.
Ok
Quoted 33 lines
Quoted 33 lines
drivers/rtc/rtc-pm8058.c new file +33
-0+struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +/* Check if the alarm is enabled */ + rc =pm8058_read (rtc_dd->pm_chip,PM8058_RTC_CTRL ,®,1 ); +if (rc<0 ) { +pr_err ("PM8058 read failed\n" ); +return rc; + } + alarm->enabled = !!(reg&PM8058_RTC_ALARM_ENABLE ); + + rc =pm8058_rtc_read_bytes (rtc_dd, value, +PM8058_RTC_ALARM_BASE ); +if (rc<0 ) { +pr_err ("RTC alarm time read failed\n" ); +return rc; + } + + secs = value[0 ] | (value[1 ]<<8 ) | (value[2 ]<<16 ) | (value[3 ]<<24 ); + +rtc_time_to_tm (secs,&alarm->time); + + rc =rtc_valid_tm (&alarm->time); +if (rc<0 ) { +pr_err ("Invalid time read from PMIC8058\n" ); +return rc; + } + +pr_debug ("Alarm set for - h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n" , + alarm->time.tm_hour, alarm->time.tm_min, + alarm->time.tm_sec, alarm->time.tm_mday, + alarm->time.tm_mon, alarm->time.tm_year); + +return 0 ;
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 316
Quoted 6 lines
drivers/rtc/rtc-pm8058.c new file +6
-0+} + +static struct rtc_class_ops pm8058_rtc0_ops = { + .read_time = pm8058_rtc0_read_time, + .set_alarm = pm8058_rtc0_set_alarm, + .read_alarm = pm8058_rtc0_read_alarm,Implementig
alarm_irq_enablemight be a good idea
Ok, I'll try to add the other supported ops as well.
Quoted 12 lines
drivers/rtc/rtc-pm8058.c line 325
Quoted 10 lines
drivers/rtc/rtc-pm8058.c new file +9
-0+}; + +static irqreturn_t pm8058_alarm_trigger (int irq,void *dev_id) +{ +unsigned long events =0 ; +struct pm8058_rtc *rtc_dd = dev_id; + + events =RTC_IRQF |RTC_AF ; +rtc_update_irq (rtc_dd->rtc0,1 , events);just
rtc_update_irq(rtc_dd->rtc0, 1, RTC_IRQF | RTC_AF); should be fine
Ok
Quoted 12 lines
Quoted 12 lines
drivers/rtc/rtc-pm8058.c new file +11
-0+ +pr_debug ("Alarm Triggered !!\n" ); + +return IRQ_HANDLED ; +} + +static int __devinit pm8058_rtc_probe (struct platform_device *pdev) +{ +int rc; +u8 reg; +struct pm8058_rtc *rtc_dd;
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 343
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+struct pm8058_chip *pm_chip; +struct pm8058_rtc_pdata *pdata = pdev->dev.platform_data; + +if (pdata ==NULL ) { +dev_err (&pdev->dev,"Platform data absent!\n" ); +return -ENXIO ; + }It might be a good idea to assume a default for
rtc_write_enableif pdata is not set.
Yes, makes sense.
Quoted 7 lines
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+ + pm_chip =platform_get_drvdata (pdev); +if (pm_chip ==NULL ) { +dev_err (&pdev->dev,"Invalid driver information!\n" ); +return -ENXIO ; + } +
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 357
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+ rtc_dd =kzalloc (sizeof (*rtc_dd),GFP_KERNEL ); +if (rtc_dd ==NULL ) { +dev_err (&pdev->dev,"Unable to allocate memory!\n" ); +return -ENOMEM ; + } + + rtc_dd->rtc_irq =platform_get_irq (pdev,0 );You don't seem to use this irq.
This was for the RTC tick interrupt. I will remove this code.
Quoted 119 lines
Quoted 119 lines
drivers/rtc/rtc-pm8058.c new file +118
-0+ rtc_dd->rtc_alarm_irq =platform_get_irq (pdev,1 ); +if (!rtc_dd->rtc_alarm_irq || !rtc_dd->rtc_irq) { +dev_err (&pdev->dev,"RTC / Alarm IRQ resource absent!\n" ); + rc = -ENXIO ; + goto fail_rtc_enable; + } + + rtc_dd->pm_chip = pm_chip; + +/* Check if the RTC is on, else turn it on */ + rc =pm8058_read (pm_chip,PM8058_RTC_CTRL ,®,1 ); +if (rc<0 ) { +dev_err (&pdev->dev,"PM8058 read failed!\n" ); + goto fail_rtc_enable; + } + +if (!(reg&PM8058_RTC_ENABLE )) { + reg |=PM8058_RTC_ENABLE ; + rc =pm8058_write (pm_chip,PM8058_RTC_CTRL ,®,1 ); +if (rc<0 ) { +dev_err (&pdev->dev,"PM8058 write failed!\n" ); + goto fail_rtc_enable; + } + } + +if (pdata->rtc_write_enable == true) + pm8058_rtc0_ops.set_time = pm8058_rtc0_set_time, + +/* Register the RTC device */ + rtc_dd->rtc0 =rtc_device_register ("pm8058_rtc0" ,&pdev->dev, + &pm8058_rtc0_ops,THIS_MODULE ); +if (IS_ERR (rtc_dd->rtc0)) { +dev_err (&pdev->dev,"%s: RTC registration failed (%ld)\n" , + __func__,PTR_ERR (rtc_dd->rtc0)); + rc =PTR_ERR (rtc_dd->rtc0); + goto fail_rtc_enable; + } + +platform_set_drvdata (pdev, rtc_dd); + +/* Request the alarm IRQ */ + rc =request_any_context_irq (rtc_dd->rtc_alarm_irq, + pm8058_alarm_trigger,IRQF_TRIGGER_RISING , +"pm8058_rtc_alarm" , rtc_dd); +if (rc<0 ) { +dev_err (&pdev->dev,"Request IRQ failed (%d)\n" , rc); + goto fail_req_irq; + } + +device_init_wakeup (&pdev->dev,1 ); + +dev_dbg (&pdev->dev,"Probe success !!\n" ); + +return 0 ; + +fail_req_irq: +rtc_device_unregister (rtc_dd->rtc0); +fail_rtc_enable: +kfree (rtc_dd); +return rc; +} + +#ifdef CONFIG_PM +static int pm8058_rtc_resume (struct device *dev) +{ +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (rtc_dd->rtc_alarm_irq); + +return 0 ; +} + +static int pm8058_rtc_suspend (struct device *dev) +{ +struct pm8058_rtc *rtc_dd =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (rtc_dd->rtc_alarm_irq); + +return 0 ; +} + +static const struct dev_pm_ops pm8058_rtc_pm_ops = { + .suspend = pm8058_rtc_suspend, + .resume = pm8058_rtc_resume, +}; +#endif + +static int __devexit pm8058_rtc_remove(struct platform_device *pdev) +{ +struct pm8058_rtc *rtc_dd =platform_get_drvdata (pdev); + +device_init_wakeup (&pdev->dev,0 ); +free_irq (rtc_dd->rtc_alarm_irq, rtc_dd); +rtc_device_unregister (rtc_dd->rtc0); +kfree (rtc_dd); + +return 0 ; +} + +static struct platform_driver pm8058_rtc_driver = { + .probe = pm8058_rtc_probe, + .remove =__devexit_p (pm8058_rtc_remove), + .driver = { + .name ="pm8058-rtc" , + .owner =THIS_MODULE , +#ifdef CONFIG_PM + .pm =&pm8058_rtc_pm_ops, +#endif + }, +}; + +static int __init pm8058_rtc_init (void ) +{ +return platform_driver_register (&pm8058_rtc_driver); +} +
Quoted 8 lines
drivers/rtc/rtc-pm8058.c line 482
Quoted 7 lines
drivers/rtc/rtc-pm8058.c new file +7
-0+static void __exit pm8058_rtc_exit(void) +{ +platform_driver_unregister (&pm8058_rtc_driver); +} + +module_init (pm8058_rtc_init); +module_exit (pm8058_rtc_exit);module_{init,exit} should go right beneath the function they are referring to
Ok.
Quoted 33 lines
Quoted 33 lines
drivers/rtc/rtc-pm8058.c new file +5
-0+ +MODULE_ALIAS ("platform:pm8058-rtc" ); +MODULE_DESCRIPTION ("PMIC8058 RTC driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR(Anirudh Ghayal "<[email protected]>");include/linux/rtc/rtc-pm8058.h new file +21
-0@@ -0,0 +1,29 @@ +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +#ifndef __RTC_PM8058_H__ +#define __RTC_PM8058_H__ + +/**
Quoted 8 lines
include/linux/rtc/rtc-pm8058.h line 27
Quoted 6 lines
include/linux/rtc/rtc-pm8058.h new file +6
-0+* struct pm8058_rtc_pdata - RTC driver platform data +* @rtc_write_enable - variable stating RTC write capability +*/ +struct pm8058_rtc_pdata { +bool rtc_write_enable; +};Is there a technical reason why changing the rtc clocks time should be disabled or is this a policy based decision?
In some of our MSM/QSD designs, we have a single RTC shared by multiple processors (other than the ones running Linux). Thus, the need to have a non-writable RTC using this pdata.
Quoted 3 lines
include/linux/rtc/rtc-pm8058.h line 29
Quoted 2 lines
include/linux/rtc/rtc-pm8058.h new file +2
-0+ +#endif /* __RTC_PM8058_H__ */
Thank you for the detailed review. I will make these changes in my next patch.
--Anirudh
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.