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

Commit 35cec707 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'sh-pfc-for-v4.6' of... 

Merge branch 'sh-pfc-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
parents dc92f243 4412bb5d

drivers/pinctrl/sh-pfc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Renesas SH and SH Mobile PINCTRL drivers

#



if ARCH_SHMOBILE || SUPERH

if ARCH_RENESAS || SUPERH



config PINCTRL_SH_PFC

	select PINMUX

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

+1 −0
Original line number Diff line number Diff line
@@ -4530,6 +4530,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_DU0_DISP, FN_QPOLA, FN_CC50_STATE30, 0,

		/* IP6_3_2 [2] */

		FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, FN_CC50_STATE29,

		0,

		/* IP6_1_0 [2] */

		FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE, FN_CC50_STATE28, 0, }

	},

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

+89 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,61 @@ static const unsigned int avb_avtp_capture_b_mux[] = { 
	AVB_AVTP_CAPTURE_B_MARK,

};



/* - CAN ------------------------------------------------------------------ */

static const unsigned int can0_data_a_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(1, 23),	RCAR_GP_PIN(1, 24),

};

static const unsigned int can0_data_a_mux[] = {

	CAN0_TX_A_MARK,		CAN0_RX_A_MARK,

};

static const unsigned int can0_data_b_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(2, 0),	RCAR_GP_PIN(2, 1),

};

static const unsigned int can0_data_b_mux[] = {

	CAN0_TX_B_MARK,		CAN0_RX_B_MARK,

};

static const unsigned int can1_data_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(1, 22),	RCAR_GP_PIN(1, 26),

};

static const unsigned int can1_data_mux[] = {

	CAN1_TX_MARK,		CAN1_RX_MARK,

};



/* - CAN Clock -------------------------------------------------------------- */

static const unsigned int can_clk_pins[] = {

	/* CLK */

	RCAR_GP_PIN(1, 25),

};

static const unsigned int can_clk_mux[] = {

	CAN_CLK_MARK,

};



/* - CAN FD --------------------------------------------------------------- */

static const unsigned int canfd0_data_a_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(1, 23),     RCAR_GP_PIN(1, 24),

};

static const unsigned int canfd0_data_a_mux[] = {

	CANFD0_TX_A_MARK,       CANFD0_RX_A_MARK,

};

static const unsigned int canfd0_data_b_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(2, 0),      RCAR_GP_PIN(2, 1),

};

static const unsigned int canfd0_data_b_mux[] = {

	CANFD0_TX_B_MARK,       CANFD0_RX_B_MARK,

};

static const unsigned int canfd1_data_pins[] = {

	/* TX, RX */

	RCAR_GP_PIN(1, 22),     RCAR_GP_PIN(1, 26),

};

static const unsigned int canfd1_data_mux[] = {

	CANFD1_TX_MARK,         CANFD1_RX_MARK,

};



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

static const unsigned int hscif0_data_pins[] = {

	/* RX, TX */
@@ -3284,6 +3339,13 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(avb_avtp_capture_a),

	SH_PFC_PIN_GROUP(avb_avtp_match_b),

	SH_PFC_PIN_GROUP(avb_avtp_capture_b),

	SH_PFC_PIN_GROUP(can0_data_a),

	SH_PFC_PIN_GROUP(can0_data_b),

	SH_PFC_PIN_GROUP(can1_data),

	SH_PFC_PIN_GROUP(can_clk),

	SH_PFC_PIN_GROUP(canfd0_data_a),

	SH_PFC_PIN_GROUP(canfd0_data_b),

	SH_PFC_PIN_GROUP(canfd1_data),

	SH_PFC_PIN_GROUP(hscif0_data),

	SH_PFC_PIN_GROUP(hscif0_clk),

	SH_PFC_PIN_GROUP(hscif0_ctrl),
@@ -3545,6 +3607,28 @@ static const char * const avb_groups[] = { 
	"avb_avtp_capture_b",

};



static const char * const can0_groups[] = {

	"can0_data_a",

	"can0_data_b",

};



static const char * const can1_groups[] = {

	"can1_data",

};



static const char * const can_clk_groups[] = {

	"can_clk",

};



static const char * const canfd0_groups[] = {

	"canfd0_data_a",

	"canfd0_data_b",

};



static const char * const canfd1_groups[] = {

	"canfd1_data",

};



static const char * const hscif0_groups[] = {

	"hscif0_data",

	"hscif0_clk",
@@ -3883,6 +3967,11 @@ static const char * const usb2_groups[] = { 
static const struct sh_pfc_function pinmux_functions[] = {

	SH_PFC_FUNCTION(audio_clk),

	SH_PFC_FUNCTION(avb),

	SH_PFC_FUNCTION(can0),

	SH_PFC_FUNCTION(can1),

	SH_PFC_FUNCTION(can_clk),

	SH_PFC_FUNCTION(canfd0),

	SH_PFC_FUNCTION(canfd1),

	SH_PFC_FUNCTION(hscif0),

	SH_PFC_FUNCTION(hscif1),

	SH_PFC_FUNCTION(hscif2),