Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6defe9a0 authored by Tomasz Figa's avatar Tomasz Figa Committed by Linus Walleij
Browse files

pinctrl: samsung: Hold pointer to driver data in bank struct 



This patch is a preparation for converting the pinctrl-samsung driver to
one GPIO chip and IRQ domain per bank. It allows one having only
a pointer to particular bank struct to access driver data struct.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Reviewed-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ab663789

drivers/pinctrl/pinctrl-samsung.c

+10 −8
Original line number Diff line number Diff line
@@ -789,17 +789,18 @@ static const struct of_device_id samsung_pinctrl_dt_match[]; 


/* retrieve the soc specific data */

static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data(

				struct samsung_pinctrl_drv_data *d,

				struct platform_device *pdev)

{

	int id;

	const struct of_device_id *match;

	const struct device_node *node = pdev->dev.of_node;

	struct device_node *node = pdev->dev.of_node;

	struct device_node *np;

	struct samsung_pin_ctrl *ctrl;

	struct samsung_pin_bank *bank;

	int i;



	id = of_alias_get_id(pdev->dev.of_node, "pinctrl");

	id = of_alias_get_id(node, "pinctrl");

	if (id < 0) {

		dev_err(&pdev->dev, "failed to get alias id\n");

		return NULL;
@@ -809,6 +810,7 @@ static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data( 


	bank = ctrl->pin_banks;

	for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {

		bank->drvdata = d;

		bank->pin_base = ctrl->nr_pins;

		ctrl->nr_pins += bank->nr_pins;

		if (bank->eint_type == EINT_TYPE_GPIO) {
@@ -848,18 +850,18 @@ static int __devinit samsung_pinctrl_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	ctrl = samsung_pinctrl_get_soc_data(pdev);

	if (!ctrl) {

		dev_err(&pdev->dev, "driver data not available\n");

		return -EINVAL;

	}



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

	if (!drvdata) {

		dev_err(dev, "failed to allocate memory for driver's "

				"private data\n");

		return -ENOMEM;

	}



	ctrl = samsung_pinctrl_get_soc_data(drvdata, pdev);

	if (!ctrl) {

		dev_err(&pdev->dev, "driver data not available\n");

		return -EINVAL;

	}

	drvdata->ctrl = ctrl;

	drvdata->dev = dev;

drivers/pinctrl/pinctrl-samsung.h

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ struct samsung_pinctrl_drv_data; 
 * @irq_base: starting controller local irq number of the bank.

 * @name: name to be prefixed for each pin in this pin bank.

 * @of_node: OF node of the bank.

 * @drvdata: link to controller driver data

 */

struct samsung_pin_bank {

	u32		pctl_offset;
@@ -126,6 +127,7 @@ struct samsung_pin_bank { 
	u32		irq_base;

	char		*name;

	struct device_node *of_node;

	struct samsung_pinctrl_drv_data *drvdata;

};



/**