ARM: shmobile: mackerel: Register pinctrl mapping for HDMI (cfced2c8) · Commits · 戴 / test

Replace the GPIO-based HDMI pinmux configuration by a pinctrl mapping. Signed-off-by:

arch/arm/mach-shmobile/board-mackerel.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1338,6 +1338,9 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = {
		/* FSIB (HDMI) */
		PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-sh7372",
		"fsib_mclk_in", "fsib"),
		/* HDMI */
		PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-sh7372",
		"hdmi", "hdmi"),
		/* SDHI0 */
		PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372",
		"sdhi0_data4", "sdhi0"),
		@@ -1494,10 +1497,6 @@ static void __init mackerel_init(void)
		gpio_request(GPIO_FN_SCIFA2_TXD1, NULL);
		gpio_request(GPIO_FN_SCIFA2_RXD1, NULL);

		/* HDMI */
		gpio_request(GPIO_FN_HDMI_HPD, NULL);
		gpio_request(GPIO_FN_HDMI_CEC, NULL);

		/* Reset HDMI, must be held at least one EXTALR (32768Hz) period */
		srcr4 = __raw_readl(SRCR4);
		__raw_writel(srcr4 \| (1 << 13), SRCR4);