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 branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
setup-sh7372.c
diff --git
a/arch/arm/mach-shmobile/setup-sh7372.c
b/arch/arm/mach-shmobile/setup-sh7372.c
index 9cdfcdfd38fc4b6625a96f1515e7ce0e9834f988..d646c8d12423a600332f5e5876f75445426fdca3 100644
(file)
--- a/
arch/arm/mach-shmobile/setup-sh7372.c
+++ b/
arch/arm/mach-shmobile/setup-sh7372.c
@@
-41,6
+41,7
@@
#include "common.h"
#include "dma-register.h"
#include "common.h"
#include "dma-register.h"
+#include "intc.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh7372.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh7372.h"
@@
-927,7
+928,7
@@
static struct platform_device *sh7372_late_devices[] __initdata = {
void __init sh7372_add_standard_devices(void)
{
void __init sh7372_add_standard_devices(void)
{
- st
ruct pm_domain_device domain_devices[]
= {
+ st
atic struct pm_domain_device domain_devices[] __initdata
= {
{ "A3RV", &vpu_device, },
{ "A4MP", &spu0_device, },
{ "A4MP", &spu1_device, },
{ "A3RV", &vpu_device, },
{ "A4MP", &spu0_device, },
{ "A4MP", &spu1_device, },
@@
-984,7
+985,7
@@
void __init sh7372_add_early_devices(void)
void __init sh7372_add_early_devices_dt(void)
{
void __init sh7372_add_early_devices_dt(void)
{
- shmobile_
setup_delay(800, 1, 3); /* Cortex-A8 @ 800MHz */
+ shmobile_
init_delay();
sh7372_add_early_devices();
}
sh7372_add_early_devices();
}
@@
-1008,7
+1009,6
@@
static const char *sh7372_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)")
.map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices_dt,
DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)")
.map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices_dt,
- .nr_irqs = NR_IRQS_LEGACY,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = sh7372_add_standard_devices_dt,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = sh7372_add_standard_devices_dt,