Re: [PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
On Friday, May 30, 2014 1:42 AM, Tomasz Figa wrote: > On 29.05.2014 18:36, Lee Jones wrote: > > There appears to have been a merge error on commit: > > > > 2b76813: drm/exynos: hdmi: remove the i2c drivers and use > > > > The original submission can be found at: > > > > https://patchwork.kernel.org/patch/3559541/ > > > > It looks like the commit was only half applied. This patch aims > > to finish what was started by Daniel. (+cc Inki Dae) Hi Lee Jones, A similar patch was already applied to drm-exynos git. [1] However, 'drivers/gpu/drm/exynos/exynos_hdmi.h' was not removed yet. Thus, additional patch to remove this 'exynos_hdmi.h' should be submitted. Thank you. [1] http://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next=73c0a75ca9919c12525fd02eb49f9c3a34e0 d2d9 Best regards, Jingoo Han > > > > Signed-off-by: Lee Jones > > --- > > drivers/gpu/drm/exynos/exynos_ddc.c | 63 > > > > drivers/gpu/drm/exynos/exynos_hdmi.h| 23 > > drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 > > - > > 3 files changed, 151 deletions(-) > > delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c > > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h > > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c > > > > Obviously there is nothing to review, but still: > > Reviewed-by: Tomasz Figa > > Thanks for the patch. > > Best regards, > Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
Hi. On 29.05.2014 18:36, Lee Jones wrote: > There appears to have been a merge error on commit: > > 2b76813: drm/exynos: hdmi: remove the i2c drivers and use > > The original submission can be found at: > > https://patchwork.kernel.org/patch/3559541/ > > It looks like the commit was only half applied. This patch aims > to finish what was started by Daniel. > > Signed-off-by: Lee Jones > --- > drivers/gpu/drm/exynos/exynos_ddc.c | 63 > drivers/gpu/drm/exynos/exynos_hdmi.h| 23 > drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 > - > 3 files changed, 151 deletions(-) > delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c > Obviously there is nothing to review, but still: Reviewed-by: Tomasz Figa Thanks for the patch. Best regards, Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
There appears to have been a merge error on commit:
2b76813: drm/exynos: hdmi: remove the i2c drivers and use
The original submission can be found at:
https://patchwork.kernel.org/patch/3559541/
It looks like the commit was only half applied. This patch aims
to finish what was started by Daniel.
Signed-off-by: Lee Jones
---
drivers/gpu/drm/exynos/exynos_ddc.c | 63
drivers/gpu/drm/exynos/exynos_hdmi.h| 23
drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 -
3 files changed, 151 deletions(-)
delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c
delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h
delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c
b/drivers/gpu/drm/exynos/exynos_ddc.c
deleted file mode 100644
index 6a8c84e..000
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Authors:
- * Seung-Woo Kim
- * Inki Dae
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-#include
-
-#include
-#include
-#include
-
-#include "exynos_drm_drv.h"
-#include "exynos_hdmi.h"
-
-static int s5p_ddc_probe(struct i2c_client *client,
- const struct i2c_device_id *dev_id)
-{
- hdmi_attach_ddc_client(client);
-
- dev_info(>adapter->dev,
- "attached %s into i2c adapter successfully\n",
- client->name);
-
- return 0;
-}
-
-static int s5p_ddc_remove(struct i2c_client *client)
-{
- dev_info(>adapter->dev,
- "detached %s from i2c adapter successfully\n",
- client->name);
-
- return 0;
-}
-
-static struct of_device_id hdmiddc_match_types[] = {
- {
- .compatible = "samsung,exynos5-hdmiddc",
- }, {
- .compatible = "samsung,exynos4210-hdmiddc",
- }, {
- /* end node */
- }
-};
-
-struct i2c_driver ddc_driver = {
- .driver = {
- .name = "exynos-hdmiddc",
- .owner = THIS_MODULE,
- .of_match_table = hdmiddc_match_types,
- },
- .probe = s5p_ddc_probe,
- .remove = s5p_ddc_remove,
- .command= NULL,
-};
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.h
b/drivers/gpu/drm/exynos/exynos_hdmi.h
deleted file mode 100644
index 0ddf395..000
--- a/drivers/gpu/drm/exynos/exynos_hdmi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- * Authors:
- * Inki Dae
- * Seung-Woo Kim
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef _EXYNOS_HDMI_H_
-#define _EXYNOS_HDMI_H_
-
-void hdmi_attach_ddc_client(struct i2c_client *ddc);
-void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy);
-
-extern struct i2c_driver hdmiphy_driver;
-extern struct i2c_driver ddc_driver;
-
-#endif
diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
deleted file mode 100644
index 59abb14..000
--- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Authors:
- * Seung-Woo Kim
- * Inki Dae
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-#include
-
-#include
-#include
-#include
-
-#include "exynos_drm_drv.h"
-#include "exynos_hdmi.h"
-
-
-static int hdmiphy_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
-{
- hdmi_attach_hdmiphy_client(client);
-
- dev_info(>adapter->dev, "attached s5p_hdmiphy "
- "into i2c adapter successfully\n");
-
- return 0;
-}
-
-static int hdmiphy_remove(struct i2c_client *client)
-{
- dev_info(>adapter->dev, "detached s5p_hdmiphy "
- "from i2c adapter successfully\n");
-
- return 0;
-}
-
-static struct of_device_id hdmiphy_match_types[] = {
- {
- .compatible = "samsung,exynos5-hdmiphy",
- }, {
- .compatible = "samsung,exynos4210-hdmiphy",
- }, {
- .compatible = "samsung,exynos4212-hdmiphy",
- }, {
- /* end node */
- }
-};
-
-struct i2c_driver hdmiphy_driver = {
- .driver = {
-
[PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
There appears to have been a merge error on commit:
2b76813: drm/exynos: hdmi: remove the i2c drivers and use
The original submission can be found at:
https://patchwork.kernel.org/patch/3559541/
It looks like the commit was only half applied. This patch aims
to finish what was started by Daniel.
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
drivers/gpu/drm/exynos/exynos_ddc.c | 63
drivers/gpu/drm/exynos/exynos_hdmi.h| 23
drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 -
3 files changed, 151 deletions(-)
delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c
delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h
delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c
b/drivers/gpu/drm/exynos/exynos_ddc.c
deleted file mode 100644
index 6a8c84e..000
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Authors:
- * Seung-Woo Kim sw0312@samsung.com
- * Inki Dae inki@samsung.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-#include drm/drmP.h
-
-#include linux/kernel.h
-#include linux/i2c.h
-#include linux/of.h
-
-#include exynos_drm_drv.h
-#include exynos_hdmi.h
-
-static int s5p_ddc_probe(struct i2c_client *client,
- const struct i2c_device_id *dev_id)
-{
- hdmi_attach_ddc_client(client);
-
- dev_info(client-adapter-dev,
- attached %s into i2c adapter successfully\n,
- client-name);
-
- return 0;
-}
-
-static int s5p_ddc_remove(struct i2c_client *client)
-{
- dev_info(client-adapter-dev,
- detached %s from i2c adapter successfully\n,
- client-name);
-
- return 0;
-}
-
-static struct of_device_id hdmiddc_match_types[] = {
- {
- .compatible = samsung,exynos5-hdmiddc,
- }, {
- .compatible = samsung,exynos4210-hdmiddc,
- }, {
- /* end node */
- }
-};
-
-struct i2c_driver ddc_driver = {
- .driver = {
- .name = exynos-hdmiddc,
- .owner = THIS_MODULE,
- .of_match_table = hdmiddc_match_types,
- },
- .probe = s5p_ddc_probe,
- .remove = s5p_ddc_remove,
- .command= NULL,
-};
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.h
b/drivers/gpu/drm/exynos/exynos_hdmi.h
deleted file mode 100644
index 0ddf395..000
--- a/drivers/gpu/drm/exynos/exynos_hdmi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- * Authors:
- * Inki Dae inki@samsung.com
- * Seung-Woo Kim sw0312@samsung.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef _EXYNOS_HDMI_H_
-#define _EXYNOS_HDMI_H_
-
-void hdmi_attach_ddc_client(struct i2c_client *ddc);
-void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy);
-
-extern struct i2c_driver hdmiphy_driver;
-extern struct i2c_driver ddc_driver;
-
-#endif
diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
deleted file mode 100644
index 59abb14..000
--- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Authors:
- * Seung-Woo Kim sw0312@samsung.com
- * Inki Dae inki@samsung.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-#include drm/drmP.h
-
-#include linux/kernel.h
-#include linux/i2c.h
-#include linux/of.h
-
-#include exynos_drm_drv.h
-#include exynos_hdmi.h
-
-
-static int hdmiphy_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
-{
- hdmi_attach_hdmiphy_client(client);
-
- dev_info(client-adapter-dev, attached s5p_hdmiphy
- into i2c adapter successfully\n);
-
- return 0;
-}
-
-static int hdmiphy_remove(struct i2c_client *client)
-{
- dev_info(client-adapter-dev, detached s5p_hdmiphy
- from i2c adapter successfully\n);
-
- return 0;
-}
-
-static struct of_device_id hdmiphy_match_types[] = {
- {
- .compatible = samsung,exynos5-hdmiphy,
- }, {
- .compatible =
Re: [PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
Hi. On 29.05.2014 18:36, Lee Jones wrote: There appears to have been a merge error on commit: 2b76813: drm/exynos: hdmi: remove the i2c drivers and use The original submission can be found at: https://patchwork.kernel.org/patch/3559541/ It looks like the commit was only half applied. This patch aims to finish what was started by Daniel. Signed-off-by: Lee Jones lee.jo...@linaro.org --- drivers/gpu/drm/exynos/exynos_ddc.c | 63 drivers/gpu/drm/exynos/exynos_hdmi.h| 23 drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 - 3 files changed, 151 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c Obviously there is nothing to review, but still: Reviewed-by: Tomasz Figa t.f...@samsung.com Thanks for the patch. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] drm/exynos: hdmi: remove the i2c drivers and use devtree - continued
On Friday, May 30, 2014 1:42 AM, Tomasz Figa wrote: On 29.05.2014 18:36, Lee Jones wrote: There appears to have been a merge error on commit: 2b76813: drm/exynos: hdmi: remove the i2c drivers and use The original submission can be found at: https://patchwork.kernel.org/patch/3559541/ It looks like the commit was only half applied. This patch aims to finish what was started by Daniel. (+cc Inki Dae) Hi Lee Jones, A similar patch was already applied to drm-exynos git. [1] However, 'drivers/gpu/drm/exynos/exynos_hdmi.h' was not removed yet. Thus, additional patch to remove this 'exynos_hdmi.h' should be submitted. Thank you. [1] http://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-nextid=73c0a75ca9919c12525fd02eb49f9c3a34e0 d2d9 Best regards, Jingoo Han Signed-off-by: Lee Jones lee.jo...@linaro.org --- drivers/gpu/drm/exynos/exynos_ddc.c | 63 drivers/gpu/drm/exynos/exynos_hdmi.h| 23 drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 - 3 files changed, 151 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c Obviously there is nothing to review, but still: Reviewed-by: Tomasz Figa t.f...@samsung.com Thanks for the patch. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
