Commit 723dd2f0 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

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

pinctrl: sh-pfc: Updates for v4.16

  - Add CAN pin groups on RZ/G1E,
  - Add CAN and CAN FD pin groups on R-Car H3 ES2.0, and R-Car D3,
  - Add support for the new R-Car V3M SoC,
  - Add support for I2C on R-Car D3,
  - Small fixes and cleanups.
parents 971f1b38 527890f7

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Required Properties: 
    - "renesas,pfc-r8a7794": for R8A7794 (R-Car E2) compatible pin-controller.

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

    - "renesas,pfc-r8a7796": for R8A7796 (R-Car M3-W) compatible pin-controller.

    - "renesas,pfc-r8a77970": for R8A77970 (R-Car V3M) 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
@@ -89,6 +89,11 @@ config PINCTRL_PFC_R8A7796 
        depends on ARCH_R8A7796

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77970

	def_bool y

	depends on ARCH_R8A77970

	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
@@ -16,6 +16,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7794) += pfc-r8a7794.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7795)	+= pfc-r8a7795.o

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

obj-$(CONFIG_PINCTRL_PFC_R8A7796)	+= pfc-r8a7796.o

obj-$(CONFIG_PINCTRL_PFC_R8A77970)	+= pfc-r8a77970.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
@@ -557,6 +557,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7796_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77970

	{

		.compatible = "renesas,pfc-r8a77970",

		.data = &r8a77970_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77995

	{

		.compatible = "renesas,pfc-r8a77995",

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

+21 −1
Original line number Diff line number Diff line
@@ -4826,6 +4826,10 @@ static const char * const can0_groups[] = { 
	"can0_data_d",

	"can0_data_e",

	"can0_data_f",

	/*

	 * Retained for backwards compatibility, use can_clk_groups in new

	 * designs.

	 */

	"can_clk",

	"can_clk_b",

	"can_clk_c",
@@ -4837,6 +4841,21 @@ static const char * const can1_groups[] = { 
	"can1_data_b",

	"can1_data_c",

	"can1_data_d",

	/*

	 * Retained for backwards compatibility, use can_clk_groups in new

	 * designs.

	 */

	"can_clk",

	"can_clk_b",

	"can_clk_c",

	"can_clk_d",

};



/*

 * can_clk_groups allows for independent configuration, use can_clk function

 * in new designs.

 */

static const char * const can_clk_groups[] = {

	"can_clk",

	"can_clk_b",

	"can_clk_c",
@@ -5308,7 +5327,7 @@ static const char * const vin2_groups[] = { 
};



static const struct {

	struct sh_pfc_function common[56];

	struct sh_pfc_function common[57];

	struct sh_pfc_function r8a779x[2];

} pinmux_functions = {

	.common = {
@@ -5316,6 +5335,7 @@ static const struct { 
		SH_PFC_FUNCTION(avb),

		SH_PFC_FUNCTION(can0),

		SH_PFC_FUNCTION(can1),

		SH_PFC_FUNCTION(can_clk),

		SH_PFC_FUNCTION(du),

		SH_PFC_FUNCTION(du0),

		SH_PFC_FUNCTION(du1),

CRA Git | Maintained and supported by SUSTech CRA and CCSE