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

Commit 20955c5f authored by Russell King's avatar Russell King Committed by Linus Walleij
Browse files

pinctrl: mvebu: provide per-control private data 



Provide per-control private data into each mvebu pinctrl method, which
will allow us to provide some completely generic helpers without the
global variable and per-instance function definitions that would be
required when we have multiple pin controllers on a SoC.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 30be3fb9

drivers/pinctrl/mvebu/pinctrl-armada-370.c

+4 −2
Original line number Diff line number Diff line
@@ -25,12 +25,14 @@ 


static void __iomem *mpp_base;



static int armada_370_mpp_ctrl_get(unsigned pid, unsigned long *config)

static int armada_370_mpp_ctrl_get(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long *config)

{

	return default_mpp_ctrl_get(mpp_base, pid, config);

}



static int armada_370_mpp_ctrl_set(unsigned pid, unsigned long config)

static int armada_370_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long config)

{

	return default_mpp_ctrl_set(mpp_base, pid, config);

}

drivers/pinctrl/mvebu/pinctrl-armada-375.c

+4 −2
Original line number Diff line number Diff line
@@ -25,12 +25,14 @@ 


static void __iomem *mpp_base;



static int armada_375_mpp_ctrl_get(unsigned pid, unsigned long *config)

static int armada_375_mpp_ctrl_get(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long *config)

{

	return default_mpp_ctrl_get(mpp_base, pid, config);

}



static int armada_375_mpp_ctrl_set(unsigned pid, unsigned long config)

static int armada_375_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long config)

{

	return default_mpp_ctrl_set(mpp_base, pid, config);

}

drivers/pinctrl/mvebu/pinctrl-armada-38x.c

+4 −2
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ 


static void __iomem *mpp_base;



static int armada_38x_mpp_ctrl_get(unsigned pid, unsigned long *config)

static int armada_38x_mpp_ctrl_get(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long *config)

{

	return default_mpp_ctrl_get(mpp_base, pid, config);

}



static int armada_38x_mpp_ctrl_set(unsigned pid, unsigned long config)

static int armada_38x_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long config)

{

	return default_mpp_ctrl_set(mpp_base, pid, config);

}

drivers/pinctrl/mvebu/pinctrl-armada-39x.c

+4 −2
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ 


static void __iomem *mpp_base;



static int armada_39x_mpp_ctrl_get(unsigned pid, unsigned long *config)

static int armada_39x_mpp_ctrl_get(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long *config)

{

	return default_mpp_ctrl_get(mpp_base, pid, config);

}



static int armada_39x_mpp_ctrl_set(unsigned pid, unsigned long config)

static int armada_39x_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,

				   unsigned pid, unsigned long config)

{

	return default_mpp_ctrl_set(mpp_base, pid, config);

}

drivers/pinctrl/mvebu/pinctrl-armada-xp.c

+4 −2
Original line number Diff line number Diff line
@@ -33,12 +33,14 @@ 
static void __iomem *mpp_base;

static u32 *mpp_saved_regs;



static int armada_xp_mpp_ctrl_get(unsigned pid, unsigned long *config)

static int armada_xp_mpp_ctrl_get(struct mvebu_mpp_ctrl_data *data,

				  unsigned pid, unsigned long *config)

{

	return default_mpp_ctrl_get(mpp_base, pid, config);

}



static int armada_xp_mpp_ctrl_set(unsigned pid, unsigned long config)

static int armada_xp_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,

				  unsigned pid, unsigned long config)

{

	return default_mpp_ctrl_set(mpp_base, pid, config);

}