Commit f36218d2 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman

ARM: shmobile: r8a7740: Add pin control device to device tree

Add a pfc node to the r8a7740 device tree and remove manual pinmux
initialization from the corresponding board files.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 803d319c
...@@ -139,4 +139,12 @@ i2c1: i2c@e6c20000 { ...@@ -139,4 +139,12 @@ i2c1: i2c@e6c20000 {
0 72 0x4 0 72 0x4
0 73 0x4>; 0 73 0x4>;
}; };
pfc: pfc@e6050000 {
compatible = "renesas,pfc-r8a7740";
reg = <0xe6050000 0x8000>,
<0xe605800c 0x20>;
gpio-controller;
#gpio-cells = <2>;
};
}; };
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
static const struct pinctrl_map eva_pinctrl_map[] = { static const struct pinctrl_map eva_pinctrl_map[] = {
/* SCIFA1 */ /* SCIFA1 */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740", PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "e6050000.pfc",
"scifa1_data", "scifa1"), "scifa1_data", "scifa1"),
}; };
...@@ -170,22 +170,22 @@ static void __init eva_init(void) ...@@ -170,22 +170,22 @@ static void __init eva_init(void)
eva_clock_init(); eva_clock_init();
pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map)); pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
r8a7740_pinmux_init();
r8a7740_meram_workaround(); r8a7740_meram_workaround();
/*
* Touchscreen
* TODO: Move reset GPIO over to .dts when we can reference it
*/
gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
/* Early BRESP enable, Shared attribute override enable, 32K*8way */ /* Early BRESP enable, Shared attribute override enable, 32K*8way */
l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff); l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
#endif #endif
r8a7740_add_standard_devices_dt(); r8a7740_add_standard_devices_dt();
/*
* Touchscreen
* TODO: Move reset GPIO over to .dts when we can reference it
*/
gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
r8a7740_pm_init(); r8a7740_pm_init();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment