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

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

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

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

pinctrl: sh-pfc: Updates for v4.14

  - Propagate errors on group config, now r8a7740-armadillo800eva.dts is
    fixed,
  - Add MSIOF and USB2.0 pin groups on R-Car H3 ES2.0,
  - Add USB2.0 and USB3.0 pin groups on R-Car M3-W,
  - Add a missing MMC pin group on R-Car M2-W and RZ/G1M,
  - Add initial support for R-Car D3,
  - Small fixes and cleanups.
parents 1865af21 56d57391

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-r8a77995": for R8A77995 (R-Car D3) 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
@@ -89,6 +89,11 @@ config PINCTRL_PFC_R8A7796 
        depends on ARCH_R8A7796

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77995

        def_bool y

        depends on ARCH_R8A77995

        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
@@ -15,6 +15,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_R8A77995)	+= pfc-r8a77995.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
@@ -551,6 +551,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7796_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77995

	{

		.compatible = "renesas,pfc-r8a77995",

		.data = &r8a77995_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_SH73A0

	{

		.compatible = "renesas,pfc-sh73a0",

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

+14 −1
Original line number Diff line number Diff line
@@ -2589,6 +2589,17 @@ static const unsigned int mmc_data8_mux[] = { 
	MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK,

	MMC_D4_MARK, MMC_D5_MARK, MMC_D6_MARK, MMC_D7_MARK,

};

static const unsigned int mmc_data8_b_pins[] = {

	/* D[0:7] */

	RCAR_GP_PIN(6, 18), RCAR_GP_PIN(6, 19),

	RCAR_GP_PIN(6, 20), RCAR_GP_PIN(6, 21),

	RCAR_GP_PIN(6, 22), RCAR_GP_PIN(6, 23),

	RCAR_GP_PIN(6, 6), RCAR_GP_PIN(6, 7),

};

static const unsigned int mmc_data8_b_mux[] = {

	MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK,

	MMC_D4_MARK, MMC_D5_MARK, MMC_D6_B_MARK, MMC_D7_B_MARK,

};

static const unsigned int mmc_ctrl_pins[] = {

	/* CLK, CMD */

	RCAR_GP_PIN(6, 16), RCAR_GP_PIN(6, 17),
@@ -4420,7 +4431,7 @@ static const unsigned int vin2_clk_mux[] = { 
};



static const struct {

	struct sh_pfc_pin_group common[341];

	struct sh_pfc_pin_group common[342];

	struct sh_pfc_pin_group r8a779x[9];

} pinmux_groups = {

	.common = {
@@ -4523,6 +4534,7 @@ static const struct { 
		SH_PFC_PIN_GROUP(mmc_data1),

		SH_PFC_PIN_GROUP(mmc_data4),

		SH_PFC_PIN_GROUP(mmc_data8),

		SH_PFC_PIN_GROUP(mmc_data8_b),

		SH_PFC_PIN_GROUP(mmc_ctrl),

		SH_PFC_PIN_GROUP(msiof0_clk),

		SH_PFC_PIN_GROUP(msiof0_sync),
@@ -4955,6 +4967,7 @@ static const char * const mmc_groups[] = { 
	"mmc_data1",

	"mmc_data4",

	"mmc_data8",

	"mmc_data8_b",

	"mmc_ctrl",

};