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

Commit 147d1ffd authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Rafael J. Wysocki
Browse files

ARM: shmobile: r8a7740: add FSI-B (for HDMI) GPIO support 



In order to enable FSI-B selection from platform board,
this patch adds its interface to GPIO framework.

This patch is based on v1.0 manual

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 69efac9a

arch/arm/mach-shmobile/include/mach/r8a7740.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ enum { 
	GPIO_FN_DBGMD10,	GPIO_FN_DBGMD11,	GPIO_FN_DBGMD20,

	GPIO_FN_DBGMD10,	GPIO_FN_DBGMD11,	GPIO_FN_DBGMD20,

	GPIO_FN_DBGMD21,

	GPIO_FN_DBGMD21,





	/* FSI */

	/* FSI-A */

	GPIO_FN_FSIAISLD_PORT0,		/* FSIAISLD Port 0/5 */

	GPIO_FN_FSIAISLD_PORT0,		/* FSIAISLD Port 0/5 */

	GPIO_FN_FSIAISLD_PORT5,

	GPIO_FN_FSIAISLD_PORT5,

	GPIO_FN_FSIASPDIF_PORT9,	/* FSIASPDIF Port 9/18 */

	GPIO_FN_FSIASPDIF_PORT9,	/* FSIASPDIF Port 9/18 */
@@ -150,6 +150,9 @@ enum { 
	GPIO_FN_FSIACK,		GPIO_FN_FSIAILR,

	GPIO_FN_FSIACK,		GPIO_FN_FSIAILR,

	GPIO_FN_FSIAIBT,

	GPIO_FN_FSIAIBT,





	/* FSI-B */

	GPIO_FN_FSIBCK,



	/* FMSI */

	/* FMSI */

	GPIO_FN_FMSISLD_PORT1, /* FMSISLD Port 1/6 */

	GPIO_FN_FMSISLD_PORT1, /* FMSISLD Port 1/6 */

	GPIO_FN_FMSISLD_PORT6,

	GPIO_FN_FMSISLD_PORT6,

arch/arm/mach-shmobile/pfc-r8a7740.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ enum { 
	DBGMD10_MARK,	DBGMD11_MARK,	DBGMD20_MARK,

	DBGMD10_MARK,	DBGMD11_MARK,	DBGMD20_MARK,

	DBGMD21_MARK,

	DBGMD21_MARK,





	/* FSI */

	/* FSI-A */

	FSIAISLD_PORT0_MARK,	/* FSIAISLD Port 0/5 */

	FSIAISLD_PORT0_MARK,	/* FSIAISLD Port 0/5 */

	FSIAISLD_PORT5_MARK,

	FSIAISLD_PORT5_MARK,

	FSIASPDIF_PORT9_MARK,	/* FSIASPDIF Port 9/18 */

	FSIASPDIF_PORT9_MARK,	/* FSIASPDIF Port 9/18 */
@@ -178,6 +178,9 @@ enum { 
	FSIAOBT_MARK,	FSIAOSLD_MARK,	FSIAOMC_MARK,

	FSIAOBT_MARK,	FSIAOSLD_MARK,	FSIAOMC_MARK,

	FSIACK_MARK,	FSIAILR_MARK,	FSIAIBT_MARK,

	FSIACK_MARK,	FSIAILR_MARK,	FSIAIBT_MARK,





	/* FSI-B */

	FSIBCK_MARK,



	/* FMSI */

	/* FMSI */

	FMSISLD_PORT1_MARK, /* FMSISLD Port 1/6 */

	FMSISLD_PORT1_MARK, /* FMSISLD Port 1/6 */

	FMSISLD_PORT6_MARK,

	FMSISLD_PORT6_MARK,
@@ -774,6 +777,7 @@ static pinmux_enum_t pinmux_data[] = { 




	/* Port11 */

	/* Port11 */

	PINMUX_DATA(FSIACK_MARK,		PORT11_FN1),

	PINMUX_DATA(FSIACK_MARK,		PORT11_FN1),

	PINMUX_DATA(FSIBCK_MARK,		PORT11_FN2),

	PINMUX_DATA(IRQ2_PORT11_MARK,		PORT11_FN0,	MSEL1CR_2_0),

	PINMUX_DATA(IRQ2_PORT11_MARK,		PORT11_FN0,	MSEL1CR_2_0),





	/* Port12 */

	/* Port12 */
@@ -1696,7 +1700,7 @@ static struct pinmux_gpio pinmux_gpios[] = { 
	GPIO_FN(DBGMD10),	GPIO_FN(DBGMD11),	GPIO_FN(DBGMD20),

	GPIO_FN(DBGMD10),	GPIO_FN(DBGMD11),	GPIO_FN(DBGMD20),

	GPIO_FN(DBGMD21),

	GPIO_FN(DBGMD21),





	/* FSI */

	/* FSI-A */

	GPIO_FN(FSIAISLD_PORT0),	/* FSIAISLD Port 0/5 */

	GPIO_FN(FSIAISLD_PORT0),	/* FSIAISLD Port 0/5 */

	GPIO_FN(FSIAISLD_PORT5),

	GPIO_FN(FSIAISLD_PORT5),

	GPIO_FN(FSIASPDIF_PORT9),	/* FSIASPDIF Port 9/18 */

	GPIO_FN(FSIASPDIF_PORT9),	/* FSIASPDIF Port 9/18 */
@@ -1705,6 +1709,9 @@ static struct pinmux_gpio pinmux_gpios[] = { 
	GPIO_FN(FSIAOBT),	GPIO_FN(FSIAOSLD),	GPIO_FN(FSIAOMC),

	GPIO_FN(FSIAOBT),	GPIO_FN(FSIAOSLD),	GPIO_FN(FSIAOMC),

	GPIO_FN(FSIACK),	GPIO_FN(FSIAILR),	GPIO_FN(FSIAIBT),

	GPIO_FN(FSIACK),	GPIO_FN(FSIAILR),	GPIO_FN(FSIAIBT),





	/* FSI-B */

	GPIO_FN(FSIBCK),



	/* FMSI */

	/* FMSI */

	GPIO_FN(FMSISLD_PORT1), /* FMSISLD Port 1/6 */

	GPIO_FN(FMSISLD_PORT1), /* FMSISLD Port 1/6 */

	GPIO_FN(FMSISLD_PORT6),

	GPIO_FN(FMSISLD_PORT6),