Commit 5ec008bf authored by Paul Cercueil's avatar Paul Cercueil Committed by Linus Walleij
Browse files

pinctrl: ingenic: Remove platform ID table 



We enforce devicetree support in the Kconfig and all Ingenic boards
without exception probe their drivers from devicetree. The code path to
probe the driver from arch code can then be considered as dead code and
removed.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200106232711.559727-2-paul@crapouillou.net


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

drivers/pinctrl/pinctrl-ingenic.c

+2 −24
Original line number Original line Diff line number Diff line
@@ -2369,9 +2369,6 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) 
	struct ingenic_pinctrl *jzpc;

	struct ingenic_pinctrl *jzpc;

	struct pinctrl_desc *pctl_desc;

	struct pinctrl_desc *pctl_desc;

	void __iomem *base;

	void __iomem *base;

	const struct platform_device_id *id = platform_get_device_id(pdev);

	const struct of_device_id *of_id = of_match_device(

			ingenic_pinctrl_of_match, dev);

	const struct ingenic_chip_info *chip_info;

	const struct ingenic_chip_info *chip_info;

	struct device_node *node;

	struct device_node *node;

	unsigned int i;

	unsigned int i;
@@ -2394,11 +2391,7 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) 
	}

	}





	jzpc->dev = dev;

	jzpc->dev = dev;



	jzpc->version = (enum jz_version)of_device_get_match_data(dev);

	if (of_id)

		jzpc->version = (enum jz_version)of_id->data;

	else

		jzpc->version = (enum jz_version)id->driver_data;





	if (jzpc->version >= ID_X1830)

	if (jzpc->version >= ID_X1830)

		chip_info = &x1830_chip_info;

		chip_info = &x1830_chip_info;
@@ -2489,26 +2482,11 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





static const struct platform_device_id ingenic_pinctrl_ids[] = {

	{ "jz4740-pinctrl", ID_JZ4740 },

	{ "jz4725b-pinctrl", ID_JZ4725B },

	{ "jz4760-pinctrl", ID_JZ4760 },

	{ "jz4760b-pinctrl", ID_JZ4760B },

	{ "jz4770-pinctrl", ID_JZ4770 },

	{ "jz4780-pinctrl", ID_JZ4780 },

	{ "x1000-pinctrl", ID_X1000 },

	{ "x1000e-pinctrl", ID_X1000E },

	{ "x1500-pinctrl", ID_X1500 },

	{ "x1830-pinctrl", ID_X1830 },

	{},

};



static struct platform_driver ingenic_pinctrl_driver = {

static struct platform_driver ingenic_pinctrl_driver = {

	.driver = {

	.driver = {

		.name = "pinctrl-ingenic",

		.name = "pinctrl-ingenic",

		.of_match_table = of_match_ptr(ingenic_pinctrl_of_match),

		.of_match_table = ingenic_pinctrl_of_match,

	},

	},

	.id_table = ingenic_pinctrl_ids,

};

};





static int __init ingenic_pinctrl_drv_register(void)

static int __init ingenic_pinctrl_drv_register(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE