diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-03-31 20:31:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-04 19:53:56 -0300 |
| commit | b3d8b559b1ce3b2d85ac57bbccbd38f25e3cc5db (patch) | |
| tree | 8f258fb7eb33b328d1c6988970293418310a6a39 /drivers/media/platform/exynos4-is/fimc-reg.c | |
| parent | 474c890d67ca5a16817deb4c5b6b8c600d8dd247 (diff) | |
| download | kernel_goldelico_gta04-b3d8b559b1ce3b2d85ac57bbccbd38f25e3cc5db.zip kernel_goldelico_gta04-b3d8b559b1ce3b2d85ac57bbccbd38f25e3cc5db.tar.gz kernel_goldelico_gta04-b3d8b559b1ce3b2d85ac57bbccbd38f25e3cc5db.tar.bz2 | |
[media] exynos4-is: Remove dependency on SYSCON for non-dt platforms
Currently the whole driver depends on MFD_SYSCON, which in turn
depends on OF. To allow to use the driver on non-dt platforms
(S5PV210) the SYSREG support is made conditional (it is needed
only for dt enabled platforms) and MFD_SYSCON is selected if
OF is enabled, instead of depending on OF.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-reg.c')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-reg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/exynos4-is/fimc-reg.c index c276eb8..c82e9bd 100644 --- a/drivers/media/platform/exynos4-is/fimc-reg.c +++ b/drivers/media/platform/exynos4-is/fimc-reg.c @@ -805,6 +805,9 @@ int fimc_hw_camblk_cfg_writeback(struct fimc_dev *fimc) unsigned int mask, val, camblk_cfg; int ret; + if (map == NULL) + return 0; + ret = regmap_read(map, SYSREG_CAMBLK, &camblk_cfg); if (ret < 0 || ((camblk_cfg & 0x00700000) >> 20 != 0x3)) return ret; |