From: Hans Verkuil <hans.verkuil@xxxxxxxxx> Final 18th patch series. Changes since v17: Split the rc patch into two: one adding the new RC CEC protocol support and one adding the rc-cec keymap. This rc-cec keymap is not included in this patch series since it depends on the new HID CEC key defines which will go through linux-input (patch series has been posted for that to linux-input). The rc-cec patch will be posted separately and merging it will have to be postponed until both this series and the linux-input changes are merged since it depends on both. The patch adding the HID CEC defines has been dropped from this patch series accordingly. Note: the patch adding BUS_CEC goes through both linux-input and linux-media as it is very unlikely this will cause a conflict. There are two more changes since v17: - The 'default n' line was dropped from the Kconfigs (as suggested by Mauro) since that's the default anyway. - Fixed two compiler warnings in s5p-cec that I missed. This is the change for that: --- a/drivers/media/platform/s5p-cec/s5p_cec.c +++ b/drivers/media/platform/s5p-cec/s5p_cec.c @@ -180,12 +180,12 @@ static int s5p_cec_probe(struct platform_device *pdev) cec->dev = dev; cec->irq = platform_get_irq(pdev, 0); - if (IS_ERR_VALUE(cec->irq)) + if (cec->irq < 0) return cec->irq; ret = devm_request_threaded_irq(dev, cec->irq, s5p_cec_irq_handler, s5p_cec_irq_handler_thread, 0, pdev->name, cec); - if (IS_ERR_VALUE(ret)) + if (ret) return ret; cec->clk = devm_clk_get(dev, "hdmicec"); Regards, Hans Hans Verkuil (13): input.h: add BUS_CEC type cec.txt: add CEC framework documentation DocBook/media: add CEC documentation cec-edid: add module for EDID CEC helper functions cec.h: add cec header cec-funcs.h: static inlines to pack/unpack CEC messages cec: add HDMI CEC framework cec/TODO: add TODO file so we know why this is still in staging cec: add compat32 ioctl support cec: adv7604: add cec support. cec: adv7842: add cec support cec: adv7511: add cec support. vivid: add CEC emulation Kamil Debski (2): rc: Add HDMI CEC protocol handling cec: s5p-cec: Add s5p-cec driver Documentation/DocBook/device-drivers.tmpl | 3 + Documentation/DocBook/media/Makefile | 2 + Documentation/DocBook/media/v4l/biblio.xml | 10 + Documentation/DocBook/media/v4l/cec-api.xml | 75 + Documentation/DocBook/media/v4l/cec-func-close.xml | 64 + Documentation/DocBook/media/v4l/cec-func-ioctl.xml | 78 + Documentation/DocBook/media/v4l/cec-func-open.xml | 104 + Documentation/DocBook/media/v4l/cec-func-poll.xml | 94 + .../DocBook/media/v4l/cec-ioc-adap-g-caps.xml | 151 ++ .../DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml | 329 +++ .../DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml | 86 + .../DocBook/media/v4l/cec-ioc-dqevent.xml | 195 ++ Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml | 255 ++ .../DocBook/media/v4l/cec-ioc-receive.xml | 265 +++ Documentation/DocBook/media_api.tmpl | 6 +- Documentation/cec.txt | 267 +++ .../devicetree/bindings/media/s5p-cec.txt | 31 + Documentation/video4linux/vivid.txt | 36 +- MAINTAINERS | 23 + drivers/media/Kconfig | 3 + drivers/media/Makefile | 2 + drivers/media/cec-edid.c | 139 ++ drivers/media/i2c/Kconfig | 24 + drivers/media/i2c/adv7511.c | 401 +++- drivers/media/i2c/adv7604.c | 332 ++- drivers/media/i2c/adv7842.c | 368 ++- drivers/media/platform/Kconfig | 10 + drivers/media/platform/Makefile | 1 + drivers/media/platform/s5p-cec/Makefile | 2 + drivers/media/platform/s5p-cec/exynos_hdmi_cec.h | 38 + .../media/platform/s5p-cec/exynos_hdmi_cecctrl.c | 209 ++ drivers/media/platform/s5p-cec/regs-cec.h | 96 + drivers/media/platform/s5p-cec/s5p_cec.c | 295 +++ drivers/media/platform/s5p-cec/s5p_cec.h | 76 + drivers/media/platform/vivid/Kconfig | 8 + drivers/media/platform/vivid/Makefile | 4 + drivers/media/platform/vivid/vivid-cec.c | 255 ++ drivers/media/platform/vivid/vivid-cec.h | 33 + drivers/media/platform/vivid/vivid-core.c | 118 +- drivers/media/platform/vivid/vivid-core.h | 27 + drivers/media/platform/vivid/vivid-kthread-cap.c | 13 + drivers/media/platform/vivid/vivid-vid-cap.c | 23 +- drivers/media/platform/vivid/vivid-vid-common.c | 7 + drivers/media/rc/rc-main.c | 1 + drivers/staging/media/Kconfig | 2 + drivers/staging/media/Makefile | 1 + drivers/staging/media/cec/Kconfig | 8 + drivers/staging/media/cec/Makefile | 1 + drivers/staging/media/cec/TODO | 23 + drivers/staging/media/cec/cec.c | 2512 ++++++++++++++++++++ fs/compat_ioctl.c | 12 + include/linux/cec-funcs.h | 1875 +++++++++++++++ include/linux/cec.h | 987 ++++++++ include/media/cec-edid.h | 104 + include/media/cec.h | 236 ++ include/media/i2c/adv7511.h | 6 +- include/media/rc-map.h | 5 +- include/uapi/linux/input.h | 1 + 58 files changed, 10203 insertions(+), 129 deletions(-) create mode 100644 Documentation/DocBook/media/v4l/cec-api.xml create mode 100644 Documentation/DocBook/media/v4l/cec-func-close.xml create mode 100644 Documentation/DocBook/media/v4l/cec-func-ioctl.xml create mode 100644 Documentation/DocBook/media/v4l/cec-func-open.xml create mode 100644 Documentation/DocBook/media/v4l/cec-func-poll.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-dqevent.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-receive.xml create mode 100644 Documentation/cec.txt create mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt create mode 100644 drivers/media/cec-edid.c create mode 100644 drivers/media/platform/s5p-cec/Makefile create mode 100644 drivers/media/platform/s5p-cec/exynos_hdmi_cec.h create mode 100644 drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c create mode 100644 drivers/media/platform/s5p-cec/regs-cec.h create mode 100644 drivers/media/platform/s5p-cec/s5p_cec.c create mode 100644 drivers/media/platform/s5p-cec/s5p_cec.h create mode 100644 drivers/media/platform/vivid/vivid-cec.c create mode 100644 drivers/media/platform/vivid/vivid-cec.h create mode 100644 drivers/staging/media/cec/Kconfig create mode 100644 drivers/staging/media/cec/Makefile create mode 100644 drivers/staging/media/cec/TODO create mode 100644 drivers/staging/media/cec/cec.c create mode 100644 include/linux/cec-funcs.h create mode 100644 include/linux/cec.h create mode 100644 include/media/cec-edid.h create mode 100644 include/media/cec.h -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
