| Message ID | 1483366747-34288-5-git-send-email-hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
On Mon, Jan 02, 2017 at 03:19:07PM +0100, Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@cisco.com> > > By using the HPD notifier framework there is no longer any reason > to manually set the physical address. This was the one blocking > issue that prevented this driver from going out of staging, so do > this move as well. > > Update the bindings documenting the new hdmi phandle and > update exynos4.dtsi accordingly. > > Tested with my Odroid U3. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > .../devicetree/bindings/media/s5p-cec.txt | 2 ++ > arch/arm/boot/dts/exynos4.dtsi | 1 + > drivers/media/platform/Kconfig | 18 +++++++++++ > drivers/media/platform/Makefile | 1 + > .../media => media/platform}/s5p-cec/Makefile | 0 > .../platform}/s5p-cec/exynos_hdmi_cec.h | 0 > .../platform}/s5p-cec/exynos_hdmi_cecctrl.c | 0 > .../media => media/platform}/s5p-cec/regs-cec.h | 0 > .../media => media/platform}/s5p-cec/s5p_cec.c | 35 ++++++++++++++++++---- > .../media => media/platform}/s5p-cec/s5p_cec.h | 3 ++ > drivers/staging/media/Kconfig | 2 -- > drivers/staging/media/Makefile | 1 - > drivers/staging/media/s5p-cec/Kconfig | 9 ------ > drivers/staging/media/s5p-cec/TODO | 7 ----- > 14 files changed, 55 insertions(+), 24 deletions(-) > rename drivers/{staging/media => media/platform}/s5p-cec/Makefile (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cec.h (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cecctrl.c (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/regs-cec.h (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.c (89%) > rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.h (97%) > delete mode 100644 drivers/staging/media/s5p-cec/Kconfig > delete mode 100644 drivers/staging/media/s5p-cec/TODO > > diff --git a/Documentation/devicetree/bindings/media/s5p-cec.txt b/Documentation/devicetree/bindings/media/s5p-cec.txt > index 925ab4d..710fc00 100644 > --- a/Documentation/devicetree/bindings/media/s5p-cec.txt > +++ b/Documentation/devicetree/bindings/media/s5p-cec.txt > @@ -15,6 +15,7 @@ Required properties: > - clock-names : from common clock binding: must contain "hdmicec", > corresponding to entry in the clocks property. > - samsung,syscon-phandle - phandle to the PMU system controller > + - samsung,hdmi-phandle - phandle to the HDMI controller > > Example: > > @@ -25,6 +26,7 @@ hdmicec: cec@100B0000 { > clocks = <&clock CLK_HDMI_CEC>; > clock-names = "hdmicec"; > samsung,syscon-phandle = <&pmu_system_controller>; > + samsung,hdmi-phandle = <&hdmi>; > pinctrl-names = "default"; > pinctrl-0 = <&hdmi_cec>; > status = "okay"; > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index c64737b..51dfcbb 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -762,6 +762,7 @@ > clocks = <&clock CLK_HDMI_CEC>; > clock-names = "hdmicec"; > samsung,syscon-phandle = <&pmu_system_controller>; > + samsung,hdmi-phandle = <&hdmi>; > pinctrl-names = "default"; > pinctrl-0 = <&hdmi_cec>; > status = "disabled"; DTS change has to be a separate patch. It should also go through arm-soc/samsung-soc tree. If it is a dependency, then I could provide a tag with it. Best regards, Krzysztof > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index d944421..cab1637 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -392,6 +392,24 @@ config VIDEO_TI_SC > config VIDEO_TI_CSC > tristate > > +menuconfig V4L_CEC_DRIVERS > + bool "Platform HDMI CEC drivers" > + depends on MEDIA_CEC_SUPPORT > + > +if V4L_CEC_DRIVERS > + > +config VIDEO_SAMSUNG_S5P_CEC > + tristate "Samsung S5P CEC driver" > + depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) > + select HPD_NOTIFIERS > + ---help--- > + This is a driver for Samsung S5P HDMI CEC interface. It uses the > + generic CEC framework interface. > + CEC bus is present in the HDMI connector and enables communication > + between compatible devices. > + > +endif #V4L_CEC_DRIVERS > + > menuconfig V4L_TEST_DRIVERS > bool "Media test drivers" > depends on MEDIA_CAMERA_SUPPORT > diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile > index 5b3cb27..ad3bf22 100644 > --- a/drivers/media/platform/Makefile > +++ b/drivers/media/platform/Makefile > @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ > obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ > > obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ > +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ > obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ > > obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ > diff --git a/drivers/staging/media/s5p-cec/Makefile b/drivers/media/platform/s5p-cec/Makefile > similarity index 100% > rename from drivers/staging/media/s5p-cec/Makefile > rename to drivers/media/platform/s5p-cec/Makefile > diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cec.h b/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h > similarity index 100% > rename from drivers/staging/media/s5p-cec/exynos_hdmi_cec.h > rename to drivers/media/platform/s5p-cec/exynos_hdmi_cec.h > diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c > similarity index 100% > rename from drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c > rename to drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c > diff --git a/drivers/staging/media/s5p-cec/regs-cec.h b/drivers/media/platform/s5p-cec/regs-cec.h > similarity index 100% > rename from drivers/staging/media/s5p-cec/regs-cec.h > rename to drivers/media/platform/s5p-cec/regs-cec.h > diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c > similarity index 89% > rename from drivers/staging/media/s5p-cec/s5p_cec.c > rename to drivers/media/platform/s5p-cec/s5p_cec.c > index 2a07968..2014f79 100644 > --- a/drivers/staging/media/s5p-cec/s5p_cec.c > +++ b/drivers/media/platform/s5p-cec/s5p_cec.c > @@ -14,15 +14,18 @@ > */ > > #include <linux/clk.h> > +#include <linux/hpd-notifier.h> > #include <linux/interrupt.h> > #include <linux/kernel.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/timer.h> > #include <linux/workqueue.h> > +#include <media/cec-edid.h> > #include <media/cec.h> > > #include "exynos_hdmi_cec.h" > @@ -167,10 +170,22 @@ static const struct cec_adap_ops s5p_cec_adap_ops = { > static int s5p_cec_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > + struct device_node *np; > + struct platform_device *hdmi_dev; > struct resource *res; > struct s5p_cec_dev *cec; > int ret; > > + np = of_parse_phandle(pdev->dev.of_node, "samsung,hdmi-phandle", 0); > + > + if (!np) { > + dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n"); > + return -ENODEV; > + } > + hdmi_dev = of_find_device_by_node(np); > + if (hdmi_dev == NULL) > + return -EPROBE_DEFER; > + > cec = devm_kzalloc(&pdev->dev, sizeof(*cec), GFP_KERNEL); > if (!cec) > return -ENOMEM; > @@ -200,24 +215,33 @@ static int s5p_cec_probe(struct platform_device *pdev) > if (IS_ERR(cec->reg)) > return PTR_ERR(cec->reg); > > + cec->notifier = hpd_notifier_get(&hdmi_dev->dev); > + if (cec->notifier == NULL) > + return -ENOMEM; > + > cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec, > CEC_NAME, > - CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | > + CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | > CEC_CAP_PASSTHROUGH | CEC_CAP_RC, 1); > ret = PTR_ERR_OR_ZERO(cec->adap); > if (ret) > return ret; > + > ret = cec_register_adapter(cec->adap, &pdev->dev); > - if (ret) { > - cec_delete_adapter(cec->adap); > - return ret; > - } > + if (ret) > + goto err_delete_adapter; > + > + cec_register_hpd_notifier(cec->adap, cec->notifier); > > platform_set_drvdata(pdev, cec); > pm_runtime_enable(dev); > > dev_dbg(dev, "successfuly probed\n"); > return 0; > + > +err_delete_adapter: > + cec_delete_adapter(cec->adap); > + return ret; > } > > static int s5p_cec_remove(struct platform_device *pdev) > @@ -225,6 +249,7 @@ static int s5p_cec_remove(struct platform_device *pdev) > struct s5p_cec_dev *cec = platform_get_drvdata(pdev); > > cec_unregister_adapter(cec->adap); > + hpd_notifier_put(cec->notifier); > pm_runtime_disable(&pdev->dev); > return 0; > } > diff --git a/drivers/staging/media/s5p-cec/s5p_cec.h b/drivers/media/platform/s5p-cec/s5p_cec.h > similarity index 97% > rename from drivers/staging/media/s5p-cec/s5p_cec.h > rename to drivers/media/platform/s5p-cec/s5p_cec.h > index 03732c1..a6f5af6 100644 > --- a/drivers/staging/media/s5p-cec/s5p_cec.h > +++ b/drivers/media/platform/s5p-cec/s5p_cec.h > @@ -59,12 +59,15 @@ enum cec_state { > STATE_ERROR > }; > > +struct hpd_notifier; > + > struct s5p_cec_dev { > struct cec_adapter *adap; > struct clk *clk; > struct device *dev; > struct mutex lock; > struct regmap *pmu; > + struct hpd_notifier *notifier; > int irq; > void __iomem *reg; > > diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig > index ffb8fa7..1b7804c 100644 > --- a/drivers/staging/media/Kconfig > +++ b/drivers/staging/media/Kconfig > @@ -27,8 +27,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" > > source "drivers/staging/media/omap4iss/Kconfig" > > -source "drivers/staging/media/s5p-cec/Kconfig" > - > # Keep LIRC at the end, as it has sub-menus > source "drivers/staging/media/lirc/Kconfig" > > diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile > index a28e82c..e11afbf 100644 > --- a/drivers/staging/media/Makefile > +++ b/drivers/staging/media/Makefile > @@ -1,5 +1,4 @@ > obj-$(CONFIG_I2C_BCM2048) += bcm2048/ > -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ > obj-$(CONFIG_DVB_CXD2099) += cxd2099/ > obj-$(CONFIG_LIRC_STAGING) += lirc/ > obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ > diff --git a/drivers/staging/media/s5p-cec/Kconfig b/drivers/staging/media/s5p-cec/Kconfig > deleted file mode 100644 > index ddfd955..0000000 > --- a/drivers/staging/media/s5p-cec/Kconfig > +++ /dev/null > @@ -1,9 +0,0 @@ > -config VIDEO_SAMSUNG_S5P_CEC > - tristate "Samsung S5P CEC driver" > - depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) > - ---help--- > - This is a driver for Samsung S5P HDMI CEC interface. It uses the > - generic CEC framework interface. > - CEC bus is present in the HDMI connector and enables communication > - between compatible devices. > - > diff --git a/drivers/staging/media/s5p-cec/TODO b/drivers/staging/media/s5p-cec/TODO > deleted file mode 100644 > index 64f21ba..0000000 > --- a/drivers/staging/media/s5p-cec/TODO > +++ /dev/null > @@ -1,7 +0,0 @@ > -This driver requires that userspace sets the physical address. > -However, this should be passed on from the corresponding > -Samsung HDMI driver. > - > -We have to wait until the HDMI notifier framework has been merged > -in order to handle this gracefully, until that time this driver > -has to remain in staging. > -- > 2.8.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02.01.2017 15:19, Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@cisco.com> > > By using the HPD notifier framework there is no longer any reason > to manually set the physical address. This was the one blocking > issue that prevented this driver from going out of staging, so do > this move as well. > > Update the bindings documenting the new hdmi phandle and > update exynos4.dtsi accordingly. > > Tested with my Odroid U3. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > .../devicetree/bindings/media/s5p-cec.txt | 2 ++ > arch/arm/boot/dts/exynos4.dtsi | 1 + > drivers/media/platform/Kconfig | 18 +++++++++++ > drivers/media/platform/Makefile | 1 + > .../media => media/platform}/s5p-cec/Makefile | 0 > .../platform}/s5p-cec/exynos_hdmi_cec.h | 0 > .../platform}/s5p-cec/exynos_hdmi_cecctrl.c | 0 > .../media => media/platform}/s5p-cec/regs-cec.h | 0 > .../media => media/platform}/s5p-cec/s5p_cec.c | 35 ++++++++++++++++++---- > .../media => media/platform}/s5p-cec/s5p_cec.h | 3 ++ > drivers/staging/media/Kconfig | 2 -- > drivers/staging/media/Makefile | 1 - > drivers/staging/media/s5p-cec/Kconfig | 9 ------ > drivers/staging/media/s5p-cec/TODO | 7 ----- > 14 files changed, 55 insertions(+), 24 deletions(-) > rename drivers/{staging/media => media/platform}/s5p-cec/Makefile (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cec.h (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cecctrl.c (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/regs-cec.h (100%) > rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.c (89%) > rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.h (97%) > delete mode 100644 drivers/staging/media/s5p-cec/Kconfig > delete mode 100644 drivers/staging/media/s5p-cec/TODO > > diff --git a/Documentation/devicetree/bindings/media/s5p-cec.txt b/Documentation/devicetree/bindings/media/s5p-cec.txt > index 925ab4d..710fc00 100644 > --- a/Documentation/devicetree/bindings/media/s5p-cec.txt > +++ b/Documentation/devicetree/bindings/media/s5p-cec.txt > @@ -15,6 +15,7 @@ Required properties: > - clock-names : from common clock binding: must contain "hdmicec", > corresponding to entry in the clocks property. > - samsung,syscon-phandle - phandle to the PMU system controller > + - samsung,hdmi-phandle - phandle to the HDMI controller > > Example: > > @@ -25,6 +26,7 @@ hdmicec: cec@100B0000 { > clocks = <&clock CLK_HDMI_CEC>; > clock-names = "hdmicec"; > samsung,syscon-phandle = <&pmu_system_controller>; > + samsung,hdmi-phandle = <&hdmi>; > pinctrl-names = "default"; > pinctrl-0 = <&hdmi_cec>; > status = "okay"; > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index c64737b..51dfcbb 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -762,6 +762,7 @@ > clocks = <&clock CLK_HDMI_CEC>; > clock-names = "hdmicec"; > samsung,syscon-phandle = <&pmu_system_controller>; > + samsung,hdmi-phandle = <&hdmi>; > pinctrl-names = "default"; > pinctrl-0 = <&hdmi_cec>; > status = "disabled"; > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index d944421..cab1637 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -392,6 +392,24 @@ config VIDEO_TI_SC > config VIDEO_TI_CSC > tristate > > +menuconfig V4L_CEC_DRIVERS > + bool "Platform HDMI CEC drivers" > + depends on MEDIA_CEC_SUPPORT > + > +if V4L_CEC_DRIVERS > + > +config VIDEO_SAMSUNG_S5P_CEC > + tristate "Samsung S5P CEC driver" > + depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) > + select HPD_NOTIFIERS > + ---help--- > + This is a driver for Samsung S5P HDMI CEC interface. It uses the > + generic CEC framework interface. > + CEC bus is present in the HDMI connector and enables communication > + between compatible devices. > + > +endif #V4L_CEC_DRIVERS > + > menuconfig V4L_TEST_DRIVERS > bool "Media test drivers" > depends on MEDIA_CAMERA_SUPPORT > diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile > index 5b3cb27..ad3bf22 100644 > --- a/drivers/media/platform/Makefile > +++ b/drivers/media/platform/Makefile > @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ > obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ > > obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ > +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ > obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ > > obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ > diff --git a/drivers/staging/media/s5p-cec/Makefile b/drivers/media/platform/s5p-cec/Makefile > similarity index 100% > rename from drivers/staging/media/s5p-cec/Makefile > rename to drivers/media/platform/s5p-cec/Makefile > diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cec.h b/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h > similarity index 100% > rename from drivers/staging/media/s5p-cec/exynos_hdmi_cec.h > rename to drivers/media/platform/s5p-cec/exynos_hdmi_cec.h > diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c > similarity index 100% > rename from drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c > rename to drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c > diff --git a/drivers/staging/media/s5p-cec/regs-cec.h b/drivers/media/platform/s5p-cec/regs-cec.h > similarity index 100% > rename from drivers/staging/media/s5p-cec/regs-cec.h > rename to drivers/media/platform/s5p-cec/regs-cec.h > diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c > similarity index 89% > rename from drivers/staging/media/s5p-cec/s5p_cec.c > rename to drivers/media/platform/s5p-cec/s5p_cec.c > index 2a07968..2014f79 100644 > --- a/drivers/staging/media/s5p-cec/s5p_cec.c > +++ b/drivers/media/platform/s5p-cec/s5p_cec.c > @@ -14,15 +14,18 @@ > */ > > #include <linux/clk.h> > +#include <linux/hpd-notifier.h> > #include <linux/interrupt.h> > #include <linux/kernel.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/timer.h> > #include <linux/workqueue.h> > +#include <media/cec-edid.h> > #include <media/cec.h> > > #include "exynos_hdmi_cec.h" > @@ -167,10 +170,22 @@ static const struct cec_adap_ops s5p_cec_adap_ops = { > static int s5p_cec_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > + struct device_node *np; > + struct platform_device *hdmi_dev; > struct resource *res; > struct s5p_cec_dev *cec; > int ret; > > + np = of_parse_phandle(pdev->dev.of_node, "samsung,hdmi-phandle", 0); > + > + if (!np) { > + dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n"); > + return -ENODEV; > + } > + hdmi_dev = of_find_device_by_node(np); > + if (hdmi_dev == NULL) > + return -EPROBE_DEFER; > + > cec = devm_kzalloc(&pdev->dev, sizeof(*cec), GFP_KERNEL); > if (!cec) > return -ENOMEM; > @@ -200,24 +215,33 @@ static int s5p_cec_probe(struct platform_device *pdev) > if (IS_ERR(cec->reg)) > return PTR_ERR(cec->reg); > > + cec->notifier = hpd_notifier_get(&hdmi_dev->dev); > + if (cec->notifier == NULL) > + return -ENOMEM; > + > cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec, > CEC_NAME, > - CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | > + CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | > CEC_CAP_PASSTHROUGH | CEC_CAP_RC, 1); > ret = PTR_ERR_OR_ZERO(cec->adap); > if (ret) > return ret; > + > ret = cec_register_adapter(cec->adap, &pdev->dev); > - if (ret) { > - cec_delete_adapter(cec->adap); > - return ret; > - } > + if (ret) > + goto err_delete_adapter; > + > + cec_register_hpd_notifier(cec->adap, cec->notifier); Is there a reason to split registration into two steps? Wouldn't be better to integrate hpd_notifier_get into cec_register_hpd_notifier. Regards Andrzej -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/03/2017 09:00 AM, Andrzej Hajda wrote: > On 02.01.2017 15:19, Hans Verkuil wrote: >> From: Hans Verkuil <hans.verkuil@cisco.com> >> >> By using the HPD notifier framework there is no longer any reason >> to manually set the physical address. This was the one blocking >> issue that prevented this driver from going out of staging, so do >> this move as well. >> >> Update the bindings documenting the new hdmi phandle and >> update exynos4.dtsi accordingly. >> >> Tested with my Odroid U3. >> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> >> --- >> .../devicetree/bindings/media/s5p-cec.txt | 2 ++ >> arch/arm/boot/dts/exynos4.dtsi | 1 + >> drivers/media/platform/Kconfig | 18 +++++++++++ >> drivers/media/platform/Makefile | 1 + >> .../media => media/platform}/s5p-cec/Makefile | 0 >> .../platform}/s5p-cec/exynos_hdmi_cec.h | 0 >> .../platform}/s5p-cec/exynos_hdmi_cecctrl.c | 0 >> .../media => media/platform}/s5p-cec/regs-cec.h | 0 >> .../media => media/platform}/s5p-cec/s5p_cec.c | 35 ++++++++++++++++++---- >> .../media => media/platform}/s5p-cec/s5p_cec.h | 3 ++ >> drivers/staging/media/Kconfig | 2 -- >> drivers/staging/media/Makefile | 1 - >> drivers/staging/media/s5p-cec/Kconfig | 9 ------ >> drivers/staging/media/s5p-cec/TODO | 7 ----- >> 14 files changed, 55 insertions(+), 24 deletions(-) >> rename drivers/{staging/media => media/platform}/s5p-cec/Makefile (100%) >> rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cec.h (100%) >> rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cecctrl.c (100%) >> rename drivers/{staging/media => media/platform}/s5p-cec/regs-cec.h (100%) >> rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.c (89%) >> rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.h (97%) >> delete mode 100644 drivers/staging/media/s5p-cec/Kconfig >> delete mode 100644 drivers/staging/media/s5p-cec/TODO >> >> diff --git a/Documentation/devicetree/bindings/media/s5p-cec.txt b/Documentation/devicetree/bindings/media/s5p-cec.txt >> index 925ab4d..710fc00 100644 >> --- a/Documentation/devicetree/bindings/media/s5p-cec.txt >> +++ b/Documentation/devicetree/bindings/media/s5p-cec.txt >> @@ -15,6 +15,7 @@ Required properties: >> - clock-names : from common clock binding: must contain "hdmicec", >> corresponding to entry in the clocks property. >> - samsung,syscon-phandle - phandle to the PMU system controller >> + - samsung,hdmi-phandle - phandle to the HDMI controller >> >> Example: >> >> @@ -25,6 +26,7 @@ hdmicec: cec@100B0000 { >> clocks = <&clock CLK_HDMI_CEC>; >> clock-names = "hdmicec"; >> samsung,syscon-phandle = <&pmu_system_controller>; >> + samsung,hdmi-phandle = <&hdmi>; >> pinctrl-names = "default"; >> pinctrl-0 = <&hdmi_cec>; >> status = "okay"; >> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi >> index c64737b..51dfcbb 100644 >> --- a/arch/arm/boot/dts/exynos4.dtsi >> +++ b/arch/arm/boot/dts/exynos4.dtsi >> @@ -762,6 +762,7 @@ >> clocks = <&clock CLK_HDMI_CEC>; >> clock-names = "hdmicec"; >> samsung,syscon-phandle = <&pmu_system_controller>; >> + samsung,hdmi-phandle = <&hdmi>; >> pinctrl-names = "default"; >> pinctrl-0 = <&hdmi_cec>; >> status = "disabled"; >> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig >> index d944421..cab1637 100644 >> --- a/drivers/media/platform/Kconfig >> +++ b/drivers/media/platform/Kconfig >> @@ -392,6 +392,24 @@ config VIDEO_TI_SC >> config VIDEO_TI_CSC >> tristate >> >> +menuconfig V4L_CEC_DRIVERS >> + bool "Platform HDMI CEC drivers" >> + depends on MEDIA_CEC_SUPPORT >> + >> +if V4L_CEC_DRIVERS >> + >> +config VIDEO_SAMSUNG_S5P_CEC >> + tristate "Samsung S5P CEC driver" >> + depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) >> + select HPD_NOTIFIERS >> + ---help--- >> + This is a driver for Samsung S5P HDMI CEC interface. It uses the >> + generic CEC framework interface. >> + CEC bus is present in the HDMI connector and enables communication >> + between compatible devices. >> + >> +endif #V4L_CEC_DRIVERS >> + >> menuconfig V4L_TEST_DRIVERS >> bool "Media test drivers" >> depends on MEDIA_CAMERA_SUPPORT >> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile >> index 5b3cb27..ad3bf22 100644 >> --- a/drivers/media/platform/Makefile >> +++ b/drivers/media/platform/Makefile >> @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ >> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ >> >> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ >> +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ >> obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ >> >> obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ >> diff --git a/drivers/staging/media/s5p-cec/Makefile b/drivers/media/platform/s5p-cec/Makefile >> similarity index 100% >> rename from drivers/staging/media/s5p-cec/Makefile >> rename to drivers/media/platform/s5p-cec/Makefile >> diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cec.h b/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h >> similarity index 100% >> rename from drivers/staging/media/s5p-cec/exynos_hdmi_cec.h >> rename to drivers/media/platform/s5p-cec/exynos_hdmi_cec.h >> diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c >> similarity index 100% >> rename from drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c >> rename to drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c >> diff --git a/drivers/staging/media/s5p-cec/regs-cec.h b/drivers/media/platform/s5p-cec/regs-cec.h >> similarity index 100% >> rename from drivers/staging/media/s5p-cec/regs-cec.h >> rename to drivers/media/platform/s5p-cec/regs-cec.h >> diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c >> similarity index 89% >> rename from drivers/staging/media/s5p-cec/s5p_cec.c >> rename to drivers/media/platform/s5p-cec/s5p_cec.c >> index 2a07968..2014f79 100644 >> --- a/drivers/staging/media/s5p-cec/s5p_cec.c >> +++ b/drivers/media/platform/s5p-cec/s5p_cec.c >> @@ -14,15 +14,18 @@ >> */ >> >> #include <linux/clk.h> >> +#include <linux/hpd-notifier.h> >> #include <linux/interrupt.h> >> #include <linux/kernel.h> >> #include <linux/mfd/syscon.h> >> #include <linux/module.h> >> #include <linux/of.h> >> +#include <linux/of_platform.h> >> #include <linux/platform_device.h> >> #include <linux/pm_runtime.h> >> #include <linux/timer.h> >> #include <linux/workqueue.h> >> +#include <media/cec-edid.h> >> #include <media/cec.h> >> >> #include "exynos_hdmi_cec.h" >> @@ -167,10 +170,22 @@ static const struct cec_adap_ops s5p_cec_adap_ops = { >> static int s5p_cec_probe(struct platform_device *pdev) >> { >> struct device *dev = &pdev->dev; >> + struct device_node *np; >> + struct platform_device *hdmi_dev; >> struct resource *res; >> struct s5p_cec_dev *cec; >> int ret; >> >> + np = of_parse_phandle(pdev->dev.of_node, "samsung,hdmi-phandle", 0); >> + >> + if (!np) { >> + dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n"); >> + return -ENODEV; >> + } >> + hdmi_dev = of_find_device_by_node(np); >> + if (hdmi_dev == NULL) >> + return -EPROBE_DEFER; >> + >> cec = devm_kzalloc(&pdev->dev, sizeof(*cec), GFP_KERNEL); >> if (!cec) >> return -ENOMEM; >> @@ -200,24 +215,33 @@ static int s5p_cec_probe(struct platform_device *pdev) >> if (IS_ERR(cec->reg)) >> return PTR_ERR(cec->reg); >> >> + cec->notifier = hpd_notifier_get(&hdmi_dev->dev); >> + if (cec->notifier == NULL) >> + return -ENOMEM; >> + >> cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec, >> CEC_NAME, >> - CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | >> + CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | >> CEC_CAP_PASSTHROUGH | CEC_CAP_RC, 1); >> ret = PTR_ERR_OR_ZERO(cec->adap); >> if (ret) >> return ret; >> + >> ret = cec_register_adapter(cec->adap, &pdev->dev); >> - if (ret) { >> - cec_delete_adapter(cec->adap); >> - return ret; >> - } >> + if (ret) >> + goto err_delete_adapter; >> + >> + cec_register_hpd_notifier(cec->adap, cec->notifier); > > Is there a reason to split registration into two steps? > Wouldn't be better to integrate hpd_notifier_get into > cec_register_hpd_notifier. One problem is that hpd_notifier_get can fail, whereas cec_register_hpd_notifier can't. And I rather not have to register a CEC device only to unregister it again if the hpd_notifier_get would fail. Another reason is that this keeps the responsibility of the hpd_notifier life-time handling in the driver instead of hiding it in the CEC framework, which is IMHO unexpected. I think I want to keep this as-is, at least for now. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03.01.2017 09:11, Hans Verkuil wrote: > On 01/03/2017 09:00 AM, Andrzej Hajda wrote: >> Is there a reason to split registration into two steps? >> Wouldn't be better to integrate hpd_notifier_get into >> cec_register_hpd_notifier. > One problem is that hpd_notifier_get can fail, whereas cec_register_hpd_notifier can't. > And I rather not have to register a CEC device only to unregister it again if the > hpd_notifier_get would fail. hpd_notifier_get can fail only due to lack of memory for about 150 bytes so if it happens whole system will probably fail anyway :) > > Another reason is that this keeps the responsibility of the hpd_notifier life-time > handling in the driver instead of hiding it in the CEC framework, which is IMHO > unexpected. Notifier is used only by CEC framework, so IMHO it would be desirable to put CEC specific things into CEC framework. Drivers duty is just to find notifier device. Leaving it as is will just put little more burden on drivers, so this is not big deal, do as you wish :) Regards Andrzej > > I think I want to keep this as-is, at least for now. > > Regards, > > Hans > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/04/2017 09:44 AM, Andrzej Hajda wrote: > On 03.01.2017 09:11, Hans Verkuil wrote: >> On 01/03/2017 09:00 AM, Andrzej Hajda wrote: >>> Is there a reason to split registration into two steps? >>> Wouldn't be better to integrate hpd_notifier_get into >>> cec_register_hpd_notifier. >> One problem is that hpd_notifier_get can fail, whereas cec_register_hpd_notifier can't. >> And I rather not have to register a CEC device only to unregister it again if the >> hpd_notifier_get would fail. > > hpd_notifier_get can fail only due to lack of memory for about 150 bytes > so if it happens whole system will probably fail anyway :) > > >> >> Another reason is that this keeps the responsibility of the hpd_notifier life-time >> handling in the driver instead of hiding it in the CEC framework, which is IMHO >> unexpected. > > Notifier is used only by CEC framework, so IMHO it would be desirable to > put CEC specific things into CEC framework. The CEC framework is just the first that needs it. But especially audio drivers also want to use it. It was designed to help out both subsystems since both need the EDID/ELD. Regards, Hans > Drivers duty is just to find notifier device. > Leaving it as is will just put little more burden on drivers, so this is > not big deal, do as you wish :) > > Regards > Andrzej > >> >> I think I want to keep this as-is, at least for now. >> >> Regards, >> >> Hans >> >> >> >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/media/s5p-cec.txt b/Documentation/devicetree/bindings/media/s5p-cec.txt index 925ab4d..710fc00 100644 --- a/Documentation/devicetree/bindings/media/s5p-cec.txt +++ b/Documentation/devicetree/bindings/media/s5p-cec.txt @@ -15,6 +15,7 @@ Required properties: - clock-names : from common clock binding: must contain "hdmicec", corresponding to entry in the clocks property. - samsung,syscon-phandle - phandle to the PMU system controller + - samsung,hdmi-phandle - phandle to the HDMI controller Example: @@ -25,6 +26,7 @@ hdmicec: cec@100B0000 { clocks = <&clock CLK_HDMI_CEC>; clock-names = "hdmicec"; samsung,syscon-phandle = <&pmu_system_controller>; + samsung,hdmi-phandle = <&hdmi>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_cec>; status = "okay"; diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index c64737b..51dfcbb 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -762,6 +762,7 @@ clocks = <&clock CLK_HDMI_CEC>; clock-names = "hdmicec"; samsung,syscon-phandle = <&pmu_system_controller>; + samsung,hdmi-phandle = <&hdmi>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_cec>; status = "disabled"; diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d944421..cab1637 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -392,6 +392,24 @@ config VIDEO_TI_SC config VIDEO_TI_CSC tristate +menuconfig V4L_CEC_DRIVERS + bool "Platform HDMI CEC drivers" + depends on MEDIA_CEC_SUPPORT + +if V4L_CEC_DRIVERS + +config VIDEO_SAMSUNG_S5P_CEC + tristate "Samsung S5P CEC driver" + depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) + select HPD_NOTIFIERS + ---help--- + This is a driver for Samsung S5P HDMI CEC interface. It uses the + generic CEC framework interface. + CEC bus is present in the HDMI connector and enables communication + between compatible devices. + +endif #V4L_CEC_DRIVERS + menuconfig V4L_TEST_DRIVERS bool "Media test drivers" depends on MEDIA_CAMERA_SUPPORT diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 5b3cb27..ad3bf22 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ diff --git a/drivers/staging/media/s5p-cec/Makefile b/drivers/media/platform/s5p-cec/Makefile similarity index 100% rename from drivers/staging/media/s5p-cec/Makefile rename to drivers/media/platform/s5p-cec/Makefile diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cec.h b/drivers/media/platform/s5p-cec/exynos_hdmi_cec.h similarity index 100% rename from drivers/staging/media/s5p-cec/exynos_hdmi_cec.h rename to drivers/media/platform/s5p-cec/exynos_hdmi_cec.h diff --git a/drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c b/drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c similarity index 100% rename from drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c rename to drivers/media/platform/s5p-cec/exynos_hdmi_cecctrl.c diff --git a/drivers/staging/media/s5p-cec/regs-cec.h b/drivers/media/platform/s5p-cec/regs-cec.h similarity index 100% rename from drivers/staging/media/s5p-cec/regs-cec.h rename to drivers/media/platform/s5p-cec/regs-cec.h diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c similarity index 89% rename from drivers/staging/media/s5p-cec/s5p_cec.c rename to drivers/media/platform/s5p-cec/s5p_cec.c index 2a07968..2014f79 100644 --- a/drivers/staging/media/s5p-cec/s5p_cec.c +++ b/drivers/media/platform/s5p-cec/s5p_cec.c @@ -14,15 +14,18 @@ */ #include <linux/clk.h> +#include <linux/hpd-notifier.h> #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/timer.h> #include <linux/workqueue.h> +#include <media/cec-edid.h> #include <media/cec.h> #include "exynos_hdmi_cec.h" @@ -167,10 +170,22 @@ static const struct cec_adap_ops s5p_cec_adap_ops = { static int s5p_cec_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np; + struct platform_device *hdmi_dev; struct resource *res; struct s5p_cec_dev *cec; int ret; + np = of_parse_phandle(pdev->dev.of_node, "samsung,hdmi-phandle", 0); + + if (!np) { + dev_err(&pdev->dev, "Failed to find hdmi node in device tree\n"); + return -ENODEV; + } + hdmi_dev = of_find_device_by_node(np); + if (hdmi_dev == NULL) + return -EPROBE_DEFER; + cec = devm_kzalloc(&pdev->dev, sizeof(*cec), GFP_KERNEL); if (!cec) return -ENOMEM; @@ -200,24 +215,33 @@ static int s5p_cec_probe(struct platform_device *pdev) if (IS_ERR(cec->reg)) return PTR_ERR(cec->reg); + cec->notifier = hpd_notifier_get(&hdmi_dev->dev); + if (cec->notifier == NULL) + return -ENOMEM; + cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec, CEC_NAME, - CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | + CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | CEC_CAP_PASSTHROUGH | CEC_CAP_RC, 1); ret = PTR_ERR_OR_ZERO(cec->adap); if (ret) return ret; + ret = cec_register_adapter(cec->adap, &pdev->dev); - if (ret) { - cec_delete_adapter(cec->adap); - return ret; - } + if (ret) + goto err_delete_adapter; + + cec_register_hpd_notifier(cec->adap, cec->notifier); platform_set_drvdata(pdev, cec); pm_runtime_enable(dev); dev_dbg(dev, "successfuly probed\n"); return 0; + +err_delete_adapter: + cec_delete_adapter(cec->adap); + return ret; } static int s5p_cec_remove(struct platform_device *pdev) @@ -225,6 +249,7 @@ static int s5p_cec_remove(struct platform_device *pdev) struct s5p_cec_dev *cec = platform_get_drvdata(pdev); cec_unregister_adapter(cec->adap); + hpd_notifier_put(cec->notifier); pm_runtime_disable(&pdev->dev); return 0; } diff --git a/drivers/staging/media/s5p-cec/s5p_cec.h b/drivers/media/platform/s5p-cec/s5p_cec.h similarity index 97% rename from drivers/staging/media/s5p-cec/s5p_cec.h rename to drivers/media/platform/s5p-cec/s5p_cec.h index 03732c1..a6f5af6 100644 --- a/drivers/staging/media/s5p-cec/s5p_cec.h +++ b/drivers/media/platform/s5p-cec/s5p_cec.h @@ -59,12 +59,15 @@ enum cec_state { STATE_ERROR }; +struct hpd_notifier; + struct s5p_cec_dev { struct cec_adapter *adap; struct clk *clk; struct device *dev; struct mutex lock; struct regmap *pmu; + struct hpd_notifier *notifier; int irq; void __iomem *reg; diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index ffb8fa7..1b7804c 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -27,8 +27,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" source "drivers/staging/media/omap4iss/Kconfig" -source "drivers/staging/media/s5p-cec/Kconfig" - # Keep LIRC at the end, as it has sub-menus source "drivers/staging/media/lirc/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index a28e82c..e11afbf 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -1,5 +1,4 @@ obj-$(CONFIG_I2C_BCM2048) += bcm2048/ -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/ obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ diff --git a/drivers/staging/media/s5p-cec/Kconfig b/drivers/staging/media/s5p-cec/Kconfig deleted file mode 100644 index ddfd955..0000000 --- a/drivers/staging/media/s5p-cec/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -config VIDEO_SAMSUNG_S5P_CEC - tristate "Samsung S5P CEC driver" - depends on VIDEO_DEV && MEDIA_CEC_SUPPORT && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) - ---help--- - This is a driver for Samsung S5P HDMI CEC interface. It uses the - generic CEC framework interface. - CEC bus is present in the HDMI connector and enables communication - between compatible devices. - diff --git a/drivers/staging/media/s5p-cec/TODO b/drivers/staging/media/s5p-cec/TODO deleted file mode 100644 index 64f21ba..0000000 --- a/drivers/staging/media/s5p-cec/TODO +++ /dev/null @@ -1,7 +0,0 @@ -This driver requires that userspace sets the physical address. -However, this should be passed on from the corresponding -Samsung HDMI driver. - -We have to wait until the HDMI notifier framework has been merged -in order to handle this gracefully, until that time this driver -has to remain in staging.