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

Commit 316a67b7 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.18-tag2' of... 

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

pinctrl: sh-pfc: Updates for v4.18 (take two)

  - Add support for the new R-Car E3 SoC,
  - Add I2C pin groups on R-Car M3-N,
  - Small fixes and cleanups.
parents c6114f21 db701f4b

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Required Properties: 
    - "renesas,pfc-r8a77965": for R8A77965 (R-Car M3-N) compatible pin-controller.

    - "renesas,pfc-r8a77970": for R8A77970 (R-Car V3M) compatible pin-controller.

    - "renesas,pfc-r8a77980": for R8A77980 (R-Car V3H) compatible pin-controller.

    - "renesas,pfc-r8a77990": for R8A77990 (R-Car E3) compatible pin-controller.

    - "renesas,pfc-r8a77995": for R8A77995 (R-Car D3) compatible pin-controller.

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

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ config PINCTRL_PFC_R8A77980 
	depends on ARCH_R8A77980

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77990

        def_bool y

        depends on ARCH_R8A77990

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77995

        def_bool y

        depends on ARCH_R8A77995

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7796) += pfc-r8a7796.o 
obj-$(CONFIG_PINCTRL_PFC_R8A77965)	+= pfc-r8a77965.o

obj-$(CONFIG_PINCTRL_PFC_R8A77970)	+= pfc-r8a77970.o

obj-$(CONFIG_PINCTRL_PFC_R8A77980)	+= pfc-r8a77980.o

obj-$(CONFIG_PINCTRL_PFC_R8A77990)	+= pfc-r8a77990.o

obj-$(CONFIG_PINCTRL_PFC_R8A77995)	+= pfc-r8a77995.o

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

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

drivers/pinctrl/sh-pfc/core.c

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

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77990

	{

		.compatible = "renesas,pfc-r8a77990",

		.data = &r8a77990_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77995

	{

		.compatible = "renesas,pfc-r8a77995",

drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c

+3 −3
Original line number Diff line number Diff line
@@ -1432,10 +1432,10 @@ static const u16 pinmux_data[] = { 


/*

 * Static pins can not be muxed between different functions but

 * still needs a mark entry in the pinmux list. Add each static

 * still need mark entries in the pinmux list. Add each static

 * pin to the list without an associated function. The sh-pfc

 * core will do the right thing and skip trying to mux then pin

 * while still applying configuration to it

 * core will do the right thing and skip trying to mux the pin

 * while still applying configuration to it.

 */

#define FM(x)	PINMUX_DATA(x##_MARK, 0),

	PINMUX_STATIC