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

Commit 280b348d authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: Convert GoFlexNet to use regulators 



Control the power to USB using a fixed regulator.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJosh Coombs <josh.coombs@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c3ff813a

arch/arm/boot/dts/kirkwood-goflexnet.dts

+17 −0
Original line number Diff line number Diff line
@@ -96,4 +96,21 @@ 
			gpios = <&gpio1 9 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 29 0>;

		};

	};

};

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

+0 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/gpio.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -62,9 +61,5 @@ void __init goflexnet_init(void) 
	 */

	kirkwood_mpp_conf(goflexnet_mpp_config);



	if (gpio_request(29, "USB Power Enable") != 0 ||

	    gpio_direction_output(29, 1) != 0)

		pr_err("can't setup GPIO 29 (USB Power Enable)\n");



	kirkwood_ge00_init(&goflexnet_ge00_data);

}