[PATCH v1 RFC] This patch repairs HTC Magician machine (PXA27x) support
Jacek Anaszewski
j.anaszewski at samsung.com
Thu Aug 13 01:10:00 PDT 2015
Hi Petr,
This is review only of the LED subsystem related part of this patch,.
On 08/13/2015 12:51 AM, Petr Cvek wrote:
> Fixing original code: Problems to successful boot due to the bad LCD
> power sequence (wrongly configured GPIO).
>
> Add/fix platform data and helper function for various hardware
> (touchscreen, audio, USB device, ...).
>
> Add new discovered GPIOs and fix names by GPIO context.
>
> Add new LEDs driver.
>
> Signed-off-by: Petr Cvek <petr.cvek at tul.cz>
> ---
> arch/arm/mach-pxa/Kconfig | 1 +
> arch/arm/mach-pxa/include/mach/magician.h | 21 +-
> arch/arm/mach-pxa/magician.c | 1148 +++++++++++++++++++++++------
> drivers/leds/Kconfig | 9 +
> drivers/leds/Makefile | 1 +
> drivers/leds/leds-pasic3.c | 192 +++++
> drivers/mfd/htc-pasic3.c | 115 ++-
> include/linux/mfd/htc-pasic3.h | 69 +-
> 8 files changed, 1293 insertions(+), 263 deletions(-)
> create mode 100644 drivers/leds/leds-pasic3.c
>
[...]
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index 9ad35f7..516ba65 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -586,6 +586,15 @@ config LEDS_PM8941_WLED
> This option enables support for the 'White' LED block
> on Qualcomm PM8941 PMICs.
>
> +config LEDS_PASIC3
> + tristate "LED support for the HTC Magician/Alpine PASIC3"
> + depends on LEDS_CLASS
> + depends on HTC_PASIC3
> + select REGMAP
> + help
> + This option enables support for the PASIC3 chip (different chip
> + than Compaq ASIC3).
> +
> comment "LED Triggers"
> source "drivers/leds/trigger/Kconfig"
>
> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
> index 8d6a24a..b1c659c 100644
> --- a/drivers/leds/Makefile
> +++ b/drivers/leds/Makefile
> @@ -65,6 +65,7 @@ obj-$(CONFIG_LEDS_VERSATILE) += leds-versatile.o
> obj-$(CONFIG_LEDS_MENF21BMC) += leds-menf21bmc.o
> obj-$(CONFIG_LEDS_PM8941_WLED) += leds-pm8941-wled.o
> obj-$(CONFIG_LEDS_KTD2692) += leds-ktd2692.o
> +obj-$(CONFIG_LEDS_PASIC3) += leds-pasic3.o
>
> # LED SPI Drivers
> obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o
> diff --git a/drivers/leds/leds-pasic3.c b/drivers/leds/leds-pasic3.c
> new file mode 100644
> index 0000000..ecb0557
> --- /dev/null
> +++ b/drivers/leds/leds-pasic3.c
> @@ -0,0 +1,192 @@
> +/*
> + * AIC3 (or PASIC3) LED driver for HTC Magician/Alpine/.. (not Compaq ASIC3)
> + *
> + * Copyright (c) 2015 Petr Cvek <petr.cvek at tul.cz>
> + *
> + * Based on leds-asic3.c driver
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/leds.h>
> +#include <linux/slab.h>
> +
This empty line is not required.
> +#include <linux/mfd/htc-pasic3.h>
> +#include <linux/mfd/core.h>
> +#include <linux/module.h>
Please keep alphabetical order across all includes.
> +/*
> + * 1 tick is around 62-63 ms, blinking settings (on+off):
> + * Min: 1+1 ticks ~125ms
> + * Max: 127+127 ticks ~15 875ms
> + * Sometimes takes time to change after write (counter overflow?)
> + */
> +
> +#define MS_TO_CLK(ms) DIV_ROUND_CLOSEST(((ms)*1024), 64000)
> +#define CLK_TO_MS(clk) (((clk)*64000)/1024)
> +#define MAX_CLK 254 /* 127 + 127 (2x 7 bit reg) */
> +#define MAX_MS CLK_TO_MS(MAX_CLK)
> +
> +static void brightness_set(struct led_classdev *cdev,
> + enum led_brightness value)
> +{
> + struct platform_device *pdev = to_platform_device(cdev->dev->parent);
> + const struct mfd_cell *cell = mfd_get_cell(pdev);
> + struct pasic3_led *led;
> + struct device *dev;
> + u8 val;
> +
> + if (!cell->platform_data) {
> + pr_err("No platform data\n");
> + return;
> + }
> +
> + led = cell->platform_data;
> + dev = pdev->dev.parent;
> +
> + if (value == LED_OFF) {
> + val = pasic3_read_register(dev, PASIC3_CH_CONTROL);
> + pasic3_write_register(dev, PASIC3_CH_CONTROL,
> + val & ~(led->bit_blink_en | led->bit_force_on));
> +
> + val = pasic3_read_register(dev, PASIC3_MASK_A);
> + pasic3_write_register(dev, PASIC3_MASK_A, val & ~led->bit_mask);
I think that you need spin_lock protection as setting brightness
is not an atomic operation here. Moreover pasic3_write_register
calls __raw_writeb twice, without spin_lock protection. This function
is used also in drivers/mfd/htc-pasic3.c - shouldn't it be fixed?
> + } else {
> + val = pasic3_read_register(dev, PASIC3_CH_CONTROL);
> + pasic3_write_register(dev, PASIC3_CH_CONTROL,
> + val | led->bit_force_on);
> + }
> +}
> +
> +static int blink_set(struct led_classdev *cdev,
> + unsigned long *delay_on,
> + unsigned long *delay_off)
> +{
> + struct platform_device *pdev = to_platform_device(cdev->dev->parent);
> + const struct mfd_cell *cell = mfd_get_cell(pdev);
> + struct device *dev;
> + struct pasic3_led *led;
> + u32 on, off;
> + u8 val;
> +
> + if (!cell->platform_data) {
> + pr_err("No platform data\n");
> + return -EINVAL;
> + }
> +
> + if (*delay_on > MAX_MS || *delay_off > MAX_MS)
> + return -EINVAL;
> +
> + if (*delay_on == 0 && *delay_off == 0) {
> + /* If both are zero then a sensible default should be chosen */
> + on = MS_TO_CLK(500);
> + off = MS_TO_CLK(500);
> + } else {
> + on = MS_TO_CLK(*delay_on);
> + off = MS_TO_CLK(*delay_off);
> + if ((on + off) > MAX_CLK)
> + return -EINVAL;
> + /* Minimal value must be 1 */
> + on = on ? on : 1;
> + off = off ? off : 1;
> + }
> +
> + led = cell->platform_data;
> + dev = pdev->dev.parent;
> +
> + pasic3_write_register(dev, led->reg_delay_on, on);
> + pasic3_write_register(dev, led->reg_delay_off, off);
> +
> + val = pasic3_read_register(dev, PASIC3_CH_CONTROL);
> + pasic3_write_register(dev, PASIC3_CH_CONTROL, val | led->bit_blink_en);
Ditto.
> + *delay_on = CLK_TO_MS(on);
> + *delay_off = CLK_TO_MS(off);
> +
> + return 0;
> +}
> +
> +static int pasic3_led_probe(struct platform_device *pdev)
> +{
> + struct pasic3_led *led = dev_get_platdata(&pdev->dev);
> + int ret;
> +
> + ret = mfd_cell_enable(pdev);
> + if (ret < 0)
> + return ret;
> +
> + led->cdev.flags = LED_CORE_SUSPENDRESUME;
> + led->cdev.brightness_set = brightness_set;
> + led->cdev.blink_set = blink_set;
You need to set also led->cdev.name. What is the name of your
LED in the sysfs now?
> + ret = led_classdev_register(&pdev->dev, &led->cdev);
> + if (ret < 0)
> + goto out;
Please use devm_led_classdev_register.
> + return 0;
> +
> +out:
> + (void) mfd_cell_disable(pdev);
> + return ret;
> +}
> +
> +static int pasic3_led_remove(struct platform_device *pdev)
> +{
> + struct pasic3_led *led = dev_get_platdata(&pdev->dev);
> +
> + led_classdev_unregister(&led->cdev);
> +
> + return mfd_cell_disable(pdev);
> +}
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int pasic3_led_suspend(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + const struct mfd_cell *cell = mfd_get_cell(pdev);
> + int ret;
> +
> + ret = 0;
> + if (cell->suspend)
> + ret = (*cell->suspend)(pdev);
> +
> + return ret;
> +}
> +
> +static int pasic3_led_resume(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + const struct mfd_cell *cell = mfd_get_cell(pdev);
> + int ret;
> +
> + ret = 0;
> + if (cell->resume)
> + ret = (*cell->resume)(pdev);
> +
> + return ret;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(pasic3_led_pm_ops, pasic3_led_suspend,
> + pasic3_led_resume);
> +
> +static struct platform_driver pasic3_led_driver = {
> + .probe = pasic3_led_probe,
> + .remove = pasic3_led_remove,
> + .driver = {
> + .name = "leds-pasic3",
> + .pm = &pasic3_led_pm_ops,
> + },
> +};
> +
> +module_platform_driver(pasic3_led_driver);
> +
> +MODULE_AUTHOR("Petr Cvek <petr.cvek at tul.cz>");
> +MODULE_DESCRIPTION("HTC Magician PASIC3 LED driver");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:leds-pasic3");
[...]
--
Best Regards,
Jacek Anaszewski
More information about the linux-arm-kernel
mailing list