Commit 6b946699 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

staging: mfd: hi6421-spmi-pmic: cleanup the code 



There are several small cleanups that can be done in order to
make the code more prepared to be upstreamed.

Suggested-by: default avatarJonathan Cameron <Jonathan.Cameron@Huawei.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/823792ba2f69e613629ab52a33e5728d54e2288b.1597647359.git.mchehab+huawei@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 926648d4

drivers/staging/hikey9xx/hi6421-spmi-pmic.c

+67 −84
Original line number Diff line number Diff line
@@ -17,26 +17,23 @@ 
 *

 */



#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/mfd/core.h>

#include <linux/platform_device.h>

#include <linux/of.h>

#include <linux/mfd/hi6421-spmi-pmic.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/mfd/hi6421-spmi-pmic.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spmi.h>

#ifndef NO_IRQ

#define NO_IRQ       0

#endif



/* 8-bit register offset in PMIC */

#define HISI_MASK_STATE			0xff
@@ -46,7 +43,6 @@ 
#define HISI_IRQ_KEY_DOWN		7

#define HISI_IRQ_KEY_UP			6



/*#define HISI_NR_IRQ			25*/

#define HISI_MASK_FIELD			0xFF

#define HISI_BITS			8
@@ -62,58 +58,60 @@ static const struct mfd_cell hi6421v600_devs[] = { 
 * Hisilicon SoC use hardware to map PMIC register into SoC mapping.

 * At here, we are accessing SoC register with 32-bit.

 */

u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg)

int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg)

{

	u32 ret;

	u8 read_value = 0;

	struct spmi_device *pdev;

	u8 read_value = 0;

	u32 ret;



	pdev = to_spmi_device(pmic->dev);

	if (!pdev) {

		pr_err("%s: pdev get failed!\n", __func__);

		return 0;

		return -ENODEV;

	}



	ret = spmi_ext_register_readl(pdev, reg,

				      (unsigned char *)&read_value, 1);

	ret = spmi_ext_register_readl(pdev, reg, &read_value, 1);

	if (ret) {

		pr_err("%s: spmi_ext_register_readl failed!\n", __func__);

		return 0;

		return ret;

	}

	return (u32)read_value;

	return read_value;

}

EXPORT_SYMBOL(hi6421_spmi_pmic_read);



void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val)

int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val)

{

	u32 ret;

	struct spmi_device *pdev;

	u32 ret;



	pdev = to_spmi_device(pmic->dev);

	if (!pdev) {

		pr_err("%s: pdev get failed!\n", __func__);

		return;

		return -ENODEV;

	}



	ret = spmi_ext_register_writel(pdev, reg, (unsigned char *)&val, 1);

	if (ret) {

	if (ret)

		pr_err("%s: spmi_ext_register_writel failed!\n", __func__);

		return;

	}



	return ret;

}

EXPORT_SYMBOL(hi6421_spmi_pmic_write);



void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg,

int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg,

			 u32 mask, u32 bits)

{

	u32 data;

	unsigned long flags;

	u32 data;

	int ret;



	spin_lock_irqsave(&pmic->lock, flags);

	data = hi6421_spmi_pmic_read(pmic, reg) & ~mask;

	data |= mask & bits;

	hi6421_spmi_pmic_write(pmic, reg, data);

	ret = hi6421_spmi_pmic_write(pmic, reg, data);

	spin_unlock_irqrestore(&pmic->lock, flags);



	return ret;

}

EXPORT_SYMBOL(hi6421_spmi_pmic_rmw);
@@ -124,16 +122,16 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) 
	int i, offset;



	for (i = 0; i < pmic->irqarray; i++) {

		pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr.start_addr));

		pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr));

		pending &= HISI_MASK_FIELD;

		if (pending != 0)

			pr_debug("pending[%d]=0x%lx\n\r", i, pending);



		hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr.start_addr),

				       pending);

		hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending);



		/* solve powerkey order */

		if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) {

		if ((i == HISI_IRQ_KEY_NUM) &&

		    ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) {

			generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]);

			generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]);

			pending &= (~HISI_IRQ_KEY_VALUE);
@@ -155,7 +153,7 @@ static void hi6421_spmi_irq_mask(struct irq_data *d) 
	unsigned long flags;



	offset = (irqd_to_hwirq(d) >> 3);

	offset += pmic->irq_mask_addr.start_addr;

	offset += pmic->irq_mask_addr;



	spin_lock_irqsave(&pmic->lock, flags);

	data = hi6421_spmi_pmic_read(pmic, offset);
@@ -171,7 +169,7 @@ static void hi6421_spmi_irq_unmask(struct irq_data *d) 
	unsigned long flags;



	offset = (irqd_to_hwirq(d) >> 3);

	offset += pmic->irq_mask_addr.start_addr;

	offset += pmic->irq_mask_addr;



	spin_lock_irqsave(&pmic->lock, flags);

	data = hi6421_spmi_pmic_read(pmic, offset);
@@ -211,18 +209,16 @@ static int get_pmic_device_tree_data(struct device_node *np, 
{

	int ret = 0;



	/*get pmic irq num*/

	ret = of_property_read_u32_array(np, "irq-num",

					 &pmic->irqnum, 1);

	/* IRQ number */

	ret = of_property_read_u32(np, "irq-num", &pmic->irqnum);

	if (ret) {

		pr_err("no irq-num property set\n");

		ret = -ENODEV;

		return ret;

	}



	/*get pmic irq array number*/

	ret = of_property_read_u32_array(np, "irq-array",

					 &pmic->irqarray, 1);

	/* Size of IRQ array */

	ret = of_property_read_u32(np, "irq-array", &pmic->irqarray);

	if (ret) {

		pr_err("no irq-array property set\n");

		ret = -ENODEV;
@@ -230,8 +226,7 @@ static int get_pmic_device_tree_data(struct device_node *np, 
	}



	/* SOC_PMIC_IRQ_MASK_0_ADDR */

	ret = of_property_read_u32_array(np, "irq-mask-addr",

					 (int *)&pmic->irq_mask_addr, 2);

	ret = of_property_read_u32(np, "irq-mask-addr", &pmic->irq_mask_addr);

	if (ret) {

		pr_err("no irq-mask-addr property set\n");

		ret = -ENODEV;
@@ -239,8 +234,7 @@ static int get_pmic_device_tree_data(struct device_node *np, 
	}



	/* SOC_PMIC_IRQ0_ADDR */

	ret = of_property_read_u32_array(np, "irq-addr",

					 (int *)&pmic->irq_addr, 2);

	ret = of_property_read_u32(np, "irq-addr", &pmic->irq_addr);

	if (ret) {

		pr_err("no irq-addr property set\n");

		ret = -ENODEV;
@@ -252,18 +246,18 @@ static int get_pmic_device_tree_data(struct device_node *np, 


static void hi6421_spmi_pmic_irq_prc(struct hi6421_spmi_pmic *pmic)

{

	int i;

	int i, pending;



	for (i = 0 ; i < pmic->irq_mask_addr.array; i++)

		hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i,

	for (i = 0 ; i < pmic->irqarray; i++)

		hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr + i,

				       HISI_MASK_STATE);



	for (i = 0 ; i < pmic->irq_addr.array; i++) {

		unsigned int pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr.start_addr + i);

	for (i = 0 ; i < pmic->irqarray; i++) {

		pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr + i);



		pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n",

			 pmic->irq_addr.start_addr + i, pending);

		hi6421_spmi_pmic_write(pmic, pmic->irq_addr.start_addr + i,

			 pmic->irq_addr + i, pending);

		hi6421_spmi_pmic_write(pmic, pmic->irq_addr + i,

				       HISI_MASK_STATE);

	}

}
@@ -272,36 +266,32 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct hi6421_spmi_pmic *pmic = NULL;

	enum of_gpio_flags flags;

	int ret = 0;

	int i;

	struct hi6421_spmi_pmic *pmic;

	unsigned int virq;

	int ret, i;



	pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);

	if (!pmic)

		return -ENOMEM;



	/*TODO: get pmic dts info*/

	ret = get_pmic_device_tree_data(np, pmic);

	if (ret) {

		dev_err(&pdev->dev, "Error reading hisi pmic dts\n");

		dev_err(dev, "Error reading hisi pmic dts\n");

		return ret;

	}



	/* TODO: get and enable clk request */

	spin_lock_init(&pmic->lock);



	pmic->dev = dev;



	pmic->gpio = of_get_gpio_flags(np, 0, &flags);

	pmic->gpio = of_get_gpio(np, 0);

	if (pmic->gpio < 0)

		return pmic->gpio;



	if (!gpio_is_valid(pmic->gpio))

		return -EINVAL;



	ret = gpio_request_one(pmic->gpio, GPIOF_IN, "pmic");

	ret = devm_gpio_request_one(dev, pmic->gpio, GPIOF_IN, "pmic");

	if (ret < 0) {

		dev_err(dev, "failed to request gpio%d\n", pmic->gpio);

		return ret;
@@ -309,7 +299,6 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) 


	pmic->irq = gpio_to_irq(pmic->gpio);



	/* mask && clear IRQ status */

	hi6421_spmi_pmic_irq_prc(pmic);



	pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL);
@@ -321,27 +310,27 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) 
	if (!pmic->domain) {

		dev_err(dev, "failed irq domain add simple!\n");

		ret = -ENODEV;

		goto irq_domain;

		goto irq_malloc;

	}



	for (i = 0; i < pmic->irqnum; i++) {

		virq = irq_create_mapping(pmic->domain, i);

		if (virq == NO_IRQ) {

			pr_debug("Failed mapping hwirq\n");

		if (!virq) {

			dev_err(dev, "Failed mapping hwirq\n");

			ret = -ENOSPC;

			goto irq_create_mapping;

			goto irq_malloc;

		}

		pmic->irqs[i] = virq;

		pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]);

		dev_dbg(dev, "%s: pmic->irqs[%d] = %d\n",

			__func__, i, pmic->irqs[i]);

	}



	ret = request_threaded_irq(pmic->irq, hi6421_spmi_irq_handler, NULL,

				   IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND,

				   "pmic", pmic);

	if (ret < 0) {

		dev_err(dev, "could not claim pmic %d\n", ret);

		ret = -ENODEV;

		goto request_theaded_irq;

		dev_err(dev, "could not claim pmic IRQ: error %d\n", ret);

		goto irq_malloc;

	}



	dev_set_drvdata(&pdev->dev, pmic);
@@ -355,18 +344,14 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) 
	ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,

				   hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),

				   NULL, 0, NULL);

	if (ret) {

		dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret);

		return ret;

	}



	if (!ret)

		return 0;



request_theaded_irq:

irq_create_mapping:

irq_domain:

	dev_err(dev, "Failed to add child devices: %d\n", ret);



irq_malloc:

	gpio_free(pmic->gpio);

	free_irq(pmic->irq, pmic);



	return ret;

}
@@ -375,8 +360,6 @@ static void hi6421_spmi_pmic_remove(struct spmi_device *pdev) 
	struct hi6421_spmi_pmic *pmic = dev_get_drvdata(&pdev->dev);



	free_irq(pmic->irq, pmic);

	gpio_free(pmic->gpio);

	devm_kfree(&pdev->dev, pmic);

}



static const struct of_device_id pmic_spmi_id_table[] = {

include/linux/mfd/hi6421-spmi-pmic.h

+7 −5
Original line number Diff line number Diff line
@@ -36,15 +36,17 @@ struct hi6421_spmi_pmic { 
	int					irq;

	int					gpio;

	unsigned int				*irqs;



	int					irqnum;

	int					irqarray;

	struct hi6421_spmi_irq_mask_info	irq_mask_addr;

	struct hi6421_spmi_irq_info		irq_addr;

	int					irq_mask_addr;

	int					irq_addr;

};



u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg);

void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val);

void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits);

int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg);

int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val);

int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg,

			 u32 mask, u32 bits);



enum hi6421_spmi_pmic_irq_list {

	OTMP = 0,