diff mbox

[8/9] ARM: Kirkwood: Convert lsxl boards to pinctrl.

Message ID 1351090434-30499-9-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn Oct. 24, 2012, 2:53 p.m. UTC 
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/boot/dts/kirkwood-lsxl.dtsi |   67 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-lsxl.c  |   19 ----------
 2 files changed, 67 insertions(+), 19 deletions(-)

Comments

Michael Walle Oct. 24, 2012, 8:37 p.m. UTC | #1 
Am Mittwoch 24 Oktober 2012, 16:53:53 schrieb Andrew Lunn:
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi |   67
> ++++++++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/board-lsxl.c  | 
>  19 ----------
>  2 files changed, 67 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 8fea375..01d6e3a 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -6,6 +6,73 @@
>  	};
> 
>  	ocp@f1000000 {
> +		pinctrl: pinctrl@10000 {
> +			compatible = "marvell,88f6281-pinctrl";
> +			reg = <0x10000 0x20>;
> +
> +			pinctrl-0 = < &pmx_power_hdd &pmx_usb_vbus
> +				      &pmx_fan_low &pmx_fan_high
> +				      &pmx_led_function_red &pmx_led_alarm
> +				      &pmx_led_info &pmx_led_power
> +				      &pmx_fan_lock &pmx_button_function
> +				      &pmx_power_switch &pmx_power_auto_switch
> +				      &pmx_led_function_blue >;
> +			pinctrl-names = "default";
> +
> +			pmx_power_hdd: pmx-power-hdd {
> +				marvell,pins = "mpp10";
> +				marvell,function = "gpio";
function is "gpo";

> +			};
> +			pmx_usb_vbus: pmx-usb-vbus {
> +				marvell,pins = "mpp11";
> +				marvell,function = "gpio";
> +			};
> +			pmx_fan_high: pmx-fan-high {
> +				marvell,pins = "mpp18";
> +				marvell,function = "gpo";
> +			};
> +			pmx_fan_low: pmx-fan-low {
> +				marvell,pins = "mpp19";
> +				marvell,function = "gpo";
> +			};
> +			pmx_led_function_blue: pmx-led-function-blue {
> +				marvell,pins = "mpp36";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_alarm: pmx-led-alarm {
> +				marvell,pins = "mpp37";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_info: pmx-led-info {
> +				marvell,pins = "mpp38";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_power: pmx-led-power {
> +				marvell,pins = "mpp39";
> +				marvell,function = "gpio";
> +			};
> +			pmx_fan_lock: pmx-fan-lock {
> +				marvell,pins = "mpp40";
> +				marvell,function = "gpo";
gpio

> +			};
> +			pmx_button_function: pmx-button-function {
> +				marvell,pins = "mpp41";
> +				marvell,function = "gpio";
> +			};
> +			pmx_power_switch: pmx-power-switch {
> +				marvell,pins = "mpp42";
> +				marvell,function = "gpio";
> +			};
> +			pmx_power_auto_switch: pmx-power-auto-switch {
> +				marvell,pins = "mpp43";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_function_red: pmx-led-function_red {
> +				marvell,pins = "mpp43";
> +				marvell,function = "gpio";
> +			};
> +
> +		};
>  		sata@80000 {
>  			status = "okay";
>  			nr-ports = <1>;
> diff --git a/arch/arm/mach-kirkwood/board-lsxl.c
> b/arch/arm/mach-kirkwood/board-lsxl.c index 83d8975..868bdb0 100644
> --- a/arch/arm/mach-kirkwood/board-lsxl.c
> +++ b/arch/arm/mach-kirkwood/board-lsxl.c
> @@ -26,7 +26,6 @@
>  #include <asm/mach/arch.h>
>  #include <mach/kirkwood.h>
>  #include "common.h"
> -#include "mpp.h"
> 
>  static struct mv643xx_eth_platform_data lsxl_ge00_data = {
>  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
> @@ -36,23 +35,6 @@ static struct mv643xx_eth_platform_data lsxl_ge01_data =
> { .phy_addr	= MV643XX_ETH_PHY_ADDR(8),
>  };
> 
> -static unsigned int lsxl_mpp_config[] __initdata = {
> -	MPP10_GPO,	/* HDD Power Enable */
> -	MPP11_GPIO,	/* USB Vbus Enable */
> -	MPP18_GPO,	/* FAN High Enable# */
> -	MPP19_GPO,	/* FAN Low Enable# */
> -	MPP36_GPIO,	/* Function Blue LED */
> -	MPP37_GPIO,	/* Alarm LED */
> -	MPP38_GPIO,	/* Info LED */
> -	MPP39_GPIO,	/* Power LED */
> -	MPP40_GPIO,	/* Fan Lock */
> -	MPP41_GPIO,	/* Function Button */
> -	MPP42_GPIO,	/* Power Switch */
> -	MPP43_GPIO,	/* Power Auto Switch */
> -	MPP48_GPIO,	/* Function Red LED */
> -	0
> -};
> -
>  #define LSXL_GPIO_FAN_HIGH	18
>  #define LSXL_GPIO_FAN_LOW	19
>  #define LSXL_GPIO_FAN_LOCK	40
> @@ -119,7 +101,6 @@ void __init lsxl_init(void)
>  	/*
>  	 * Basic setup. Needs to be called early.
>  	 */
> -	kirkwood_mpp_conf(lsxl_mpp_config);
> 
>  	/* usb and sata power on */
>  	gpio_set_value(LSXL_GPIO_USB_POWER, 1);
Michael Walle Oct. 28, 2012, 4:40 p.m. UTC | #2 
[This is also includes the annotations from my previous reply. I missed the 
mpp43<->mpp48 in my previous reply]

Am Mittwoch 24 Oktober 2012, 16:53:53 schrieb Andrew Lunn:
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi |   67
> ++++++++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/board-lsxl.c  | 
>  19 ----------
>  2 files changed, 67 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 8fea375..01d6e3a 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -6,6 +6,73 @@
>  	};
> 
>  	ocp@f1000000 {
> +		pinctrl: pinctrl@10000 {
> +			compatible = "marvell,88f6281-pinctrl";
> +			reg = <0x10000 0x20>;
> +
> +			pinctrl-0 = < &pmx_power_hdd &pmx_usb_vbus
> +				      &pmx_fan_low &pmx_fan_high
> +				      &pmx_led_function_red &pmx_led_alarm
> +				      &pmx_led_info &pmx_led_power
> +				      &pmx_fan_lock &pmx_button_function
> +				      &pmx_power_switch &pmx_power_auto_switch
> +				      &pmx_led_function_blue >;
> +			pinctrl-names = "default";
> +
> +			pmx_power_hdd: pmx-power-hdd {
> +				marvell,pins = "mpp10";
> +				marvell,function = "gpio";
gpo

> +			};
> +			pmx_usb_vbus: pmx-usb-vbus {
> +				marvell,pins = "mpp11";
> +				marvell,function = "gpio";
> +			};
> +			pmx_fan_high: pmx-fan-high {
> +				marvell,pins = "mpp18";
> +				marvell,function = "gpo";
> +			};
> +			pmx_fan_low: pmx-fan-low {
> +				marvell,pins = "mpp19";
> +				marvell,function = "gpo";
> +			};
> +			pmx_led_function_blue: pmx-led-function-blue {
> +				marvell,pins = "mpp36";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_alarm: pmx-led-alarm {
> +				marvell,pins = "mpp37";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_info: pmx-led-info {
> +				marvell,pins = "mpp38";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_power: pmx-led-power {
> +				marvell,pins = "mpp39";
> +				marvell,function = "gpio";
> +			};
> +			pmx_fan_lock: pmx-fan-lock {
> +				marvell,pins = "mpp40";
> +				marvell,function = "gpo";
gpio

> +			};
> +			pmx_button_function: pmx-button-function {
> +				marvell,pins = "mpp41";
> +				marvell,function = "gpio";
> +			};
> +			pmx_power_switch: pmx-power-switch {
> +				marvell,pins = "mpp42";
> +				marvell,function = "gpio";
> +			};
> +			pmx_power_auto_switch: pmx-power-auto-switch {
> +				marvell,pins = "mpp43";
> +				marvell,function = "gpio";
> +			};
> +			pmx_led_function_red: pmx-led-function_red {
> +				marvell,pins = "mpp43";
mpp48

> +				marvell,function = "gpio";
> +			};
> +
> +		};
>  		sata@80000 {
>  			status = "okay";
>  			nr-ports = <1>;
> diff --git a/arch/arm/mach-kirkwood/board-lsxl.c
> b/arch/arm/mach-kirkwood/board-lsxl.c index 83d8975..868bdb0 100644
> --- a/arch/arm/mach-kirkwood/board-lsxl.c
> +++ b/arch/arm/mach-kirkwood/board-lsxl.c
> @@ -26,7 +26,6 @@
>  #include <asm/mach/arch.h>
>  #include <mach/kirkwood.h>
>  #include "common.h"
> -#include "mpp.h"
> 
>  static struct mv643xx_eth_platform_data lsxl_ge00_data = {
>  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
> @@ -36,23 +35,6 @@ static struct mv643xx_eth_platform_data lsxl_ge01_data =
> { .phy_addr	= MV643XX_ETH_PHY_ADDR(8),
>  };
> 
> -static unsigned int lsxl_mpp_config[] __initdata = {
> -	MPP10_GPO,	/* HDD Power Enable */
> -	MPP11_GPIO,	/* USB Vbus Enable */
> -	MPP18_GPO,	/* FAN High Enable# */
> -	MPP19_GPO,	/* FAN Low Enable# */
> -	MPP36_GPIO,	/* Function Blue LED */
> -	MPP37_GPIO,	/* Alarm LED */
> -	MPP38_GPIO,	/* Info LED */
> -	MPP39_GPIO,	/* Power LED */
> -	MPP40_GPIO,	/* Fan Lock */
> -	MPP41_GPIO,	/* Function Button */
> -	MPP42_GPIO,	/* Power Switch */
> -	MPP43_GPIO,	/* Power Auto Switch */
> -	MPP48_GPIO,	/* Function Red LED */
> -	0
> -};
> -
>  #define LSXL_GPIO_FAN_HIGH	18
>  #define LSXL_GPIO_FAN_LOW	19
>  #define LSXL_GPIO_FAN_LOCK	40
> @@ -119,7 +101,6 @@ void __init lsxl_init(void)
>  	/*
>  	 * Basic setup. Needs to be called early.
>  	 */
> -	kirkwood_mpp_conf(lsxl_mpp_config);
> 
>  	/* usb and sata power on */
>  	gpio_set_value(LSXL_GPIO_USB_POWER, 1);
diff mbox

Patch

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 8fea375..01d6e3a 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -6,6 +6,73 @@ 
 	};
 
 	ocp@f1000000 {
+		pinctrl: pinctrl@10000 {
+			compatible = "marvell,88f6281-pinctrl";
+			reg = <0x10000 0x20>;
+
+			pinctrl-0 = < &pmx_power_hdd &pmx_usb_vbus
+				      &pmx_fan_low &pmx_fan_high
+				      &pmx_led_function_red &pmx_led_alarm
+				      &pmx_led_info &pmx_led_power
+				      &pmx_fan_lock &pmx_button_function
+				      &pmx_power_switch &pmx_power_auto_switch
+				      &pmx_led_function_blue >;
+			pinctrl-names = "default";
+
+			pmx_power_hdd: pmx-power-hdd {
+				marvell,pins = "mpp10";
+				marvell,function = "gpio";
+			};
+			pmx_usb_vbus: pmx-usb-vbus {
+				marvell,pins = "mpp11";
+				marvell,function = "gpio";
+			};
+			pmx_fan_high: pmx-fan-high {
+				marvell,pins = "mpp18";
+				marvell,function = "gpo";
+			};
+			pmx_fan_low: pmx-fan-low {
+				marvell,pins = "mpp19";
+				marvell,function = "gpo";
+			};
+			pmx_led_function_blue: pmx-led-function-blue {
+				marvell,pins = "mpp36";
+				marvell,function = "gpio";
+			};
+			pmx_led_alarm: pmx-led-alarm {
+				marvell,pins = "mpp37";
+				marvell,function = "gpio";
+			};
+			pmx_led_info: pmx-led-info {
+				marvell,pins = "mpp38";
+				marvell,function = "gpio";
+			};
+			pmx_led_power: pmx-led-power {
+				marvell,pins = "mpp39";
+				marvell,function = "gpio";
+			};
+			pmx_fan_lock: pmx-fan-lock {
+				marvell,pins = "mpp40";
+				marvell,function = "gpo";
+			};
+			pmx_button_function: pmx-button-function {
+				marvell,pins = "mpp41";
+				marvell,function = "gpio";
+			};
+			pmx_power_switch: pmx-power-switch {
+				marvell,pins = "mpp42";
+				marvell,function = "gpio";
+			};
+			pmx_power_auto_switch: pmx-power-auto-switch {
+				marvell,pins = "mpp43";
+				marvell,function = "gpio";
+			};
+			pmx_led_function_red: pmx-led-function_red {
+				marvell,pins = "mpp43";
+				marvell,function = "gpio";
+			};
+
+		};
 		sata@80000 {
 			status = "okay";
 			nr-ports = <1>;
diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c
index 83d8975..868bdb0 100644
--- a/arch/arm/mach-kirkwood/board-lsxl.c
+++ b/arch/arm/mach-kirkwood/board-lsxl.c
@@ -26,7 +26,6 @@ 
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data lsxl_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
@@ -36,23 +35,6 @@  static struct mv643xx_eth_platform_data lsxl_ge01_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
-static unsigned int lsxl_mpp_config[] __initdata = {
-	MPP10_GPO,	/* HDD Power Enable */
-	MPP11_GPIO,	/* USB Vbus Enable */
-	MPP18_GPO,	/* FAN High Enable# */
-	MPP19_GPO,	/* FAN Low Enable# */
-	MPP36_GPIO,	/* Function Blue LED */
-	MPP37_GPIO,	/* Alarm LED */
-	MPP38_GPIO,	/* Info LED */
-	MPP39_GPIO,	/* Power LED */
-	MPP40_GPIO,	/* Fan Lock */
-	MPP41_GPIO,	/* Function Button */
-	MPP42_GPIO,	/* Power Switch */
-	MPP43_GPIO,	/* Power Auto Switch */
-	MPP48_GPIO,	/* Function Red LED */
-	0
-};
-
 #define LSXL_GPIO_FAN_HIGH	18
 #define LSXL_GPIO_FAN_LOW	19
 #define LSXL_GPIO_FAN_LOCK	40
@@ -119,7 +101,6 @@  void __init lsxl_init(void)
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(lsxl_mpp_config);
 
 	/* usb and sata power on */
 	gpio_set_value(LSXL_GPIO_USB_POWER, 1);