FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 09:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Andrew Lunn <andrew@lunn.ch>
Tested-by: Stefan Peter <s.peter@mplch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Andrew Lunn 2013-01-06 11:10:38 +01:00 committed by Jason Cooper
parent d2268be3dc
commit 8758c885c4
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/boot/dts/kirkwood-topkick.dts
View File

@ -82,4 +82,21 @@
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>;
};
};
}; };

4
arch/arm/mach-kirkwood/board-usi_topkick.c
View File

@ -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)
*/ */
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);