From 85c4b31e6e462674a0392240e7e38ebe8bb22832 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 2 Dec 2014 12:08:27 +0100 Subject: ARM: at91: remove old AT91-specific drivers GPIO and LED drivers were replaced by generic ones for DT boards. These drivers were remaining: delete them now. Modifications are also done on the corresponding header files. Signed-off-by: Arnd Bergmann [nicolas.ferre@atmel.com: split patch] Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/pm.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'arch/arm/mach-at91/pm.c') diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index a42360f69127..9b15169a1c62 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -31,7 +31,6 @@ #include "generic.h" #include "pm.h" -#include "gpio.h" static void (*at91_pm_standby)(void); @@ -130,10 +129,7 @@ extern u32 at91_slow_clock_sz; static int at91_pm_enter(suspend_state_t state) { - if (of_have_populated_dt()) - at91_pinctrl_gpio_suspend(); - else - at91_gpio_suspend(); + at91_pinctrl_gpio_suspend(); switch (state) { /* @@ -201,10 +197,7 @@ static int at91_pm_enter(suspend_state_t state) error: target_state = PM_SUSPEND_ON; - if (of_have_populated_dt()) - at91_pinctrl_gpio_resume(); - else - at91_gpio_resume(); + at91_pinctrl_gpio_resume(); return 0; } -- cgit v1.2.3