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

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

ARM: shmobile: marzen-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 0a4f7889

arch/arm/boot/dts/r8a7779-marzen-reference.dts

+35 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
	lan0@18000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x18000000 0x100>;

		pinctrl-0 = <&lan0_pins>;

		pinctrl-names = "default";



		phy-mode = "mii";

		interrupt-parent = <&gic>;

		interrupts = <0 28 0x4>;
@@ -45,3 +48,35 @@ 
		vdd33a-supply = <&fixedregulator3v3>;

	};

};



&pfc {

	pinctrl-0 = <&scif2_pins &scif4_pins &sdhi0_pins>;

	pinctrl-names = "default";



	lan0_pins: lan0 {

		intc {

			renesas,groups = "intc_irq1_b";

			renesas,function = "intc";

		};

		lbsc {

			renesas,groups = "lbsc_ex_cs0";

			renesas,function = "lbsc";

		};

	};



	scif2_pins: scif2 {

		renesas,groups = "scif2_data_c";

		renesas,function = "scif2";

	};



	scif4_pins: scif4 {

		renesas,groups = "scif4_data";

		renesas,function = "scif4";

	};



	sdhi0_pins: sdhi0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd",

				 "sdhi0_wp";

		renesas,function = "sdhi0";

	};

};

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

+0 −27
Original line number Diff line number Diff line
@@ -19,41 +19,14 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/pinctrl/machine.h>

#include <mach/r8a7779.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>



static const struct pinctrl_map marzen_pinctrl_map[] = {

	/* SCIF2 (CN18: DEBUG0) */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "fffc0000.pfc",

				  "scif2_data_c", "scif2"),

	/* SCIF4 (CN19: DEBUG1) */

	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "fffc0000.pfc",

				  "scif4_data", "scif4"),

	/* SDHI0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_data4", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_ctrl", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_cd", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc",

				  "sdhi0_wp", "sdhi0"),

	/* SMSC */

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc",

				  "intc_irq1_b", "intc"),

	PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc",

				  "lbsc_ex_cs0", "lbsc"),

};



static void __init marzen_init(void)

{

	pinctrl_register_mappings(marzen_pinctrl_map,

				  ARRAY_SIZE(marzen_pinctrl_map));



	r8a7779_add_standard_devices_dt();

}