projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-at91
/
pm.c
diff --git
a/arch/arm/mach-at91/pm.c
b/arch/arm/mach-at91/pm.c
index 9986542e8060119fcad4eee37564fdf3d8d164a6..590b52dea9f7a2c1da84440dd3c556ea06efcd8f 100644
(file)
--- a/
arch/arm/mach-at91/pm.c
+++ b/
arch/arm/mach-at91/pm.c
@@
-19,13
+19,13
@@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/io.h>
+#include <linux/clk/at91_pmc.h>
#include <asm/irq.h>
#include <linux/atomic.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
#include <asm/irq.h>
#include <linux/atomic.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
-#include <mach/at91_pmc.h>
#include <mach/cpu.h>
#include "at91_aic.h"
#include <mach/cpu.h>
#include "at91_aic.h"
@@
-155,9
+155,6
@@
static int at91_pm_verify_clocks(void)
}
}
}
}
- if (!IS_ENABLED(CONFIG_AT91_PROGRAMMABLE_CLOCKS))
- return 1;
-
/* PCK0..PCK3 must be disabled, or configured to use clk32k */
for (i = 0; i < 4; i++) {
u32 css;
/* PCK0..PCK3 must be disabled, or configured to use clk32k */
for (i = 0; i < 4; i++) {
u32 css;