From: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> To: linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Subject: [PATCH 2/3] ARM: Kirkwood: Convert DNSKW to use gpio-poweroff. Date: Sun, 11 Nov 2012 17:21:30 +0100 [thread overview] Message-ID: <1352650891-18356-3-git-send-email-andrew@lunn.ch> (raw) In-Reply-To: <1352650891-18356-1-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> Also enable the gpio-poweroff driver when DT is used. Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> Tested-by: Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org> --- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 5 +++++ arch/arm/mach-kirkwood/Kconfig | 1 + arch/arm/mach-kirkwood/board-dnskw.c | 12 ------------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 9b32d02..22aa07a 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi @@ -35,6 +35,11 @@ 6000 2>; }; + gpio_poweroff { + compatible = "gpio-poweroff"; + gpios = <&gpio1 4 0>; + }; + ocp@f1000000 { sata@80000 { status = "okay"; diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 50bca50..a0f4f47 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -47,6 +47,7 @@ config MACH_GURUPLUG config ARCH_KIRKWOOD_DT bool "Marvell Kirkwood Flattened Device Tree" select USE_OF + select GPIO_POWEROFF help Say 'Y' here if you want your kernel to support the Marvell Kirkwood using flattened device tree. diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c index 43d16d6..549369e 100644 --- a/arch/arm/mach-kirkwood/board-dnskw.c +++ b/arch/arm/mach-kirkwood/board-dnskw.c @@ -57,11 +57,6 @@ static unsigned int dnskw_mpp_config[] __initdata = { 0 }; -static void dnskw_power_off(void) -{ - gpio_set_value(36, 1); -} - /* Register any GPIO for output and set the value */ static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) { @@ -81,13 +76,6 @@ void __init dnskw_init(void) kirkwood_ehci_init(); kirkwood_ge00_init(&dnskw_ge00_data); - /* Register power-off GPIO. */ - if (gpio_request(36, "dnskw:power:off") == 0 - && gpio_direction_output(36, 0) == 0) - pm_power_off = dnskw_power_off; - else - pr_err("dnskw: failed to configure power-off GPIO\n"); - /* Ensure power is supplied to both HDDs */ dnskw_gpio_register(39, "dnskw:power:sata0", 1); dnskw_gpio_register(40, "dnskw:power:sata1", 1); -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: andrew@lunn.ch (Andrew Lunn) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: Kirkwood: Convert DNSKW to use gpio-poweroff. Date: Sun, 11 Nov 2012 17:21:30 +0100 [thread overview] Message-ID: <1352650891-18356-3-git-send-email-andrew@lunn.ch> (raw) In-Reply-To: <1352650891-18356-1-git-send-email-andrew@lunn.ch> Also enable the gpio-poweroff driver when DT is used. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jamie Lentin <jm@lentin.co.uk> --- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 5 +++++ arch/arm/mach-kirkwood/Kconfig | 1 + arch/arm/mach-kirkwood/board-dnskw.c | 12 ------------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 9b32d02..22aa07a 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi @@ -35,6 +35,11 @@ 6000 2>; }; + gpio_poweroff { + compatible = "gpio-poweroff"; + gpios = <&gpio1 4 0>; + }; + ocp at f1000000 { sata at 80000 { status = "okay"; diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 50bca50..a0f4f47 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -47,6 +47,7 @@ config MACH_GURUPLUG config ARCH_KIRKWOOD_DT bool "Marvell Kirkwood Flattened Device Tree" select USE_OF + select GPIO_POWEROFF help Say 'Y' here if you want your kernel to support the Marvell Kirkwood using flattened device tree. diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c index 43d16d6..549369e 100644 --- a/arch/arm/mach-kirkwood/board-dnskw.c +++ b/arch/arm/mach-kirkwood/board-dnskw.c @@ -57,11 +57,6 @@ static unsigned int dnskw_mpp_config[] __initdata = { 0 }; -static void dnskw_power_off(void) -{ - gpio_set_value(36, 1); -} - /* Register any GPIO for output and set the value */ static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) { @@ -81,13 +76,6 @@ void __init dnskw_init(void) kirkwood_ehci_init(); kirkwood_ge00_init(&dnskw_ge00_data); - /* Register power-off GPIO. */ - if (gpio_request(36, "dnskw:power:off") == 0 - && gpio_direction_output(36, 0) == 0) - pm_power_off = dnskw_power_off; - else - pr_err("dnskw: failed to configure power-off GPIO\n"); - /* Ensure power is supplied to both HDDs */ dnskw_gpio_register(39, "dnskw:power:sata0", 1); dnskw_gpio_register(40, "dnskw:power:sata1", 1); -- 1.7.10.4
next prev parent reply other threads:[~2012-11-11 16:21 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-11 16:21 [PATCH 0/3] GPIO driver to turn power off Andrew Lunn 2012-11-11 16:21 ` Andrew Lunn [not found] ` <1352650891-18356-1-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> 2012-11-11 16:21 ` [PATCH 1/3] gpio: Add simple poweroff-gpio driver Andrew Lunn 2012-11-11 16:21 ` Andrew Lunn [not found] ` <1352650891-18356-2-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> 2012-11-11 22:03 ` Stephen Warren 2012-11-11 22:03 ` Stephen Warren [not found] ` <50A020C5.4070506-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-11-12 8:25 ` Andrew Lunn 2012-11-12 8:25 ` Andrew Lunn [not found] ` <20121112082546.GU22029-g2DYL2Zd6BY@public.gmane.org> 2012-11-12 16:17 ` Stephen Warren 2012-11-12 16:17 ` Stephen Warren [not found] ` <50A1212C.2080601-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-11-12 18:19 ` Andrew Lunn 2012-11-12 18:19 ` Andrew Lunn [not found] ` <20121112181947.GS24583-g2DYL2Zd6BY@public.gmane.org> 2012-11-12 18:43 ` Anton Vorontsov 2012-11-12 18:43 ` Anton Vorontsov 2012-11-12 18:58 ` Stephen Warren 2012-11-12 18:58 ` Stephen Warren [not found] ` <50A146E7.2040608-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-11-12 19:17 ` Anton Vorontsov 2012-11-12 19:17 ` Anton Vorontsov 2012-11-15 10:35 ` Linus Walleij 2012-11-15 10:35 ` Linus Walleij [not found] ` <CACRpkdb=ra9NwqEneyMoM5YnOFTVQoBxPATjUN6anooXVLiCjw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 10:59 ` Anton Vorontsov 2012-11-15 10:59 ` Anton Vorontsov 2012-11-15 11:10 ` Linus Walleij 2012-11-15 11:10 ` Linus Walleij [not found] ` <CACRpkdZ_4C2XA1c2U_E8GnbfiXZk67MYR7JzgwXf1iVwHCde2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-21 13:17 ` Grant Likely 2012-11-21 13:17 ` Grant Likely 2012-11-15 18:00 ` Stephen Warren 2012-11-15 18:00 ` Stephen Warren 2012-11-12 1:00 ` Linus Walleij 2012-11-12 1:00 ` Linus Walleij [not found] ` <CACRpkdZvHBjFQTrQnxvc3WCOb2CqGbjYJxyQ5qQkSbU+UWHYZA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-12 1:12 ` Anton Vorontsov 2012-11-12 1:12 ` Anton Vorontsov 2012-11-12 6:07 ` Andrew Lunn 2012-11-12 6:07 ` Andrew Lunn [not found] ` <20121112060740.GR24583-g2DYL2Zd6BY@public.gmane.org> 2012-11-12 6:53 ` Anton Vorontsov 2012-11-12 6:53 ` Anton Vorontsov 2012-11-15 18:05 ` Grant Likely 2012-11-15 18:05 ` Grant Likely 2012-11-15 18:11 ` Jamie Lentin 2012-11-15 18:11 ` Jamie Lentin [not found] ` <alpine.DEB.2.00.1211151810050.25381-5X291BYdrx55rAo4AelP/Ydd74u8MsAO@public.gmane.org> 2012-11-15 18:21 ` Grant Likely 2012-11-15 18:21 ` Grant Likely [not found] ` <CACxGe6tgNVH9zeafMRKXcRUZmQjQXrAy_QtvhxpTT74200Hnxg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-21 13:20 ` Grant Likely 2012-11-21 13:20 ` Grant Likely 2012-11-11 16:21 ` Andrew Lunn [this message] 2012-11-11 16:21 ` [PATCH 2/3] ARM: Kirkwood: Convert DNSKW to use gpio-poweroff Andrew Lunn 2012-11-11 16:21 ` [PATCH 3/3] ARM: Kirkwood: Convert IB62x0 " Andrew Lunn 2012-11-11 16:21 ` Andrew Lunn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1352650891-18356-3-git-send-email-andrew@lunn.ch \ --to=andrew-g2dyl2zd6by@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \ --cc=jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org \ --cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.