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

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

sh: sh7734: Register PFC platform device 



Add arch code to register the PFC platform device instead of calling the
driver directly. Platform device registration in the sh-pfc driver will
be removed.

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

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ config CPU_SUBTYPE_SH7734 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select USB_ARCH_HAS_OHCI

	select USB_ARCH_HAS_EHCI

	select PINCTRL

	help

	  Select SH7734 if you have a SH4A SH7734 CPU.

arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c

+4 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/ioport.h>

#include <cpu/pfc.h>

#include <cpu/sh7734.h>



#define CPU_32_PORT(fn, pfx, sfx)				\
@@ -2467,9 +2468,6 @@ static struct resource sh7734_pfc_resources[] = { 
static struct pinmux_info sh7734_pinmux_info = {

	.name = "sh7734_pfc",



	.resource = sh7734_pfc_resources,

	.num_resources = ARRAY_SIZE(sh7734_pfc_resources),



	.unlock_reg = 0xFFFC0000,



	.reserved_id = PINMUX_RESERVED,
@@ -2492,6 +2490,8 @@ static struct pinmux_info sh7734_pinmux_info = { 


static int __init plat_pinmux_setup(void)

{

	return register_pinmux(&sh7734_pinmux_info);

	return sh_pfc_register_info(NULL, sh7734_pfc_resources,

				    ARRAY_SIZE(sh7734_pfc_resources),

				    &sh7734_pinmux_info);

}

arch_initcall(plat_pinmux_setup);