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

Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel 



Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents da52faa5 e120cacf

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

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/kernel.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <mach/irqs.h>

#include <mach/r8a73a4.h>



#include "core.h"

#include "sh_pfc.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/kernel.h>

#include <linux/pinctrl/pinconf-generic.h>



#include <mach/r8a7740.h>

#include <mach/irqs.h>



#include "core.h"

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

+105 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,79 @@ static const unsigned int hspi2_b_pins[] = { 
static const unsigned int hspi2_b_mux[] = {

	HSPI_CLK2_B_MARK, HSPI_CS2_B_MARK, HSPI_RX2_B_MARK, HSPI_TX2_B_MARK,

};

/* - I2C1 ------------------------------------------------------------------ */

static const unsigned int i2c1_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(0, 27), RCAR_GP_PIN(0, 28),

};

static const unsigned int i2c1_mux[] = {

	SCL1_MARK, SDA1_MARK,

};

static const unsigned int i2c1_b_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(1, 10), RCAR_GP_PIN(1, 11),

};

static const unsigned int i2c1_b_mux[] = {

	SCL1_B_MARK, SDA1_B_MARK,

};

static const unsigned int i2c1_c_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(3, 12), RCAR_GP_PIN(3, 13),

};

static const unsigned int i2c1_c_mux[] = {

	SCL1_C_MARK, SDA1_C_MARK,

};

static const unsigned int i2c1_d_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(1, 26), RCAR_GP_PIN(1, 27),

};

static const unsigned int i2c1_d_mux[] = {

	SCL1_D_MARK, SDA1_D_MARK,

};

/* - I2C2 ------------------------------------------------------------------ */

static const unsigned int i2c2_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(0, 25), RCAR_GP_PIN(0, 26),

};

static const unsigned int i2c2_mux[] = {

	SCL2_MARK, SDA2_MARK,

};

static const unsigned int i2c2_b_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(1, 18), RCAR_GP_PIN(1, 19),

};

static const unsigned int i2c2_b_mux[] = {

	SCL2_B_MARK, SDA2_B_MARK,

};

static const unsigned int i2c2_c_pins[] = {

	/* SCL, SDA */

	RCAR_GP_PIN(0, 31), RCAR_GP_PIN(0, 30),

};

static const unsigned int i2c2_c_mux[] = {

	SCL2_C_MARK, SDA2_C_MARK,

};

static const unsigned int i2c2_d_pins[] = {

	/* SCL, SDA */

	RCAR_GP_PIN(1, 24), RCAR_GP_PIN(1, 25),

};

static const unsigned int i2c2_d_mux[] = {

	SCL2_D_MARK, SDA2_D_MARK,

};

/* - I2C3 ------------------------------------------------------------------ */

static const unsigned int i2c3_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(3, 0), RCAR_GP_PIN(2, 30),

};

static const unsigned int i2c3_mux[] = {

	SCL3_MARK, SDA3_MARK,

};

static const unsigned int i2c3_b_pins[] = {

	/* SCL, SDA, */

	RCAR_GP_PIN(0, 29), RCAR_GP_PIN(0, 30),

};

static const unsigned int i2c3_b_mux[] = {

	SCL3_B_MARK, SDA3_B_MARK,

};

/* - INTC ------------------------------------------------------------------- */

static const unsigned int intc_irq0_pins[] = {

	/* IRQ */
@@ -2543,6 +2616,16 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(hspi1_d),

	SH_PFC_PIN_GROUP(hspi2),

	SH_PFC_PIN_GROUP(hspi2_b),

	SH_PFC_PIN_GROUP(i2c1),

	SH_PFC_PIN_GROUP(i2c1_b),

	SH_PFC_PIN_GROUP(i2c1_c),

	SH_PFC_PIN_GROUP(i2c1_d),

	SH_PFC_PIN_GROUP(i2c2),

	SH_PFC_PIN_GROUP(i2c2_b),

	SH_PFC_PIN_GROUP(i2c2_c),

	SH_PFC_PIN_GROUP(i2c2_d),

	SH_PFC_PIN_GROUP(i2c3),

	SH_PFC_PIN_GROUP(i2c3_b),

	SH_PFC_PIN_GROUP(intc_irq0),

	SH_PFC_PIN_GROUP(intc_irq0_b),

	SH_PFC_PIN_GROUP(intc_irq1),
@@ -2703,6 +2786,25 @@ static const char * const hspi2_groups[] = { 
	"hspi2_b",

};



static const char * const i2c1_groups[] = {

	"i2c1",

	"i2c1_b",

	"i2c1_c",

	"i2c1_d",

};



static const char * const i2c2_groups[] = {

	"i2c2",

	"i2c2_b",

	"i2c2_c",

	"i2c2_d",

};



static const char * const i2c3_groups[] = {

	"i2c3",

	"i2c3_b",

};



static const char * const intc_groups[] = {

	"intc_irq0",

	"intc_irq0_b",
@@ -2886,6 +2988,9 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(hspi0),

	SH_PFC_FUNCTION(hspi1),

	SH_PFC_FUNCTION(hspi2),

	SH_PFC_FUNCTION(i2c1),

	SH_PFC_FUNCTION(i2c2),

	SH_PFC_FUNCTION(i2c3),

	SH_PFC_FUNCTION(intc),

	SH_PFC_FUNCTION(lbsc),

	SH_PFC_FUNCTION(mmc0),

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

+994 −627

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −3
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/pinctrl/pinconf-generic.h>



#include <mach/irqs.h>

#include <mach/sh7372.h>

#include <linux/sh_intc.h>



#include "core.h"

#include "sh_pfc.h"