* [GIT PULL for 4.15 v2] Atomisp cleanups, fixes
@ 2017-10-19 15:21 Sakari Ailus
2017-10-27 14:25 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 3+ messages in thread
From: Sakari Ailus @ 2017-10-19 15:21 UTC (permalink / raw)
To: linux-media
Hi Mauro,
Here's the second version of the atomisp pull request. Since v1, I've added
more patches, including an oops fix from Hans de Goede and move to
timer_setup from Kees Cook. Also Andy's patches to clean up the driver are
in, as well as my patches to rename the atomisp specific drivers (modules
as well as Kconfig options).
Please pull.
The following changes since commit 8382e556b1a2f30c4bf866f021b33577a64f9ebf:
Simplify major/minor non-dynamic logic (2017-10-11 15:32:11 -0400)
are available in the git repository at:
ssh://linuxtv.org/git/sailus/media_tree.git atomisp
for you to fetch changes up to 4fd00aa61cb07724ea07759467deab5713efda8b:
staging: atomisp: Remove FSF snail address (2017-10-19 18:04:53 +0300)
----------------------------------------------------------------
Aishwarya Pant (2):
staging: atomisp2: cleanup null check on memory allocation
staging: atomisp: cleanup out of memory messages
Andy Shevchenko (13):
staging: atomisp: Remove IMX sensor support
staging: atomisp: Remove AP1302 sensor support
staging: atomisp: Use module_i2c_driver() macro
staging: atomisp: Switch i2c drivers to use ->probe_new()
staging: atomisp: Do not set GPIO twice
staging: atomisp: Remove unneeded gpio.h inclusion
staging: atomisp: Remove ->gpio_ctrl() callback
staging: atomisp: Remove ->power_ctrl() callback
staging: atomisp: Remove duplicate declaration in header
staging: atomisp: Remove unused members of camera_sensor_platform_data
staging: atomisp: Remove Gmin dead code #1
staging: atomisp: Remove Gmin dead code #2
staging: atomisp: Remove FSF snail address
Hans de Goede (1):
staging: media: atomisp: Fix oops by unbalanced clk enable/disable call
Jérémy Lefaure (1):
staging: atomisp: use ARRAY_SIZE
Kees Cook (1):
staging: atomisp: Convert timers to use timer_setup()
Muhammad Falak R Wani (1):
staging/atomisp: make six local functions static to appease sparse
Sakari Ailus (3):
staging: media: MAINTAINERS: Add entry for atomisp driver
staging: atomisp: Add driver prefix to Kconfig option and module names
staging: atomisp: Update TODO regarding sensors
Srishti Sharma (1):
Staging: media: atomisp: pci: Eliminate use of typedefs for struct
MAINTAINERS | 7 +
drivers/staging/media/atomisp/TODO | 22 +-
drivers/staging/media/atomisp/i2c/Kconfig | 38 +-
drivers/staging/media/atomisp/i2c/Makefile | 19 +-
drivers/staging/media/atomisp/i2c/ap1302.c | 1255 --------
drivers/staging/media/atomisp/i2c/ap1302.h | 198 --
.../atomisp/i2c/{gc0310.c => atomisp-gc0310.c} | 53 +-
.../atomisp/i2c/{gc2235.c => atomisp-gc2235.c} | 54 +-
...bmsrlisthelper.c => atomisp-libmsrlisthelper.c} | 4 -
.../atomisp/i2c/{lm3554.c => atomisp-lm3554.c} | 39 +-
.../atomisp/i2c/{mt9m114.c => atomisp-mt9m114.c} | 51 +-
.../atomisp/i2c/{ov2680.c => atomisp-ov2680.c} | 43 +-
.../atomisp/i2c/{ov2722.c => atomisp-ov2722.c} | 54 +-
drivers/staging/media/atomisp/i2c/gc0310.h | 11 -
drivers/staging/media/atomisp/i2c/gc2235.h | 7 -
drivers/staging/media/atomisp/i2c/imx/Kconfig | 9 -
drivers/staging/media/atomisp/i2c/imx/Makefile | 13 -
drivers/staging/media/atomisp/i2c/imx/ad5816g.c | 216 --
drivers/staging/media/atomisp/i2c/imx/ad5816g.h | 49 -
drivers/staging/media/atomisp/i2c/imx/common.h | 65 -
drivers/staging/media/atomisp/i2c/imx/drv201.c | 208 --
drivers/staging/media/atomisp/i2c/imx/drv201.h | 38 -
drivers/staging/media/atomisp/i2c/imx/dw9714.c | 222 --
drivers/staging/media/atomisp/i2c/imx/dw9714.h | 63 -
drivers/staging/media/atomisp/i2c/imx/dw9718.c | 233 --
drivers/staging/media/atomisp/i2c/imx/dw9718.h | 64 -
drivers/staging/media/atomisp/i2c/imx/dw9719.c | 198 --
drivers/staging/media/atomisp/i2c/imx/dw9719.h | 58 -
drivers/staging/media/atomisp/i2c/imx/imx.c | 2479 --------------
drivers/staging/media/atomisp/i2c/imx/imx.h | 737 -----
drivers/staging/media/atomisp/i2c/imx/imx132.h | 566 ----
drivers/staging/media/atomisp/i2c/imx/imx134.h | 2464 --------------
drivers/staging/media/atomisp/i2c/imx/imx135.h | 3374 --------------------
drivers/staging/media/atomisp/i2c/imx/imx175.h | 1959 ------------
drivers/staging/media/atomisp/i2c/imx/imx208.h | 550 ----
drivers/staging/media/atomisp/i2c/imx/imx219.h | 227 --
drivers/staging/media/atomisp/i2c/imx/imx227.h | 726 -----
drivers/staging/media/atomisp/i2c/imx/otp.c | 39 -
.../media/atomisp/i2c/imx/otp_brcc064_e2prom.c | 80 -
drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c | 89 -
drivers/staging/media/atomisp/i2c/imx/otp_imx.c | 190 --
drivers/staging/media/atomisp/i2c/imx/vcm.c | 45 -
drivers/staging/media/atomisp/i2c/mt9m114.h | 9 -
drivers/staging/media/atomisp/i2c/ov2680.h | 14 -
drivers/staging/media/atomisp/i2c/ov2722.h | 11 -
drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 4 +-
drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 +-
drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 4 -
.../i2c/ov5693/{ov5693.c => atomisp-ov5693.c} | 44 +-
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 11 -
drivers/staging/media/atomisp/i2c/ov8858.c | 65 +-
drivers/staging/media/atomisp/i2c/ov8858.h | 5 -
drivers/staging/media/atomisp/i2c/ov8858_btns.h | 5 -
.../staging/media/atomisp/include/linux/atomisp.h | 4 -
.../atomisp/include/linux/atomisp_gmin_platform.h | 3 -
.../media/atomisp/include/linux/atomisp_platform.h | 25 +-
.../media/atomisp/include/linux/libmsrlisthelper.h | 4 -
.../staging/media/atomisp/include/media/lm3554.h | 5 -
.../staging/media/atomisp/include/media/lm3642.h | 153 -
.../media/atomisp/pci/atomisp2/atomisp-regs.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_acc.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_acc.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_cmd.c | 17 +-
.../media/atomisp/pci/atomisp2/atomisp_cmd.h | 10 +-
.../media/atomisp/pci/atomisp2/atomisp_common.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_compat.h | 4 -
.../atomisp/pci/atomisp2/atomisp_compat_css20.c | 6 +-
.../atomisp/pci/atomisp2/atomisp_compat_css20.h | 4 -
.../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 4 -
.../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_csi2.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_csi2.h | 4 -
.../atomisp/pci/atomisp2/atomisp_dfs_tables.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_file.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_file.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_fops.c | 8 +-
.../media/atomisp/pci/atomisp2/atomisp_fops.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_helper.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_internal.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 13 +-
.../media/atomisp/pci/atomisp2/atomisp_ioctl.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_subdev.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_subdev.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_tables.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_tpg.c | 4 -
.../media/atomisp/pci/atomisp2/atomisp_tpg.h | 4 -
.../atomisp/pci/atomisp2/atomisp_trace_event.h | 4 -
.../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 28 +-
.../media/atomisp/pci/atomisp2/atomisp_v4l2.h | 4 -
.../css2400/camera/pipe/src/pipe_binarydesc.c | 9 +-
.../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 6 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c | 36 +-
.../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 7 +-
.../pci/atomisp2/css2400/sh_css_param_shading.c | 4 +-
.../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 4 -
.../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 28 +-
.../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 10 +-
.../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 9 +-
.../media/atomisp/pci/atomisp2/hmm/hmm_vm.c | 8 +-
.../atomisp2/hrt/hive_isp_css_custom_host_hrt.h | 4 -
.../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 4 -
.../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 4 -
.../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 4 -
.../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 4 -
.../atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h | 4 -
.../atomisp/pci/atomisp2/include/hmm/hmm_common.h | 4 -
.../atomisp/pci/atomisp2/include/hmm/hmm_pool.h | 4 -
.../atomisp/pci/atomisp2/include/hmm/hmm_vm.h | 4 -
.../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 4 -
.../atomisp/pci/atomisp2/include/mmu/sh_mmu.h | 4 -
.../pci/atomisp2/include/mmu/sh_mmu_mrfld.h | 4 -
.../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 4 -
.../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 4 -
.../platform/intel-mid/atomisp_gmin_platform.c | 59 +-
116 files changed, 166 insertions(+), 17440 deletions(-)
delete mode 100644 drivers/staging/media/atomisp/i2c/ap1302.c
delete mode 100644 drivers/staging/media/atomisp/i2c/ap1302.h
rename drivers/staging/media/atomisp/i2c/{gc0310.c => atomisp-gc0310.c} (96%)
rename drivers/staging/media/atomisp/i2c/{gc2235.c => atomisp-gc2235.c} (95%)
rename drivers/staging/media/atomisp/i2c/{libmsrlisthelper.c => atomisp-libmsrlisthelper.c} (96%)
rename drivers/staging/media/atomisp/i2c/{lm3554.c => atomisp-lm3554.c} (96%)
rename drivers/staging/media/atomisp/i2c/{mt9m114.c => atomisp-mt9m114.c} (97%)
rename drivers/staging/media/atomisp/i2c/{ov2680.c => atomisp-ov2680.c} (97%)
rename drivers/staging/media/atomisp/i2c/{ov2722.c => atomisp-ov2722.c} (96%)
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/Kconfig
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/Makefile
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/common.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx132.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx134.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx135.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx175.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx208.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx219.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx227.h
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_brcc064_e2prom.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_imx.c
delete mode 100644 drivers/staging/media/atomisp/i2c/imx/vcm.c
rename drivers/staging/media/atomisp/i2c/ov5693/{ov5693.c => atomisp-ov5693.c} (97%)
delete mode 100644 drivers/staging/media/atomisp/include/media/lm3642.h
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL for 4.15 v2] Atomisp cleanups, fixes
2017-10-19 15:21 [GIT PULL for 4.15 v2] Atomisp cleanups, fixes Sakari Ailus
@ 2017-10-27 14:25 ` Mauro Carvalho Chehab
2017-10-27 14:47 ` Sakari Ailus
0 siblings, 1 reply; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2017-10-27 14:25 UTC (permalink / raw)
To: Sakari Ailus; +Cc: linux-media
Em Thu, 19 Oct 2017 18:21:20 +0300
Sakari Ailus <sakari.ailus@iki.fi> escreveu:
> Hi Mauro,
>
> Here's the second version of the atomisp pull request. Since v1, I've added
> more patches, including an oops fix from Hans de Goede and move to
> timer_setup from Kees Cook. Also Andy's patches to clean up the driver are
> in, as well as my patches to rename the atomisp specific drivers (modules
> as well as Kconfig options).
>
> Please pull.
Could you please rebase it on the top of the master branch? This series
conflicts with another series you sent renaming atomisp files.
Thanks!
Mauro
---
diff --cc drivers/staging/media/atomisp/i2c/Kconfig
index 09b1a97ce560,db054d3c7ed6..000000000000
--- a/drivers/staging/media/atomisp/i2c/Kconfig
+++ b/drivers/staging/media/atomisp/i2c/Kconfig
@@@ -59,20 -62,9 +62,24 @@@ config VIDEO_ATOMISP_MT9M11
It currently only works with the atomisp driver.
++<<<<<<< HEAD
+config VIDEO_ATOMISP_AP1302
+ tristate "AP1302 external ISP support"
+ depends on I2C && VIDEO_V4L2
+ select REGMAP_I2C
+ ---help---
+ This is a Video4Linux2 sensor-level driver for the external
+ ISP AP1302.
+
+ AP1302 is an exteral ISP.
+
+ It currently only works with the atomisp driver.
+
++=======
++>>>>>>> 5cde6c6d85b7d9fbf05bb34cebb094ab9e4954a0
config VIDEO_ATOMISP_GC0310
tristate "GC0310 sensor support"
+ depends on ACPI
depends on I2C && VIDEO_V4L2
---help---
This is a Video4Linux2 sensor-level driver for the Galaxycore
diff --cc drivers/staging/media/atomisp/i2c/Makefile
index 3d27c75f5fc5,ae43dc84c229..000000000000
--- a/drivers/staging/media/atomisp/i2c/Makefile
+++ b/drivers/staging/media/atomisp/i2c/Makefile
@@@ -2,7 -2,6 +2,10 @@@
# Makefile for sensor drivers
#
++<<<<<<< HEAD
+obj-$(CONFIG_VIDEO_ATOMISP_IMX) += imx/
++=======
++>>>>>>> 5cde6c6d85b7d9fbf05bb34cebb094ab9e4954a0
obj-$(CONFIG_VIDEO_ATOMISP_OV5693) += ov5693/
obj-$(CONFIG_VIDEO_ATOMISP_MT9M114) += atomisp-mt9m114.o
obj-$(CONFIG_VIDEO_ATOMISP_GC2235) += atomisp-gc2235.o
@@@ -11,8 -10,6 +14,11 @@@ obj-$(CONFIG_VIDEO_ATOMISP_OV2680)
obj-$(CONFIG_VIDEO_ATOMISP_GC0310) += atomisp-gc0310.o
obj-$(CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER) += atomisp-libmsrlisthelper.o
++<<<<<<< HEAD
+
+obj-$(CONFIG_VIDEO_ATOMISP_AP1302) += atomisp-ap1302.o
++=======
++>>>>>>> 5cde6c6d85b7d9fbf05bb34cebb094ab9e4954a0
# Makefile for flash drivers
#
* Unmerged path drivers/staging/media/atomisp/i2c/atomisp-ap1302.c
* Unmerged path drivers/staging/media/atomisp/i2c/imx/Kconfig
* Unmerged path drivers/staging/media/atomisp/i2c/imx/Makefile
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL for 4.15 v2] Atomisp cleanups, fixes
2017-10-27 14:25 ` Mauro Carvalho Chehab
@ 2017-10-27 14:47 ` Sakari Ailus
0 siblings, 0 replies; 3+ messages in thread
From: Sakari Ailus @ 2017-10-27 14:47 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media
Hi Mauro,
On Fri, Oct 27, 2017 at 04:25:08PM +0200, Mauro Carvalho Chehab wrote:
> Em Thu, 19 Oct 2017 18:21:20 +0300
> Sakari Ailus <sakari.ailus@iki.fi> escreveu:
>
> > Hi Mauro,
> >
> > Here's the second version of the atomisp pull request. Since v1, I've added
> > more patches, including an oops fix from Hans de Goede and move to
> > timer_setup from Kees Cook. Also Andy's patches to clean up the driver are
> > in, as well as my patches to rename the atomisp specific drivers (modules
> > as well as Kconfig options).
> >
> > Please pull.
>
> Could you please rebase it on the top of the master branch? This series
> conflicts with another series you sent renaming atomisp files.
Ack, I will. Could you first pull this, so we get the fixes in? Then I can
proceed with more cleanups.
<URL:https://patchwork.linuxtv.org/patch/45157/>
--
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-27 14:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-19 15:21 [GIT PULL for 4.15 v2] Atomisp cleanups, fixes Sakari Ailus
2017-10-27 14:25 ` Mauro Carvalho Chehab
2017-10-27 14:47 ` Sakari Ailus
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.