Commit f9492fda authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

sh-pfc: Merge PFC core and pinctrl 



The PFC core is only used by the pinctrl and gpio modules. As the gpio
module depends on the pinctrl module, the pinctrl module will always be
present if the core gets used. There is thus no point in keeping core
and pinctrl in two seperate modules. Merge them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent f9165132

drivers/sh/pfc/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -5,18 +5,10 @@ config SH_PFC 
	depends on GENERIC_GPIO

	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB

	select PINCTRL_SH_PFC

	def_bool y



#

# Placeholder for now, rehome to drivers/pinctrl once the PFC APIs

# have settled.

#

config PINCTRL_SH_PFC

	tristate "SuperH PFC pin controller driver"

	depends on SH_PFC

	select PINCTRL

	select PINMUX

	select PINCONF

	def_bool y



config GPIO_SH_PFC

	tristate "SuperH PFC GPIO support"

drivers/sh/pfc/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-y				+= core.o

obj-$(CONFIG_PINCTRL_SH_PFC)	+= pinctrl.o

sh-pfc-objs			= core.o pinctrl.o

obj-y				+= sh-pfc.o

obj-$(CONFIG_GPIO_SH_PFC)	+= gpio.o

drivers/sh/pfc/core.c

+3 −12
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#define pr_fmt(fmt) "sh_pfc " KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/errno.h>

#include <linux/kernel.h>
@@ -497,7 +497,6 @@ int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type, 
 out_err:

	return -1;

}

EXPORT_SYMBOL_GPL(sh_pfc_config_gpio);



int register_sh_pfc(struct sh_pfc_platform_data *pdata)

{
@@ -528,17 +527,9 @@ int register_sh_pfc(struct sh_pfc_platform_data *pdata) 
	/*

	 * Initialize pinctrl bindings first

	 */

	initroutine = symbol_request(sh_pfc_register_pinctrl);

	if (initroutine) {

		ret = (*initroutine)(&sh_pfc);

		symbol_put_addr(initroutine);



	ret = sh_pfc_register_pinctrl(&sh_pfc);

	if (unlikely(ret != 0))

		goto err;

	} else {

		pr_err("failed to initialize pinctrl bindings\n");

		goto err;

	}



	/*

	 * Then the GPIO chip

drivers/sh/pfc/pinctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */

#define DRV_NAME "pinctrl-sh_pfc"



#define pr_fmt(fmt) DRV_NAME " " KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) KBUILD_MODNAME " pinctrl: " fmt



#include <linux/init.h>

#include <linux/module.h>
@@ -521,7 +521,6 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) 


	return sh_pfc_pinctrl_init();

}

EXPORT_SYMBOL_GPL(sh_pfc_register_pinctrl);



static void __exit sh_pfc_pinctrl_exit(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE