Commit 276e552e authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Linus Walleij
Browse files

pinctrl: ralink: move ralink architecture pinmux header into the driver 



Ralink architecture is making use of the header located in
'arch/mips/include/asm/mach-ralink/pinmux.h' to stablish the
mechanisms to make derived SoCs to set its pin functions and
groups. In order to move all architecture pinmux into a more
accurate place which is 'drivers/pinctrl/ralink' we have to
first of all move this file also there with a small modification
which creates 'rt2880_pinmux_init' function to allow SoCs pinctrl
drivers to pass its configuration to the common code located in
'pinctrl-rt2880.c' file.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20210604115159.8834-2-sergio.paracuellos@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8c987eb1

arch/mips/ralink/prom.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "common.h"



struct ralink_soc_info soc_info;

struct rt2880_pmx_group *rt2880_pinmux_data = NULL;



enum ralink_soc_type ralink_soc;

EXPORT_SYMBOL_GPL(ralink_soc);

drivers/pinctrl/ralink/pinctrl-rt2880.c

+5 −25
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <linux/pinctrl/machine.h>



#include <asm/mach-ralink/ralink_regs.h>

#include <asm/mach-ralink/pinmux.h>

#include <asm/mach-ralink/mt7620.h>



#include "pinmux.h"

#include "../core.h"

#include "../pinctrl-utils.h"
@@ -311,13 +311,14 @@ static int rt2880_pinmux_pins(struct rt2880_priv *p) 
	return 0;

}



static int rt2880_pinmux_probe(struct platform_device *pdev)

int rt2880_pinmux_init(struct platform_device *pdev,

		       struct rt2880_pmx_group *data)

{

	struct rt2880_priv *p;

	struct pinctrl_dev *dev;

	int err;



	if (!rt2880_pinmux_data)

	if (!data)

		return -ENOTSUPP;



	/* setup the private data */
@@ -327,7 +328,7 @@ static int rt2880_pinmux_probe(struct platform_device *pdev) 


	p->dev = &pdev->dev;

	p->desc = &rt2880_pctrl_desc;

	p->groups = rt2880_pinmux_data;

	p->groups = data;

	platform_set_drvdata(pdev, p);



	/* init the device */
@@ -346,24 +347,3 @@ static int rt2880_pinmux_probe(struct platform_device *pdev) 


	return PTR_ERR_OR_ZERO(dev);

}
 


static const struct of_device_id rt2880_pinmux_match[] = {

	{ .compatible = "ralink,rt2880-pinmux" },

	{},

};

MODULE_DEVICE_TABLE(of, rt2880_pinmux_match);



static struct platform_driver rt2880_pinmux_driver = {

	.probe = rt2880_pinmux_probe,

	.driver = {

		.name = "rt2880-pinmux",

		.of_match_table = rt2880_pinmux_match,

	},

};



static int __init rt2880_pinmux_init(void)

{

	return platform_driver_register(&rt2880_pinmux_driver);

}



core_initcall_sync(rt2880_pinmux_init);

arch/mips/include/asm/mach-ralink/pinmux.h→drivers/pinctrl/ralink/pinmux.h

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct rt2880_pmx_group { 
	int func_count;

};



extern struct rt2880_pmx_group *rt2880_pinmux_data;

int rt2880_pinmux_init(struct platform_device *pdev,

		       struct rt2880_pmx_group *data);



#endif