Merge branch 'pinmux/next/pfc' of git://linuxtv.org/pinchartl/fbdev into devel (daa706de) · Commits · e / devices / android_kernel_fairphone_FP3

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -2061,17 +2061,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
		SH_PFC_FUNCTION(sdhi2),
		};

		#undef PORTCR
		#define PORTCR(nr, reg) \
		{ \
		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
		_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
		PORT##nr##_FN0, PORT##nr##_FN1, \
		PORT##nr##_FN2, PORT##nr##_FN3, \
		PORT##nr##_FN4, PORT##nr##_FN5, \
		PORT##nr##_FN6, PORT##nr##_FN7 } \
		}

		static const struct pinmux_cfg_reg pinmux_config_regs[] = {
		PORTCR(0, 0xe6050000),
		PORTCR(1, 0xe6050001),

+0 −11

Original line number	Diff line number	Diff line
		@@ -3234,17 +3234,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
		SH_PFC_FUNCTION(tpu0),
		};

		#undef PORTCR
		#define PORTCR(nr, reg) \
		{ \
		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
		_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
		PORT##nr##_FN0, PORT##nr##_FN1, \
		PORT##nr##_FN2, PORT##nr##_FN3, \
		PORT##nr##_FN4, PORT##nr##_FN5, \
		PORT##nr##_FN6, PORT##nr##_FN7 } \
		}

		static const struct pinmux_cfg_reg pinmux_config_regs[] = {
		PORTCR(0, 0xe6050000), /* PORT0CR */
		PORTCR(1, 0xe6050001), /* PORT1CR */

+689 −59

File changed.

Preview size limit exceeded, changes collapsed.

+15 −6

Original line number	Diff line number	Diff line
		@@ -2858,20 +2858,29 @@ static const char * const mmc_groups[] = {

		static const char * const msiof0_groups[] = {
		"msiof0_clk",
		"msiof0_ctrl",
		"msiof0_data",
		"msiof0_sync",
		"msiof0_ss1",
		"msiof0_ss2",
		"msiof0_rx",
		"msiof0_tx",
		};

		static const char * const msiof1_groups[] = {
		"msiof1_clk",
		"msiof1_ctrl",
		"msiof1_data",
		"msiof1_sync",
		"msiof1_ss1",
		"msiof1_ss2",
		"msiof1_rx",
		"msiof1_tx",
		};

		static const char * const msiof2_groups[] = {
		"msiof2_clk",
		"msiof2_ctrl",
		"msiof2_data",
		"msiof2_sync",
		"msiof2_ss1",
		"msiof2_ss2",
		"msiof2_rx",
		"msiof2_tx",
		};

		static const char * const scif0_groups[] = {

+0 −11

Original line number	Diff line number	Diff line
		@@ -2118,17 +2118,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
		SH_PFC_FUNCTION(usb1),
		};

		#undef PORTCR
		#define PORTCR(nr, reg) \
		{ \
		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
		_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT), \
		PORT##nr##_FN0, PORT##nr##_FN1, \
		PORT##nr##_FN2, PORT##nr##_FN3, \
		PORT##nr##_FN4, PORT##nr##_FN5, \
		PORT##nr##_FN6, PORT##nr##_FN7 } \
		}

		static const struct pinmux_cfg_reg pinmux_config_regs[] = {
		PORTCR(0, 0xE6051000), /* PORT0CR */
		PORTCR(1, 0xE6051001), /* PORT1CR */