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

Commit 95ec8ae4 authored by Heiko Stübner's avatar Heiko Stübner Committed by Linus Walleij
Browse files

pinctrl: rockchip: enable iomuxes from pmu space 



The upcoming rk3288 moves some iomux settings to the pmu register space.
Therefore add a flag for this and adapt the mux functions accordingly.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 03716e1d

drivers/pinctrl/pinctrl-rockchip.c

+30 −12
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ enum rockchip_pinctrl_type { 
 */

 */

#define IOMUX_GPIO_ONLY		BIT(0)

#define IOMUX_GPIO_ONLY		BIT(0)

#define IOMUX_WIDTH_4BIT	BIT(1)

#define IOMUX_WIDTH_4BIT	BIT(1)

#define IOMUX_SOURCE_PMU	BIT(2)





/**

/**

 * @type: iomux variant using IOMUX_* constants

 * @type: iomux variant using IOMUX_* constants
@@ -153,7 +154,8 @@ struct rockchip_pin_ctrl { 
	u32				nr_pins;

	u32				nr_pins;

	char				*label;

	char				*label;

	enum rockchip_pinctrl_type	type;

	enum rockchip_pinctrl_type	type;

	int				mux_offset;

	int				grf_mux_offset;

	int				pmu_mux_offset;

	void	(*pull_calc_reg)(struct rockchip_pin_bank *bank,

	void	(*pull_calc_reg)(struct rockchip_pin_bank *bank,

				    int pin_num, struct regmap **regmap,

				    int pin_num, struct regmap **regmap,

				    int *reg, u8 *bit);

				    int *reg, u8 *bit);
@@ -376,6 +378,7 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) 
{

{

	struct rockchip_pinctrl *info = bank->drvdata;

	struct rockchip_pinctrl *info = bank->drvdata;

	int iomux_num = (pin / 8);

	int iomux_num = (pin / 8);

	struct regmap *regmap;

	unsigned int val;

	unsigned int val;

	int reg, ret, mask;

	int reg, ret, mask;

	u8 bit;

	u8 bit;
@@ -386,6 +389,9 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) 
	if (bank->iomux[iomux_num].type & IOMUX_GPIO_ONLY)

	if (bank->iomux[iomux_num].type & IOMUX_GPIO_ONLY)

		return RK_FUNC_GPIO;

		return RK_FUNC_GPIO;





	regmap = (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU)

				? info->regmap_pmu : info->regmap_base;



	/* get basic quadrupel of mux registers and the correct reg inside */

	/* get basic quadrupel of mux registers and the correct reg inside */

	mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3;

	mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3;

	reg = bank->iomux[iomux_num].offset;

	reg = bank->iomux[iomux_num].offset;
@@ -397,7 +403,7 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) 
		bit = (pin % 8) * 2;

		bit = (pin % 8) * 2;

	}

	}





	ret = regmap_read(info->regmap_base, reg, &val);

	ret = regmap_read(regmap, reg, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -421,6 +427,7 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
{

{

	struct rockchip_pinctrl *info = bank->drvdata;

	struct rockchip_pinctrl *info = bank->drvdata;

	int iomux_num = (pin / 8);

	int iomux_num = (pin / 8);

	struct regmap *regmap;

	int reg, ret, mask;

	int reg, ret, mask;

	unsigned long flags;

	unsigned long flags;

	u8 bit;

	u8 bit;
@@ -442,6 +449,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
	dev_dbg(info->dev, "setting mux of GPIO%d-%d to %d\n",

	dev_dbg(info->dev, "setting mux of GPIO%d-%d to %d\n",

						bank->bank_num, pin, mux);

						bank->bank_num, pin, mux);





	regmap = (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU)

				? info->regmap_pmu : info->regmap_base;



	/* get basic quadrupel of mux registers and the correct reg inside */

	/* get basic quadrupel of mux registers and the correct reg inside */

	mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3;

	mask = (bank->iomux[iomux_num].type & IOMUX_WIDTH_4BIT) ? 0xf : 0x3;

	reg = bank->iomux[iomux_num].offset;

	reg = bank->iomux[iomux_num].offset;
@@ -457,7 +467,7 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 




	data = (mask << (bit + 16));

	data = (mask << (bit + 16));

	data |= (mux & mask) << bit;

	data |= (mux & mask) << bit;

	ret = regmap_write(info->regmap_base, reg, data);

	ret = regmap_write(regmap, reg, data);





	spin_unlock_irqrestore(&bank->slock, flags);

	spin_unlock_irqrestore(&bank->slock, flags);
@@ -1536,7 +1546,7 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( 
	struct device_node *np;

	struct device_node *np;

	struct rockchip_pin_ctrl *ctrl;

	struct rockchip_pin_ctrl *ctrl;

	struct rockchip_pin_bank *bank;

	struct rockchip_pin_bank *bank;

	int grf_offs, i, j;

	int grf_offs, pmu_offs, i, j;





	match = of_match_node(rockchip_pinctrl_dt_match, node);

	match = of_match_node(rockchip_pinctrl_dt_match, node);

	ctrl = (struct rockchip_pin_ctrl *)match->data;

	ctrl = (struct rockchip_pin_ctrl *)match->data;
@@ -1558,7 +1568,8 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( 
		}

		}

	}

	}





	grf_offs = ctrl->mux_offset;

	grf_offs = ctrl->grf_mux_offset;

	pmu_offs = ctrl->pmu_mux_offset;

	bank = ctrl->pin_banks;

	bank = ctrl->pin_banks;

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

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

		int bank_pins = 0;

		int bank_pins = 0;
@@ -1578,9 +1589,13 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( 




			/* preset offset value, set new start value */

			/* preset offset value, set new start value */

			if (iom->offset >= 0) {

			if (iom->offset >= 0) {

				if (iom->type & IOMUX_SOURCE_PMU)

					pmu_offs = iom->offset;

				else

					grf_offs = iom->offset;

					grf_offs = iom->offset;

			} else { /* set current offset */

			} else { /* set current offset */

				iom->offset = grf_offs;

				iom->offset = (iom->type & IOMUX_SOURCE_PMU) ?

							pmu_offs : grf_offs;

			}

			}





			dev_dbg(d->dev, "bank %d, iomux %d has offset 0x%x\n",

			dev_dbg(d->dev, "bank %d, iomux %d has offset 0x%x\n",
@@ -1591,6 +1606,9 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( 
			 * 4bit iomux'es are spread over two registers.

			 * 4bit iomux'es are spread over two registers.

			 */

			 */

			inc = (iom->type & IOMUX_WIDTH_4BIT) ? 8 : 4;

			inc = (iom->type & IOMUX_WIDTH_4BIT) ? 8 : 4;

			if (iom->type & IOMUX_SOURCE_PMU)

				pmu_offs += inc;

			else

				grf_offs += inc;

				grf_offs += inc;





			bank_pins += 8;

			bank_pins += 8;
@@ -1698,7 +1716,7 @@ static struct rockchip_pin_ctrl rk2928_pin_ctrl = { 
		.nr_banks		= ARRAY_SIZE(rk2928_pin_banks),

		.nr_banks		= ARRAY_SIZE(rk2928_pin_banks),

		.label			= "RK2928-GPIO",

		.label			= "RK2928-GPIO",

		.type			= RK2928,

		.type			= RK2928,

		.mux_offset		= 0xa8,

		.grf_mux_offset		= 0xa8,

		.pull_calc_reg		= rk2928_calc_pull_reg_and_bit,

		.pull_calc_reg		= rk2928_calc_pull_reg_and_bit,

};

};
@@ -1716,7 +1734,7 @@ static struct rockchip_pin_ctrl rk3066a_pin_ctrl = { 
		.nr_banks		= ARRAY_SIZE(rk3066a_pin_banks),

		.nr_banks		= ARRAY_SIZE(rk3066a_pin_banks),

		.label			= "RK3066a-GPIO",

		.label			= "RK3066a-GPIO",

		.type			= RK2928,

		.type			= RK2928,

		.mux_offset		= 0xa8,

		.grf_mux_offset		= 0xa8,

		.pull_calc_reg		= rk2928_calc_pull_reg_and_bit,

		.pull_calc_reg		= rk2928_calc_pull_reg_and_bit,

};

};
@@ -1732,7 +1750,7 @@ static struct rockchip_pin_ctrl rk3066b_pin_ctrl = { 
		.nr_banks	= ARRAY_SIZE(rk3066b_pin_banks),

		.nr_banks	= ARRAY_SIZE(rk3066b_pin_banks),

		.label		= "RK3066b-GPIO",

		.label		= "RK3066b-GPIO",

		.type		= RK3066B,

		.type		= RK3066B,

		.mux_offset	= 0x60,

		.grf_mux_offset	= 0x60,

};

};





static struct rockchip_pin_bank rk3188_pin_banks[] = {

static struct rockchip_pin_bank rk3188_pin_banks[] = {
@@ -1747,7 +1765,7 @@ static struct rockchip_pin_ctrl rk3188_pin_ctrl = { 
		.nr_banks		= ARRAY_SIZE(rk3188_pin_banks),

		.nr_banks		= ARRAY_SIZE(rk3188_pin_banks),

		.label			= "RK3188-GPIO",

		.label			= "RK3188-GPIO",

		.type			= RK3188,

		.type			= RK3188,

		.mux_offset		= 0x60,

		.grf_mux_offset		= 0x60,

		.pull_calc_reg		= rk3188_calc_pull_reg_and_bit,

		.pull_calc_reg		= rk3188_calc_pull_reg_and_bit,

};

};