Commit 8758c885 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper

ARM: Kirkwood: Use fixed-regulator instead of board gpio call

With the change to a DT based pinctrl/gpio driver, using gpio API
calls in board-*.c files no longer works, a dereferenced NULL pointer
exception occurs instead. By converting the GPIO code into a
fixed-regulator which gets probed later once pinctrl/gpio is
available, we avoid the exception.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarStefan Peter <s.peter@mplch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d2268be3
...@@ -82,4 +82,21 @@ wifi2 { ...@@ -82,4 +82,21 @@ wifi2 {
gpios = <&gpio1 16 1>; gpios = <&gpio1 16 1>;
}; };
}; };
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
sata0_power: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "SATA0 Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 4 0>;
};
};
}; };
...@@ -64,8 +64,6 @@ static unsigned int topkick_mpp_config[] __initdata = { ...@@ -64,8 +64,6 @@ static unsigned int topkick_mpp_config[] __initdata = {
0 0
}; };
#define TOPKICK_SATA0_PWR_ENABLE 36
void __init usi_topkick_init(void) void __init usi_topkick_init(void)
{ {
/* /*
...@@ -73,8 +71,6 @@ void __init usi_topkick_init(void) ...@@ -73,8 +71,6 @@ void __init usi_topkick_init(void)
*/ */
kirkwood_mpp_conf(topkick_mpp_config); kirkwood_mpp_conf(topkick_mpp_config);
/* SATA0 power enable */
gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1);
kirkwood_ge00_init(&topkick_ge00_data); kirkwood_ge00_init(&topkick_ge00_data);
kirkwood_sdio_init(&topkick_mvsdio_data); kirkwood_sdio_init(&topkick_mvsdio_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment