On Thu, 09 Jun 2016, John Stultz wrote:
> Wire up the powerkey driver functionality for the hi655x PMIC.
>
> Cc: Dmitry Torokhov <dmitry.torok...@gmail.com>
> Cc: Rob Herring <robh...@kernel.org>
> Cc: Lee Jones <lee.jo...@linaro.org>
> Cc: Jorge Ramirez-Ortiz <jorge.ramirez-or...@linaro.org>
> Cc: Feng Chen <puck.c...@hisilicon.com>
> Cc: Wei Xu <xuw...@hisilicon.com>
> Cc: Guodong Xu <guodong...@linaro.org>
> Signed-off-by: John Stultz <john.stu...@linaro.org>
> ---
> drivers/mfd/hi655x-pmic.c | 37 ++++++++++++++++++++++++++++++++-----
> 1 file changed, 32 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c
> index 68ab370..f3f6bfe2 100644
> --- a/drivers/mfd/hi655x-pmic.c
> +++ b/drivers/mfd/hi655x-pmic.c
> @@ -24,10 +24,6 @@
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
>
> -static const struct mfd_cell hi655x_pmic_devs[] = {
> - { .name = "hi655x-regulator", },
> -};
> -
> static const struct regmap_irq hi655x_irqs[] = {
> { .reg_offset = 0, .mask = OTMP_D1R_INT },
> { .reg_offset = 0, .mask = VSYS_2P5_R_INT },
> @@ -56,6 +52,36 @@ static struct regmap_config hi655x_regmap_config = {
> .max_register = HI655X_BUS_ADDR(0xFFF),
> };
>
> +static struct resource pwrkey_resources[] = {
> + {
> + .name = "down",
> + .start = 6,
> + .end = 6,
> + .flags = IORESOURCE_IRQ,
> + }, {
> + .name = "up",
> + .start = 5,
> + .end = 5,
> + .flags = IORESOURCE_IRQ,
> + }, {
> + .name = "hold 4s",
> + .start = 4,
> + .end = 4,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
No idea what 4, 5 and 6 mean. Please define them.
> +static const struct mfd_cell hi655x_pmic_devs[] = {
> + {
> + .name = "hi655x-regulator",
> + },
> + {
> + .name = "hi65xx-powerkey",
> + .num_resources = ARRAY_SIZE(pwrkey_resources),
> + .resources = &pwrkey_resources[0],
> + },
> +};
Nit: Place the -regulator entry at the bottom and turn it into a one
liner:
{ .name = "hi655x-regulator", },
> static void hi655x_local_irq_clear(struct regmap *map)
> {
> int i;
> @@ -124,7 +150,8 @@ static int hi655x_pmic_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, pmic);
>
> ret = mfd_add_devices(dev, PLATFORM_DEVID_AUTO, hi655x_pmic_devs,
> - ARRAY_SIZE(hi655x_pmic_devs), NULL, 0, NULL);
> + ARRAY_SIZE(hi655x_pmic_devs), NULL, 0,
> + regmap_irq_get_domain(pmic->irq_data));
> if (ret) {
> dev_err(dev, "Failed to register device %d\n", ret);
> regmap_del_irq_chip(gpio_to_irq(pmic->gpio), pmic->irq_data);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
