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

Commit 6077e4ef authored by Linus Walleij's avatar Linus Walleij
Browse files

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

Merge branch 'sh-pfc-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
parents 0202a111 1a4ca6dd

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8369,6 +8369,7 @@ F: drivers/pinctrl/intel/ 


PIN CONTROLLER - RENESAS

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

M:	Geert Uytterhoeven <geert+renesas@glider.be>

L:	linux-sh@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/sh-pfc/

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

+41 −0
Original line number Diff line number Diff line
@@ -2282,6 +2282,35 @@ static const unsigned int scif5_clk_d_pins[] = { 
static const unsigned int scif5_clk_d_mux[] = {

	SCK5_D_MARK,

};

/* - SCIF Clock ------------------------------------------------------------- */

static const unsigned int scif_clk_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(4, 28),

};

static const unsigned int scif_clk_mux[] = {

	SCIF_CLK_MARK,

};

static const unsigned int scif_clk_b_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(4, 5),

};

static const unsigned int scif_clk_b_mux[] = {

	SCIF_CLK_B_MARK,

};

static const unsigned int scif_clk_c_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(4, 18),

};

static const unsigned int scif_clk_c_mux[] = {

	SCIF_CLK_C_MARK,

};

static const unsigned int scif_clk_d_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(2, 29),

};

static const unsigned int scif_clk_d_mux[] = {

	SCIF_CLK_D_MARK,

};

/* - SDHI0 ------------------------------------------------------------------ */

static const unsigned int sdhi0_data1_pins[] = {

	/* D0 */
@@ -2693,6 +2722,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(scif5_clk_c),

	SH_PFC_PIN_GROUP(scif5_data_d),

	SH_PFC_PIN_GROUP(scif5_clk_d),

	SH_PFC_PIN_GROUP(scif_clk),

	SH_PFC_PIN_GROUP(scif_clk_b),

	SH_PFC_PIN_GROUP(scif_clk_c),

	SH_PFC_PIN_GROUP(scif_clk_d),

	SH_PFC_PIN_GROUP(sdhi0_data1),

	SH_PFC_PIN_GROUP(sdhi0_data4),

	SH_PFC_PIN_GROUP(sdhi0_ctrl),
@@ -2902,6 +2935,13 @@ static const char * const scif5_groups[] = { 
	"scif5_clk_d",

};



static const char * const scif_clk_groups[] = {

	"scif_clk",

	"scif_clk_b",

	"scif_clk_c",

	"scif_clk_d",

};



static const char * const sdhi0_groups[] = {

	"sdhi0_data1",

	"sdhi0_data4",
@@ -2997,6 +3037,7 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(scif3),

	SH_PFC_FUNCTION(scif4),

	SH_PFC_FUNCTION(scif5),

	SH_PFC_FUNCTION(scif_clk),

	SH_PFC_FUNCTION(usb0),

	SH_PFC_FUNCTION(usb1),

	SH_PFC_FUNCTION(usb2),

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

+23 −0
Original line number Diff line number Diff line
@@ -3219,6 +3219,21 @@ static const unsigned int scifb2_data_c_pins[] = { 
static const unsigned int scifb2_data_c_mux[] = {

	SCIFB2_RXD_C_MARK, SCIFB2_TXD_C_MARK,

};

/* - SCIF Clock ------------------------------------------------------------- */

static const unsigned int scif_clk_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(4, 26),

};

static const unsigned int scif_clk_mux[] = {

	SCIF_CLK_MARK,

};

static const unsigned int scif_clk_b_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(5, 4),

};

static const unsigned int scif_clk_b_mux[] = {

	SCIF_CLK_B_MARK,

};

/* - SDHI0 ------------------------------------------------------------------ */

static const unsigned int sdhi0_data1_pins[] = {

	/* D0 */
@@ -4122,6 +4137,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(scifb2_clk_b),

	SH_PFC_PIN_GROUP(scifb2_ctrl_b),

	SH_PFC_PIN_GROUP(scifb2_data_c),

	SH_PFC_PIN_GROUP(scif_clk),

	SH_PFC_PIN_GROUP(scif_clk_b),

	SH_PFC_PIN_GROUP(sdhi0_data1),

	SH_PFC_PIN_GROUP(sdhi0_data4),

	SH_PFC_PIN_GROUP(sdhi0_ctrl),
@@ -4538,6 +4555,11 @@ static const char * const scifb2_groups[] = { 
	"scifb2_data_c",

};



static const char * const scif_clk_groups[] = {

	"scif_clk",

	"scif_clk_b",

};



static const char * const sdhi0_groups[] = {

	"sdhi0_data1",

	"sdhi0_data4",
@@ -4712,6 +4734,7 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(scifb0),

	SH_PFC_FUNCTION(scifb1),

	SH_PFC_FUNCTION(scifb2),

	SH_PFC_FUNCTION(scif_clk),

	SH_PFC_FUNCTION(sdhi0),

	SH_PFC_FUNCTION(sdhi1),

	SH_PFC_FUNCTION(sdhi2),

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

+93 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * r8a7791 processor support - PFC hardware block.

 *

 * Copyright (C) 2013 Renesas Electronics Corporation

 * Copyright (C) 2014-2015 Cogent Embedded, Inc.

 *

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

 * it under the terms of the GNU General Public License version 2
@@ -1725,6 +1726,82 @@ static const unsigned int audio_clkout_mux[] = { 
	AUDIO_CLKOUT_MARK,

};



/* - AVB -------------------------------------------------------------------- */

static const unsigned int avb_link_pins[] = {

	RCAR_GP_PIN(5, 14),

};

static const unsigned int avb_link_mux[] = {

	AVB_LINK_MARK,

};

static const unsigned int avb_magic_pins[] = {

	RCAR_GP_PIN(5, 11),

};

static const unsigned int avb_magic_mux[] = {

	AVB_MAGIC_MARK,

};

static const unsigned int avb_phy_int_pins[] = {

	RCAR_GP_PIN(5, 16),

};

static const unsigned int avb_phy_int_mux[] = {

	AVB_PHY_INT_MARK,

};

static const unsigned int avb_mdio_pins[] = {

	RCAR_GP_PIN(5, 12), RCAR_GP_PIN(5, 9),

};

static const unsigned int avb_mdio_mux[] = {

	AVB_MDC_MARK, AVB_MDIO_MARK,

};

static const unsigned int avb_mii_pins[] = {

	RCAR_GP_PIN(5, 18), RCAR_GP_PIN(5, 19), RCAR_GP_PIN(5, 20),

	RCAR_GP_PIN(5, 21),



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

	RCAR_GP_PIN(5, 3),



	RCAR_GP_PIN(5, 8), RCAR_GP_PIN(5, 13), RCAR_GP_PIN(5, 10),

	RCAR_GP_PIN(5, 15), RCAR_GP_PIN(5, 26), RCAR_GP_PIN(5, 27),

	RCAR_GP_PIN(5, 28), RCAR_GP_PIN(5, 29),

};

static const unsigned int avb_mii_mux[] = {

	AVB_TXD0_MARK, AVB_TXD1_MARK, AVB_TXD2_MARK,

	AVB_TXD3_MARK,



	AVB_RXD0_MARK, AVB_RXD1_MARK, AVB_RXD2_MARK,

	AVB_RXD3_MARK,



	AVB_RX_ER_MARK, AVB_RX_CLK_MARK, AVB_RX_DV_MARK,

	AVB_CRS_MARK, AVB_TX_EN_MARK, AVB_TX_ER_MARK,

	AVB_TX_CLK_MARK, AVB_COL_MARK,

};

static const unsigned int avb_gmii_pins[] = {

	RCAR_GP_PIN(5, 18), RCAR_GP_PIN(5, 19), RCAR_GP_PIN(5, 20),

	RCAR_GP_PIN(5, 21), RCAR_GP_PIN(5, 22), RCAR_GP_PIN(5, 23),

	RCAR_GP_PIN(5, 24), RCAR_GP_PIN(5, 25),



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

	RCAR_GP_PIN(5, 3), RCAR_GP_PIN(5, 4), RCAR_GP_PIN(5, 5),

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



	RCAR_GP_PIN(5, 8), RCAR_GP_PIN(5, 13), RCAR_GP_PIN(5, 10),

	RCAR_GP_PIN(5, 15), RCAR_GP_PIN(5, 30), RCAR_GP_PIN(5, 17),

	RCAR_GP_PIN(5, 26), RCAR_GP_PIN(5, 27), RCAR_GP_PIN(5, 28),

	RCAR_GP_PIN(5, 29),

};

static const unsigned int avb_gmii_mux[] = {

	AVB_TXD0_MARK, AVB_TXD1_MARK, AVB_TXD2_MARK,

	AVB_TXD3_MARK, AVB_TXD4_MARK, AVB_TXD5_MARK,

	AVB_TXD6_MARK, AVB_TXD7_MARK,



	AVB_RXD0_MARK, AVB_RXD1_MARK, AVB_RXD2_MARK,

	AVB_RXD3_MARK, AVB_RXD4_MARK, AVB_RXD5_MARK,

	AVB_RXD6_MARK, AVB_RXD7_MARK,



	AVB_RX_ER_MARK, AVB_RX_CLK_MARK, AVB_RX_DV_MARK,

	AVB_CRS_MARK, AVB_GTX_CLK_MARK, AVB_GTXREFCLK_MARK,

	AVB_TX_EN_MARK, AVB_TX_ER_MARK, AVB_TX_CLK_MARK,

	AVB_COL_MARK,

};



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



static const unsigned int can0_data_pins[] = {
@@ -4260,6 +4337,12 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(audio_clk_b_b),

	SH_PFC_PIN_GROUP(audio_clk_c),

	SH_PFC_PIN_GROUP(audio_clkout),

	SH_PFC_PIN_GROUP(avb_link),

	SH_PFC_PIN_GROUP(avb_magic),

	SH_PFC_PIN_GROUP(avb_phy_int),

	SH_PFC_PIN_GROUP(avb_mdio),

	SH_PFC_PIN_GROUP(avb_mii),

	SH_PFC_PIN_GROUP(avb_gmii),

	SH_PFC_PIN_GROUP(can0_data),

	SH_PFC_PIN_GROUP(can0_data_b),

	SH_PFC_PIN_GROUP(can0_data_c),
@@ -4601,6 +4684,15 @@ static const char * const audio_clk_groups[] = { 
	"audio_clkout",

};



static const char * const avb_groups[] = {

	"avb_link",

	"avb_magic",

	"avb_phy_int",

	"avb_mdio",

	"avb_mii",

	"avb_gmii",

};



static const char * const can0_groups[] = {

	"can0_data",

	"can0_data_b",
@@ -5090,6 +5182,7 @@ static const char * const vin2_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(du),

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

+23 −0
Original line number Diff line number Diff line
@@ -2625,6 +2625,21 @@ static const unsigned int scifb2_ctrl_pins[] = { 
static const unsigned int scifb2_ctrl_mux[] = {

	SCIFB2_RTS_N_MARK, SCIFB2_CTS_N_MARK,

};

/* - SCIF Clock ------------------------------------------------------------- */

static const unsigned int scif_clk_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(1, 23),

};

static const unsigned int scif_clk_mux[] = {

	SCIF_CLK_MARK,

};

static const unsigned int scif_clk_b_pins[] = {

	/* SCIF_CLK */

	RCAR_GP_PIN(3, 29),

};

static const unsigned int scif_clk_b_mux[] = {

	SCIF_CLK_B_MARK,

};

/* - SDHI0 ------------------------------------------------------------------ */

static const unsigned int sdhi0_data1_pins[] = {

	/* D0 */
@@ -3052,6 +3067,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(scifb2_data),

	SH_PFC_PIN_GROUP(scifb2_clk),

	SH_PFC_PIN_GROUP(scifb2_ctrl),

	SH_PFC_PIN_GROUP(scif_clk),

	SH_PFC_PIN_GROUP(scif_clk_b),

	SH_PFC_PIN_GROUP(sdhi0_data1),

	SH_PFC_PIN_GROUP(sdhi0_data4),

	SH_PFC_PIN_GROUP(sdhi0_ctrl),
@@ -3335,6 +3352,11 @@ static const char * const scifb2_groups[] = { 
	"scifb2_ctrl",

};



static const char * const scif_clk_groups[] = {

	"scif_clk",

	"scif_clk_b",

};



static const char * const sdhi0_groups[] = {

	"sdhi0_data1",

	"sdhi0_data4",
@@ -3422,6 +3444,7 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(scifb0),

	SH_PFC_FUNCTION(scifb1),

	SH_PFC_FUNCTION(scifb2),

	SH_PFC_FUNCTION(scif_clk),

	SH_PFC_FUNCTION(sdhi0),

	SH_PFC_FUNCTION(sdhi1),

	SH_PFC_FUNCTION(sdhi2),