The legacy GPIO header <linux/gpio.h> and the deprecated OF GPIO header
<linux/of_gpio.h> should not be used anymore due to the existance of the
new GPIO header <linux/gpio/consumer.h>. Currently, the DRM still holds
seven OF GPIO header includes. That said, this series drops all the
OF GPIO header includes from the DRM, replacing it, when proper, with
the OF header.
Best Regards,
- Maíra Canal
Cc: Andrzej Hajda <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Chun-Kuang Hu <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: Matthias Brugger <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: Abhinav Kumar <[email protected]>
Cc: Dmitry Baryshkov <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: Alain Volmat <[email protected]>
Cc: Emma Anholt <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: [email protected]
Maíra Canal (5):
drm/bridge: anx7625: Drop of_gpio header
drm/mediatek: Drop of_gpio header
drm/msm: Drop of_gpio header
drm/sti: Drop of_gpio header
drm/vc4: Drop of_gpio header
drivers/gpu/drm/bridge/analogix/anx7625.c | 1 -
drivers/gpu/drm/mediatek/mtk_dpi.c | 1 -
drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
drivers/gpu/drm/msm/dp/dp_parser.c | 2 +-
drivers/gpu/drm/msm/hdmi/hdmi.c | 1 -
drivers/gpu/drm/sti/sti_dvo.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 1 -
7 files changed, 2 insertions(+), 7 deletions(-)
--
2.37.1
This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
yet fail to use symbols from it, so drop this include.
Cc: Alain Volmat <[email protected]>
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/sti/sti_dvo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index b6ee8a82e656..0fc7710b054a 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -8,7 +8,7 @@
#include <linux/component.h>
#include <linux/debugfs.h>
#include <linux/module.h>
-#include <linux/of_gpio.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <drm/drm_atomic_helper.h>
--
2.37.1
This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
yet fail to use symbols from it, so drop the include.
Cc: Andrzej Hajda <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/bridge/analogix/anx7625.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 79fc7a50b497..d7d4ca1c8b30 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/workqueue.h>
-#include <linux/of_gpio.h>
#include <linux/of_graph.h>
#include <linux/of_platform.h>
--
2.37.1
This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
yet fail to use symbols from it, so drop the include.
Cc: Emma Anholt <[email protected]>
Cc: Maxime Ripard <[email protected]>
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 6f61a1b8a1a3..84e5a91c2ea7 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -42,7 +42,6 @@
#include <linux/gpio/consumer.h>
#include <linux/i2c.h>
#include <linux/of_address.h>
-#include <linux/of_gpio.h>
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
#include <linux/rational.h>
--
2.37.1
These drivers include the deprecated OF GPIO header <linux/of_gpio.h>
yet fail to use symbols from it, so drop the include.
Cc: Chun-Kuang Hu <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: Matthias Brugger <[email protected]>
Cc: [email protected]
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/mediatek/mtk_dpi.c | 1 -
drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 630a4e301ef6..508a6d994e83 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -11,7 +11,6 @@
#include <linux/media-bus-format.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/of_gpio.h>
#include <linux/of_graph.h>
#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 3196189429bc..4c80b6896dc3 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -16,7 +16,6 @@
#include <linux/mutex.h>
#include <linux/of_platform.h>
#include <linux/of.h>
-#include <linux/of_gpio.h>
#include <linux/of_graph.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
--
2.37.1
These drivers include the deprecated OF GPIO header <linux/of_gpio.h>
yet fail to use symbols from it, so drop the include.
Cc: Rob Clark <[email protected]>
Cc: Abhinav Kumar <[email protected]>
Cc: Dmitry Baryshkov <[email protected]>
Cc: Sean Paul <[email protected]>
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/msm/dp/dp_parser.c | 2 +-
drivers/gpu/drm/msm/hdmi/hdmi.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
index f6ab3b5586ce..9a1bd92dcdc5 100644
--- a/drivers/gpu/drm/msm/dp/dp_parser.c
+++ b/drivers/gpu/drm/msm/dp/dp_parser.c
@@ -3,7 +3,7 @@
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*/
-#include <linux/of_gpio.h>
+#include <linux/of.h>
#include <linux/phy/phy.h>
#include <drm/drm_of.h>
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 93fe61b86967..f178c424257b 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -6,7 +6,6 @@
*/
#include <linux/of_irq.h>
-#include <linux/of_gpio.h>
#include <drm/drm_bridge_connector.h>
#include <drm/drm_of.h>
--
2.37.1
On Fri, 12 Aug 2022 17:57:46 -0300, Maíra Canal wrote:
> This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop the include.
>
>
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
Hi, Maira:
Maíra Canal <[email protected]> 於 2022年8月13日 週六 凌晨4:58寫道：
>
> These drivers include the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop the include.
Applied to mediatek-drm-next [1], thanks.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next
Regards,
Chun-Kuang.
>
> Cc: Chun-Kuang Hu <[email protected]>
> Cc: Philipp Zabel <[email protected]>
> Cc: Matthias Brugger <[email protected]>
> Cc: [email protected]
> Signed-off-by: Maíra Canal <[email protected]>
> ---
> drivers/gpu/drm/mediatek/mtk_dpi.c | 1 -
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 630a4e301ef6..508a6d994e83 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -11,7 +11,6 @@
> #include <linux/media-bus-format.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
> -#include <linux/of_gpio.h>
> #include <linux/of_graph.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 3196189429bc..4c80b6896dc3 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -16,7 +16,6 @@
> #include <linux/mutex.h>
> #include <linux/of_platform.h>
> #include <linux/of.h>
> -#include <linux/of_gpio.h>
> #include <linux/of_graph.h>
> #include <linux/phy/phy.h>
> #include <linux/platform_device.h>
> --
> 2.37.1
>
Hi Maira,
On Fri, 12 Aug 2022 at 22:58, Maíra Canal <[email protected]> wrote:
>
> This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop the include.
>
> Cc: Andrzej Hajda <[email protected]>
> Cc: Neil Armstrong <[email protected]>
> Cc: Robert Foss <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Jonas Karlman <[email protected]>
> Cc: Jernej Skrabec <[email protected]>
> Signed-off-by: Maíra Canal <[email protected]>
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 79fc7a50b497..d7d4ca1c8b30 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -17,7 +17,6 @@
> #include <linux/types.h>
> #include <linux/workqueue.h>
>
> -#include <linux/of_gpio.h>
> #include <linux/of_graph.h>
> #include <linux/of_platform.h>
>
> --
> 2.37.1
>
This cleanup looks good to me.
Reviewed-by: Robert Foss <[email protected]>
Hi Maira,
thanks for the patch.
On Fri, Aug 12, 2022 at 05:57:45PM -0300, Ma?ra Canal wrote:
> This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop this include.
>
> Cc: Alain Volmat <[email protected]>
> Signed-off-by: Ma?ra Canal <[email protected]>
> ---
> drivers/gpu/drm/sti/sti_dvo.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index b6ee8a82e656..0fc7710b054a 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -8,7 +8,7 @@
> #include <linux/component.h>
> #include <linux/debugfs.h>
> #include <linux/module.h>
> -#include <linux/of_gpio.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #include <drm/drm_atomic_helper.h>
> --
Acked-by: Alain Volmat <[email protected]>
> 2.37.1
>
On 8/12/22 17:57, Maíra Canal wrote:
> This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop the include.
>
> Cc: Andrzej Hajda <[email protected]>
> Cc: Neil Armstrong <[email protected]>
> Cc: Robert Foss <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Jonas Karlman <[email protected]>
> Cc: Jernej Skrabec <[email protected]>
> Signed-off-by: Maíra Canal <[email protected]>
Applied to drm/drm-misc (drm-misc-next).
Best Regards,
- Maíra Canal
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 79fc7a50b497..d7d4ca1c8b30 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -17,7 +17,6 @@
> #include <linux/types.h>
> #include <linux/workqueue.h>
>
> -#include <linux/of_gpio.h>
> #include <linux/of_graph.h>
> #include <linux/of_platform.h>
>
On 8/12/22 17:57, Maíra Canal wrote:
> This driver includes the deprecated OF GPIO header <linux/of_gpio.h>
> yet fail to use symbols from it, so drop this include.
>
> Cc: Alain Volmat <[email protected]>
> Signed-off-by: Maíra Canal <[email protected]>
Applied to drm/drm-misc (drm-misc-next).
Best Regards,
- Maíra Canal
> ---
> drivers/gpu/drm/sti/sti_dvo.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index b6ee8a82e656..0fc7710b054a 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -8,7 +8,7 @@
> #include <linux/component.h>
> #include <linux/debugfs.h>
> #include <linux/module.h>
> -#include <linux/of_gpio.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #include <drm/drm_atomic_helper.h>