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

Commit 12597e45 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'sh-pfc-for-v4.4' of... 

Merge branch 'sh-pfc-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
parents b4b05b9a 819fd4bf

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Required Properties: 
    - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2-W) compatible pin-controller.

    - "renesas,pfc-r8a7793": for R8A7793 (R-Car M2-N) compatible pin-controller.

    - "renesas,pfc-r8a7794": for R8A7794 (R-Car E2) compatible pin-controller.

    - "renesas,pfc-r8a7795": for R8A7795 (R-Car H3) compatible pin-controller.

    - "renesas,pfc-sh73a0": for SH73A0 (SH-Mobile AG5) compatible pin-controller.



  - reg: Base address and length of each memory resource used by the pin

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ config PINCTRL_PFC_R8A7794 
	depends on ARCH_R8A7794

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7795

	def_bool y

	depends on ARCH_R8A7795

	select PINCTRL_SH_PFC



config PINCTRL_PFC_SH7203

	def_bool y

	depends on CPU_SUBTYPE_SH7203

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7790) += pfc-r8a7790.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7791)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7793)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7794)	+= pfc-r8a7794.o

obj-$(CONFIG_PINCTRL_PFC_R8A7795)	+= pfc-r8a7795.o

obj-$(CONFIG_PINCTRL_PFC_SH7203)	+= pfc-sh7203.o

obj-$(CONFIG_PINCTRL_PFC_SH7264)	+= pfc-sh7264.o

obj-$(CONFIG_PINCTRL_PFC_SH7269)	+= pfc-sh7269.o

drivers/pinctrl/sh-pfc/core.c

+6 −0
Original line number Diff line number Diff line
@@ -489,6 +489,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7794_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7795

	{

		.compatible = "renesas,pfc-r8a7795",

		.data = &r8a7795_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_SH73A0

	{

		.compatible = "renesas,pfc-sh73a0",

drivers/pinctrl/sh-pfc/core.h

+3 −0
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ struct sh_pfc { 
	unsigned int nr_gpio_pins;



	struct sh_pfc_chip *gpio;

#ifdef CONFIG_SUPERH

	struct sh_pfc_chip *func;

#endif



	struct sh_pfc_pinctrl *pinctrl;

};
@@ -73,6 +75,7 @@ extern const struct sh_pfc_soc_info r8a7790_pinmux_info; 
extern const struct sh_pfc_soc_info r8a7791_pinmux_info;

extern const struct sh_pfc_soc_info r8a7793_pinmux_info;

extern const struct sh_pfc_soc_info r8a7794_pinmux_info;

extern const struct sh_pfc_soc_info r8a7795_pinmux_info;

extern const struct sh_pfc_soc_info sh7203_pinmux_info;

extern const struct sh_pfc_soc_info sh7264_pinmux_info;

extern const struct sh_pfc_soc_info sh7269_pinmux_info;