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

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

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

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

pinctrl: sh-pfc: Updates for v4.17

  - Add DU and VIN pin groups on R-Car D3,
  - Add HDMI, TMU, and VIN pin groups on R-Car H3 and M3-W,
  - Add support for the new R-Car M3-N SoC,
  - Small fixes and cleanups.
parents 8b1b2dc7 a8ab4f2b

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

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required Properties: 
    - "renesas,pfc-r8a7740": for R8A7740 (R-Mobile A1) compatible pin-controller.

    - "renesas,pfc-r8a7743": for R8A7743 (RZ/G1M) compatible pin-controller.

    - "renesas,pfc-r8a7745": for R8A7745 (RZ/G1E) compatible pin-controller.

    - "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible pin-controller.

    - "renesas,pfc-r8a7778": for R8A7778 (R-Car M1) compatible pin-controller.

    - "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.
@@ -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-r8a77965": for R8A77965 (R-Car M3-N) 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_R8A77965

        def_bool y

        depends on ARCH_R8A77965

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77970

	def_bool y

	depends on ARCH_R8A77970

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_R8A77965)	+= pfc-r8a77965.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

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_R8A77965

	{

		.compatible = "renesas,pfc-r8a77965",

		.data = &r8a77965_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77970

	{

		.compatible = "renesas,pfc-r8a77970",

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

+71 −1
Original line number Diff line number Diff line 
/*

 * R8A7795 ES1.x processor support - PFC hardware block.

 *

 * Copyright (C) 2015  Renesas Electronics Corporation

 * Copyright (C) 2015-2017  Renesas Electronics Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -2067,6 +2067,22 @@ static const unsigned int du_disp_pins[] = { 
static const unsigned int du_disp_mux[] = {

	DU_DISP_MARK,

};

/* - HDMI ------------------------------------------------------------------- */

static const unsigned int hdmi0_cec_pins[] = {

	/* HDMI0_CEC */

	RCAR_GP_PIN(7, 2),

};

static const unsigned int hdmi0_cec_mux[] = {

	HDMI0_CEC_MARK,

};

static const unsigned int hdmi1_cec_pins[] = {

	/* HDMI1_CEC */

	RCAR_GP_PIN(7, 3),

};

static const unsigned int hdmi1_cec_mux[] = {

	HDMI1_CEC_MARK,

};



/* - HSCIF0 ----------------------------------------------------------------- */

static const unsigned int hscif0_data_pins[] = {

	/* RX, TX */
@@ -3750,6 +3766,36 @@ static const unsigned int ssi9_ctrl_b_mux[] = { 
	SSI_SCK9_B_MARK, SSI_WS9_B_MARK,

};



/* - TMU -------------------------------------------------------------------- */

static const unsigned int tmu_tclk1_a_pins[] = {

	/* TCLK */

	RCAR_GP_PIN(6, 23),

};

static const unsigned int tmu_tclk1_a_mux[] = {

	TCLK1_A_MARK,

};

static const unsigned int tmu_tclk1_b_pins[] = {

	/* TCLK */

	RCAR_GP_PIN(5, 19),

};

static const unsigned int tmu_tclk1_b_mux[] = {

	TCLK1_B_MARK,

};

static const unsigned int tmu_tclk2_a_pins[] = {

	/* TCLK */

	RCAR_GP_PIN(6, 19),

};

static const unsigned int tmu_tclk2_a_mux[] = {

	TCLK2_A_MARK,

};

static const unsigned int tmu_tclk2_b_pins[] = {

	/* TCLK */

	RCAR_GP_PIN(6, 28),

};

static const unsigned int tmu_tclk2_b_mux[] = {

	TCLK2_B_MARK,

};



/* - USB0 ------------------------------------------------------------------- */

static const unsigned int usb0_pins[] = {

	/* PWEN, OVC */
@@ -3865,6 +3911,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(du_oddf),

	SH_PFC_PIN_GROUP(du_cde),

	SH_PFC_PIN_GROUP(du_disp),

	SH_PFC_PIN_GROUP(hdmi0_cec),

	SH_PFC_PIN_GROUP(hdmi1_cec),

	SH_PFC_PIN_GROUP(hscif0_data),

	SH_PFC_PIN_GROUP(hscif0_clk),

	SH_PFC_PIN_GROUP(hscif0_ctrl),
@@ -4095,6 +4143,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(ssi9_data_b),

	SH_PFC_PIN_GROUP(ssi9_ctrl_a),

	SH_PFC_PIN_GROUP(ssi9_ctrl_b),

	SH_PFC_PIN_GROUP(tmu_tclk1_a),

	SH_PFC_PIN_GROUP(tmu_tclk1_b),

	SH_PFC_PIN_GROUP(tmu_tclk2_a),

	SH_PFC_PIN_GROUP(tmu_tclk2_b),

	SH_PFC_PIN_GROUP(usb0),

	SH_PFC_PIN_GROUP(usb1),

	SH_PFC_PIN_GROUP(usb2),
@@ -4210,6 +4262,14 @@ static const char * const du_groups[] = { 
	"du_disp",

};



static const char * const hdmi0_groups[] = {

	"hdmi0_cec",

};



static const char * const hdmi1_groups[] = {

	"hdmi1_cec",

};



static const char * const hscif0_groups[] = {

	"hscif0_data",

	"hscif0_clk",
@@ -4545,6 +4605,13 @@ static const char * const ssi_groups[] = { 
	"ssi9_ctrl_b",

};



static const char * const tmu_groups[] = {

	"tmu_tclk1_a",

	"tmu_tclk1_b",

	"tmu_tclk2_a",

	"tmu_tclk2_b",

};



static const char * const usb0_groups[] = {

	"usb0",

};
@@ -4578,6 +4645,8 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(drif2),

	SH_PFC_FUNCTION(drif3),

	SH_PFC_FUNCTION(du),

	SH_PFC_FUNCTION(hdmi0),

	SH_PFC_FUNCTION(hdmi1),

	SH_PFC_FUNCTION(hscif0),

	SH_PFC_FUNCTION(hscif1),

	SH_PFC_FUNCTION(hscif2),
@@ -4613,6 +4682,7 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(sdhi2),

	SH_PFC_FUNCTION(sdhi3),

	SH_PFC_FUNCTION(ssi),

	SH_PFC_FUNCTION(tmu),

	SH_PFC_FUNCTION(usb0),

	SH_PFC_FUNCTION(usb1),

	SH_PFC_FUNCTION(usb2),