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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
board-mackerel.c
diff --git
a/arch/arm/mach-shmobile/board-mackerel.c
b/arch/arm/mach-shmobile/board-mackerel.c
index 3802f2afabef28f320b52fdb7a238b5306a07585..d41c01f83f152f75589cc228a186a6f98da59a5e 100644
(file)
--- a/
arch/arm/mach-shmobile/board-mackerel.c
+++ b/
arch/arm/mach-shmobile/board-mackerel.c
@@
-1192,8
+1192,8
@@
static struct platform_device sh_mmcif_device = {
};
};
-static int mackerel_camera_add(struct soc_camera_
link *icl, struct device *dev
);
-static void mackerel_camera_del(struct soc_camera_
link *icl
);
+static int mackerel_camera_add(struct soc_camera_
device *icd
);
+static void mackerel_camera_del(struct soc_camera_
device *icd
);
static int camera_set_capture(struct soc_camera_platform_info *info,
int enable)
static int camera_set_capture(struct soc_camera_platform_info *info,
int enable)
@@
-1232,16
+1232,15
@@
static void mackerel_camera_release(struct device *dev)
soc_camera_platform_release(&camera_device);
}
soc_camera_platform_release(&camera_device);
}
-static int mackerel_camera_add(struct soc_camera_link *icl,
- struct device *dev)
+static int mackerel_camera_add(struct soc_camera_device *icd)
{
{
- return soc_camera_platform_add(ic
l, dev
, &camera_device, &camera_link,
+ return soc_camera_platform_add(ic
d
, &camera_device, &camera_link,
mackerel_camera_release, 0);
}
mackerel_camera_release, 0);
}
-static void mackerel_camera_del(struct soc_camera_
link *icl
)
+static void mackerel_camera_del(struct soc_camera_
device *icd
)
{
{
- soc_camera_platform_del(ic
l
, camera_device, &camera_link);
+ soc_camera_platform_del(ic
d
, camera_device, &camera_link);
}
static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
}
static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
@@
-1582,8
+1581,13
@@
static void __init mackerel_init(void)
platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
+ sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
+ sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
+ sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
+
hdmi_init_pm_clock();
sh7372_pm_init();
hdmi_init_pm_clock();
sh7372_pm_init();
+ pm_clk_add(&fsi_device.dev, "spu2");
}
static void __init mackerel_timer_init(void)
}
static void __init mackerel_timer_init(void)