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

Commit 2afd450d authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

pinctrl: uniphier: make drivers non-modular 



At first these drivers were written as tristate, but the module
usecases are actually not tested.  Make all of them boolean.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8ef364b3

drivers/pinctrl/uniphier/Kconfig

+8 −8
Original line number Original line Diff line number Diff line
@@ -9,35 +9,35 @@ menuconfig PINCTRL_UNIPHIER 
if PINCTRL_UNIPHIER

if PINCTRL_UNIPHIER





config PINCTRL_UNIPHIER_LD4

config PINCTRL_UNIPHIER_LD4

	tristate "UniPhier PH1-LD4 SoC pinctrl driver"

	bool "UniPhier LD4 SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_PRO4

config PINCTRL_UNIPHIER_PRO4

	tristate "UniPhier PH1-Pro4 SoC pinctrl driver"

	bool "UniPhier Pro4 SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_SLD8

config PINCTRL_UNIPHIER_SLD8

	tristate "UniPhier PH1-sLD8 SoC pinctrl driver"

	bool "UniPhier sLD8 SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_PRO5

config PINCTRL_UNIPHIER_PRO5

	tristate "UniPhier PH1-Pro5 SoC pinctrl driver"

	bool "UniPhier Pro5 SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_PXS2

config PINCTRL_UNIPHIER_PXS2

	tristate "UniPhier ProXstream2 SoC pinctrl driver"

	bool "UniPhier PXs2 SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_LD6B

config PINCTRL_UNIPHIER_LD6B

	tristate "UniPhier PH1-LD6b SoC pinctrl driver"

	bool "UniPhier LD6b SoC pinctrl driver"

	default ARM

	default ARM





config PINCTRL_UNIPHIER_LD11

config PINCTRL_UNIPHIER_LD11

	tristate "UniPhier PH1-LD11 SoC pinctrl driver"

	bool "UniPhier LD11 SoC pinctrl driver"

	default ARM64

	default ARM64





config PINCTRL_UNIPHIER_LD20

config PINCTRL_UNIPHIER_LD20

	tristate "UniPhier PH1-LD20 SoC pinctrl driver"

	bool "UniPhier LD20 SoC pinctrl driver"

	default ARM64

	default ARM64





endif
 
endif

drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c

+3 −8
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2016 Socionext Inc.

 * Copyright (C) 2016-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -936,7 +936,6 @@ static const struct of_device_id uniphier_ld11_pinctrl_match[] = { 
	{ .compatible = "socionext,uniphier-ld11-pinctrl" },

	{ .compatible = "socionext,uniphier-ld11-pinctrl" },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, uniphier_ld11_pinctrl_match);





static struct platform_driver uniphier_ld11_pinctrl_driver = {

static struct platform_driver uniphier_ld11_pinctrl_driver = {

	.probe = uniphier_ld11_pinctrl_probe,

	.probe = uniphier_ld11_pinctrl_probe,
@@ -945,8 +944,4 @@ static struct platform_driver uniphier_ld11_pinctrl_driver = { 
		.of_match_table = uniphier_ld11_pinctrl_match,

		.of_match_table = uniphier_ld11_pinctrl_match,

	},

	},

};

};

module_platform_driver(uniphier_ld11_pinctrl_driver);

builtin_platform_driver(uniphier_ld11_pinctrl_driver);
 


MODULE_AUTHOR("Masahiro Yamada <yamada.masahiro@socionext.com>");

MODULE_DESCRIPTION("UniPhier PH1-LD11 pinctrl driver");

MODULE_LICENSE("GPL");

drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c

+3 −8
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2016 Socionext Inc.

 * Copyright (C) 2016-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -1034,7 +1034,6 @@ static const struct of_device_id uniphier_ld20_pinctrl_match[] = { 
	{ .compatible = "socionext,uniphier-ld20-pinctrl" },

	{ .compatible = "socionext,uniphier-ld20-pinctrl" },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, uniphier_ld20_pinctrl_match);





static struct platform_driver uniphier_ld20_pinctrl_driver = {

static struct platform_driver uniphier_ld20_pinctrl_driver = {

	.probe = uniphier_ld20_pinctrl_probe,

	.probe = uniphier_ld20_pinctrl_probe,
@@ -1043,8 +1042,4 @@ static struct platform_driver uniphier_ld20_pinctrl_driver = { 
		.of_match_table = uniphier_ld20_pinctrl_match,

		.of_match_table = uniphier_ld20_pinctrl_match,

	},

	},

};

};

module_platform_driver(uniphier_ld20_pinctrl_driver);

builtin_platform_driver(uniphier_ld20_pinctrl_driver);
 


MODULE_AUTHOR("Masahiro Yamada <yamada.masahiro@socionext.com>");

MODULE_DESCRIPTION("UniPhier PH1-LD20 pinctrl driver");

MODULE_LICENSE("GPL");

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+4 −8
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>

 * Copyright (C) 2015-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * it under the terms of the GNU General Public License as published by
@@ -13,7 +14,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -931,7 +932,6 @@ static const struct of_device_id uniphier_ld4_pinctrl_match[] = { 
	{ .compatible = "socionext,uniphier-ld4-pinctrl" },

	{ .compatible = "socionext,uniphier-ld4-pinctrl" },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, uniphier_ld4_pinctrl_match);





static struct platform_driver uniphier_ld4_pinctrl_driver = {

static struct platform_driver uniphier_ld4_pinctrl_driver = {

	.probe = uniphier_ld4_pinctrl_probe,

	.probe = uniphier_ld4_pinctrl_probe,
@@ -940,8 +940,4 @@ static struct platform_driver uniphier_ld4_pinctrl_driver = { 
		.of_match_table = uniphier_ld4_pinctrl_match,

		.of_match_table = uniphier_ld4_pinctrl_match,

	},

	},

};

};

module_platform_driver(uniphier_ld4_pinctrl_driver);

builtin_platform_driver(uniphier_ld4_pinctrl_driver);
 


MODULE_AUTHOR("Masahiro Yamada <yamada.masahiro@socionext.com>");

MODULE_DESCRIPTION("UniPhier PH1-LD4 pinctrl driver");

MODULE_LICENSE("GPL");

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+4 −8
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>

 * Copyright (C) 2015-2017 Socionext Inc.

 *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * it under the terms of the GNU General Public License as published by
@@ -13,7 +14,7 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -1292,7 +1293,6 @@ static const struct of_device_id uniphier_ld6b_pinctrl_match[] = { 
	{ .compatible = "socionext,uniphier-ld6b-pinctrl" },

	{ .compatible = "socionext,uniphier-ld6b-pinctrl" },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, uniphier_ld6b_pinctrl_match);





static struct platform_driver uniphier_ld6b_pinctrl_driver = {

static struct platform_driver uniphier_ld6b_pinctrl_driver = {

	.probe = uniphier_ld6b_pinctrl_probe,

	.probe = uniphier_ld6b_pinctrl_probe,
@@ -1301,8 +1301,4 @@ static struct platform_driver uniphier_ld6b_pinctrl_driver = { 
		.of_match_table = uniphier_ld6b_pinctrl_match,

		.of_match_table = uniphier_ld6b_pinctrl_match,

	},

	},

};

};

module_platform_driver(uniphier_ld6b_pinctrl_driver);

builtin_platform_driver(uniphier_ld6b_pinctrl_driver);
 


MODULE_AUTHOR("Masahiro Yamada <yamada.masahiro@socionext.com>");

MODULE_DESCRIPTION("UniPhier PH1-LD6b pinctrl driver");

MODULE_LICENSE("GPL");