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

Commit 5d244563 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree 



Replace the pinctrl mappings in board code by device tree mappings.
For devices that are still instantiated from board code reference the
mappings as the default pin controller state to apply them at boot time.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 3f59007e

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts

+10 −0
Original line number Diff line number Diff line
@@ -43,3 +43,13 @@ 
		interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */

	};

};



&pfc {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	scifa1_pins: scifa1 {

		renesas,groups = "scifa1_data";

		renesas,function = "scifa1";

	};

};

arch/arm/mach-shmobile/board-armadillo800eva-reference.c

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

#include <linux/gpio.h>

#include <linux/io.h>

#include <linux/pinctrl/machine.h>

#include <mach/common.h>

#include <mach/r8a7740.h>

#include <asm/mach/arch.h>
@@ -119,12 +118,6 @@ 
 *	usbhsf_power_ctrl()

 */



static const struct pinctrl_map eva_pinctrl_map[] = {

	/* SCIFA1 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "e6050000.pfc",

				  "scifa1_data", "scifa1"),

};



static void __init eva_clock_init(void)

{

	struct clk *system	= clk_get(NULL, "system_clk");
@@ -169,8 +162,6 @@ static void __init eva_init(void) 
	r8a7740_clock_init(MD_CK0 | MD_CK2);

	eva_clock_init();



	pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));



	r8a7740_meram_workaround();



#ifdef CONFIG_CACHE_L2X0