Commit 22d5127e authored by Tony Lindgren's avatar Tony Lindgren Committed by Linus Walleij
Browse files

pinctrl: single: Use generic parser and #pinctrl-cells for pinctrl-single,bits 



We can now use generic parser and keep things compatible with the
old binding.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4622215f

drivers/pinctrl/pinctrl-single.c

+24 −24
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "pinconf.h"



#define DRIVER_NAME			"pinctrl-single"

#define PCS_MUX_BITS_NAME		"pinctrl-single,bits"

#define PCS_OFF_DISABLED		~0U



/**
@@ -1216,36 +1215,22 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, 
	return res;

}



#define PARAMS_FOR_BITS_PER_MUX 3



static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,

						struct device_node *np,

						struct pinctrl_map **map,

						unsigned *num_maps,

						const char **pgnames)

{

	const char *name = "pinctrl-single,pins";

	struct pcs_func_vals *vals;

	const __be32 *mux;

	int size, rows, *pins, index = 0, found = 0, res = -ENOMEM;

	int rows, *pins, found = 0, res = -ENOMEM, i;

	int npins_in_row;

	struct pcs_function *function;



	mux = of_get_property(np, PCS_MUX_BITS_NAME, &size);



	if (!mux) {

		dev_err(pcs->dev, "no valid property for %s\n", np->name);

		return -EINVAL;

	}



	if (size < (sizeof(*mux) * PARAMS_FOR_BITS_PER_MUX)) {

		dev_err(pcs->dev, "bad data for %s\n", np->name);

		return -EINVAL;

	}



	/* Number of elements in array */

	size /= sizeof(*mux);

	rows = pinctrl_count_index_with_args(np, name);

	if (rows == -EINVAL)

		return rows;



	rows = size / PARAMS_FOR_BITS_PER_MUX;

	npins_in_row = pcs->width / pcs->bits_per_pin;



	vals = devm_kzalloc(pcs->dev, sizeof(*vals) * rows * npins_in_row,
@@ -1258,15 +1243,30 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, 
	if (!pins)

		goto free_vals;



	while (index < size) {

	for (i = 0; i < rows; i++) {

		struct of_phandle_args pinctrl_spec;

		unsigned offset, val;

		unsigned mask, bit_pos, val_pos, mask_pos, submask;

		unsigned pin_num_from_lsb;

		int pin;



		offset = be32_to_cpup(mux + index++);

		val = be32_to_cpup(mux + index++);

		mask = be32_to_cpup(mux + index++);

		res = pinctrl_parse_index_with_args(np, name, i, &pinctrl_spec);

		if (res)

			return res;



		if (pinctrl_spec.args_count < 3) {

			dev_err(pcs->dev, "invalid args_count for spec: %i\n",

				pinctrl_spec.args_count);

			break;

		}



		/* Index plus two value cells */

		offset = pinctrl_spec.args[0];

		val = pinctrl_spec.args[1];

		mask = pinctrl_spec.args[2];



		dev_dbg(pcs->dev, "%s index: 0x%x value: 0x%x mask: 0x%x\n",

			pinctrl_spec.np->name, offset, val, mask);



		/* Parse pins in each row from LSB */

		while (mask) {