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

Commit 43be7e02 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: orion5x: convert edmini_v2 to DT pinctrl 



This commit converts the already partially DT-converted edmini_v2
platform to use the Device Tree for pinctrl.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-29-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent a55f9b61

arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts

+31 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ 




	gpio-keys {

	gpio-keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";

		pinctrl-0 = <&pmx_power_button>;

		pinctrl-names = "default";

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;

		button@1 {

		button@1 {
@@ -43,6 +45,8 @@ 




	gpio-leds {

	gpio-leds {

		compatible = "gpio-leds";

		compatible = "gpio-leds";

		pinctrl-0 = <&pmx_power_led>;

		pinctrl-names = "default";





		led@1 {

		led@1 {

			label = "power:blue";

			label = "power:blue";
@@ -67,7 +71,34 @@ 
	};

	};

};

};





&pinctrl {

	pinctrl-0 = <&pmx_rtc &pmx_power_led_ctrl>;

	pinctrl-names = "default";



	pmx_power_button: pmx-power-button {

		marvell,pins = "mpp18";

		marvell,function = "gpio";

	};



	pmx_power_led: pmx-power-led {

		marvell,pins = "mpp16";

		marvell,function = "gpio";

	};



	pmx_power_led_ctrl: pmx-power-led-ctrl {

		marvell,pins = "mpp17";

		marvell,function = "gpio";

	};



	pmx_rtc: pmx-rtc {

		marvell,pins = "mpp3";

		marvell,function = "gpio";

	};

};



&sata {

&sata {

	pinctrl-0 = <&pmx_sata0 &pmx_sata1>;

	pinctrl-names = "default";

	status = "okay";

	status = "okay";

	nr-ports = <2>;

	nr-ports = <2>;

};

};

arch/arm/mach-orion5x/edmini_v2-setup.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -109,37 +109,9 @@ static struct i2c_board_info __initdata edmini_v2_i2c_rtc = { 
/*****************************************************************************

/*****************************************************************************

 * General Setup

 * General Setup

 ****************************************************************************/

 ****************************************************************************/

static unsigned int edminiv2_mpp_modes[] __initdata = {

	MPP0_UNUSED,

	MPP1_UNUSED,

	MPP2_UNUSED,

	MPP3_GPIO,	/* RTC interrupt */

	MPP4_UNUSED,

	MPP5_UNUSED,

	MPP6_UNUSED,

	MPP7_UNUSED,

	MPP8_UNUSED,

	MPP9_UNUSED,

	MPP10_UNUSED,

	MPP11_UNUSED,

	MPP12_SATA_LED,	/* SATA 0 presence */

	MPP13_SATA_LED,	/* SATA 1 presence */

	MPP14_SATA_LED,	/* SATA 0 active */

	MPP15_SATA_LED,	/* SATA 1 active */

	/* 16: Power LED control (0 = On, 1 = Off) */

	MPP16_GPIO,

	/* 17: Power LED control select (0 = CPLD, 1 = GPIO16) */

	MPP17_GPIO,

	/* 18: Power button status (0 = Released, 1 = Pressed) */

	MPP18_GPIO,

	MPP19_UNUSED,

	0,

};





void __init edmini_v2_init(void)

void __init edmini_v2_init(void)

{

{

	orion5x_mpp_conf(edminiv2_mpp_modes);



	/*

	/*

	 * Configure peripherals.

	 * Configure peripherals.

	 */

	 */