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

Commit d30351f5 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.9-tag1' of... 

Merge tag 'sh-pfc-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: sh-pfc: Updates for v4.9

  - Bias and DU support for R-Car H3,
  - Basic R-Car V2H support,
  - Cleanups and fixes.
parents 35398f7b 7955dac1

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required Properties: 
    - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller.

    - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller.

    - "renesas,pfc-r8a7791": for R8A7791 (R-Car M2-W) compatible pin-controller.

    - "renesas,pfc-r8a7792": for R8A7792 (R-Car V2H) 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.

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ config PINCTRL_PFC_R8A7791 
	depends on ARCH_R8A7791

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7792

	def_bool y

	depends on ARCH_R8A7792

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7793

	def_bool y

	depends on ARCH_R8A7793

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7778) += pfc-r8a7778.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o

obj-$(CONFIG_PINCTRL_PFC_R8A7790)	+= pfc-r8a7790.o

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

obj-$(CONFIG_PINCTRL_PFC_R8A7792)	+= pfc-r8a7792.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

drivers/pinctrl/sh-pfc/core.c

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

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7792

	{

		.compatible = "renesas,pfc-r8a7792",

		.data = &r8a7792_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7793

	{

		.compatible = "renesas,pfc-r8a7793",

drivers/pinctrl/sh-pfc/pfc-r8a7792.c

0 → 100644
+2624 −0

File added.

Preview size limit exceeded, changes collapsed.