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

Commit 423b8959 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: Convert LSXL to use regulators 



Control the power to USB and HDD using a fixed regulator.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 280b348d

arch/arm/boot/dts/kirkwood-lsxl.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -105,4 +105,33 @@ 
		                      5000 0>;

		alarm-gpios = <&gpio1 8 0>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		usb_power: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "USB Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio0 11 0>;

		};

		hdd_power: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "HDD Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio0 10 0>;

		};

	};

};

arch/arm/mach-kirkwood/board-lsxl.c

+0 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <linux/mv643xx_eth.h>

#include <linux/gpio.h>

#include "common.h"

#include "mpp.h"
@@ -61,9 +60,6 @@ static void lsxl_power_off(void) 
	kirkwood_restart('h', NULL);

}



#define LSXL_GPIO_HDD_POWER 10

#define LSXL_GPIO_USB_POWER 11



void __init lsxl_init(void)

{

	/*
@@ -71,10 +67,6 @@ void __init lsxl_init(void) 
	 */

	kirkwood_mpp_conf(lsxl_mpp_config);



	/* usb and sata power on */

	gpio_set_value(LSXL_GPIO_USB_POWER, 1);

	gpio_set_value(LSXL_GPIO_HDD_POWER, 1);



	kirkwood_ge00_init(&lsxl_ge00_data);

	kirkwood_ge01_init(&lsxl_ge01_data);