From: "Neil Armstrong" <narmstrong@baylibre.com>
To: Simon Glass <sjg@chromium.org>,
U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Anatolij Gustschin <agust@denx.de>,
u-boot-amlogic@groups.io
Subject: Re: [PATCH 23/30] video: meson: Drop unnecessary header includes
Date: Tue, 7 Jan 2020 11:16:01 +0100 [thread overview]
Message-ID: <f62ed074-22b3-3bf3-196e-9446cc9f63d2@baylibre.com> (raw)
In-Reply-To: <aa3e6b42-a3f6-bbe1-4d66-02aa1597a2cf@baylibre.com>
On 27/10/2019 18:48, Neil Armstrong wrote:
> On 27/10/2019 16:54, Simon Glass wrote:
>> These files should not be included in meson header files. Drop them and
>> tidy up the affected C files.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> drivers/video/meson/meson_canvas.c | 4 ++++
>> drivers/video/meson/meson_plane.c | 5 +++++
>> drivers/video/meson/meson_vclk.c | 2 ++
>> drivers/video/meson/meson_venc.c | 4 ++++
>> drivers/video/meson/meson_vpu.c | 18 +++++++++++++++---
>> drivers/video/meson/meson_vpu.h | 17 +++++------------
>> drivers/video/meson/meson_vpu_init.c | 4 ++++
>> include/video.h | 2 ++
>> 8 files changed, 41 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/video/meson/meson_canvas.c b/drivers/video/meson/meson_canvas.c
>> index b71cbfcc0b..eccac2f8f2 100644
>> --- a/drivers/video/meson/meson_canvas.c
>> +++ b/drivers/video/meson/meson_canvas.c
>> @@ -6,6 +6,10 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* DMC Registers */
>> diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
>> index 2bc9327e1e..8edf451f13 100644
>> --- a/drivers/video/meson/meson_plane.c
>> +++ b/drivers/video/meson/meson_plane.c
>> @@ -6,6 +6,11 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +#include <linux/bitfield.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* OSDx_BLKx_CFG */
>> diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
>> index 0f628e920b..01bfa4bcb8 100644
>> --- a/drivers/video/meson/meson_vclk.c
>> +++ b/drivers/video/meson/meson_vclk.c
>> @@ -6,6 +6,8 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> #include <edid.h>
>> #include "meson_vpu.h"
>> #include <linux/iopoll.h>
>> diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
>> index 5da4b3f096..89e859b02a 100644
>> --- a/drivers/video/meson/meson_venc.c
>> +++ b/drivers/video/meson/meson_venc.c
>> @@ -6,7 +6,11 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> #include <edid.h>
>> +#include <fdtdec.h>
>> +#include <asm/io.h>
>> #include "meson_vpu.h"
>>
>> enum {
>> diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
>> index c3af9b013c..4eb66398d0 100644
>> --- a/drivers/video/meson/meson_vpu.c
>> +++ b/drivers/video/meson/meson_vpu.c
>> @@ -6,13 +6,17 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> -#include "meson_vpu.h"
>> +#include <common.h>
>> +#include <display.h>
>> +#include <dm.h>
>> #include <efi_loader.h>
>> -#include <dm/device-internal.h>
>> -#include <dm/uclass-internal.h>
>> #include <fdt_support.h>
>> #include <linux/sizes.h>
>> #include <asm/arch/mem.h>
>> +#include <dm/device-internal.h>
>> +#include <dm/uclass-internal.h>
>> +
>> +#include "meson_vpu.h"
>> #include "meson_registers.h"
>> #include "simplefb_common.h"
>>
>> @@ -27,6 +31,14 @@ static struct meson_framebuffer {
>> bool is_cvbs;
>> } meson_fb = { 0 };
>>
>> +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> + enum vpu_compatible family)
>> +{
>> + enum vpu_compatible compat = dev_get_driver_data(priv->dev);
>> +
>> + return compat == family;
>> +}
>> +
>> static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp)
>> {
>> struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
>> diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
>> index 0d9fddad2e..d9588c3775 100644
>> --- a/drivers/video/meson/meson_vpu.h
>> +++ b/drivers/video/meson/meson_vpu.h
>> @@ -9,14 +9,12 @@
>> #ifndef __MESON_VPU_H__
>> #define __MESON_VPU_H__
>>
>> -#include <common.h>
>> -#include <dm.h>
>> #include <video.h>
>> -#include <display.h>
>> -#include <linux/io.h>
>> -#include <linux/bitfield.h>
>> #include "meson_registers.h"
>>
>> +struct display_timing;
>> +struct udevice;
>> +
>> enum {
>> /* Maximum size we support */
>> VPU_MAX_WIDTH = 3840,
>> @@ -38,13 +36,8 @@ struct meson_vpu_priv {
>> void __iomem *dmc_base;
>> };
>>
>> -static inline bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> - enum vpu_compatible family)
>> -{
>> - enum vpu_compatible compat = dev_get_driver_data(priv->dev);
>> -
>> - return compat == family;
>> -}
>> +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> + enum vpu_compatible family);
>>
>> #define hhi_update_bits(offset, mask, value) \
>> writel_bits(mask, value, priv->hhi_base + offset)
>> diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
>> index 12f8c4194a..8408c59eaa 100644
>> --- a/drivers/video/meson/meson_vpu_init.c
>> +++ b/drivers/video/meson/meson_vpu_init.c
>> @@ -8,6 +8,10 @@
>>
>> #define DEBUG
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* HHI Registers */
>> diff --git a/include/video.h b/include/video.h
>> index 485071d072..e7c58e86cb 100644
>> --- a/include/video.h
>> +++ b/include/video.h
>> @@ -17,6 +17,8 @@
>>
>> #include <stdio_dev.h>
>>
>> +struct udevice;
>> +
>> struct video_uc_platdata {
>> uint align;
>> uint size;
>>
>
> Acked-by: Neil Armstrong <narmstrong@baylibre.com>
>
Applied to u-boot-amlogic
Neil
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <narmstrong@baylibre.com>
To: u-boot@lists.denx.de
Subject: [PATCH 23/30] video: meson: Drop unnecessary header includes
Date: Tue, 7 Jan 2020 11:16:01 +0100 [thread overview]
Message-ID: <f62ed074-22b3-3bf3-196e-9446cc9f63d2@baylibre.com> (raw)
In-Reply-To: <aa3e6b42-a3f6-bbe1-4d66-02aa1597a2cf@baylibre.com>
On 27/10/2019 18:48, Neil Armstrong wrote:
> On 27/10/2019 16:54, Simon Glass wrote:
>> These files should not be included in meson header files. Drop them and
>> tidy up the affected C files.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> drivers/video/meson/meson_canvas.c | 4 ++++
>> drivers/video/meson/meson_plane.c | 5 +++++
>> drivers/video/meson/meson_vclk.c | 2 ++
>> drivers/video/meson/meson_venc.c | 4 ++++
>> drivers/video/meson/meson_vpu.c | 18 +++++++++++++++---
>> drivers/video/meson/meson_vpu.h | 17 +++++------------
>> drivers/video/meson/meson_vpu_init.c | 4 ++++
>> include/video.h | 2 ++
>> 8 files changed, 41 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/video/meson/meson_canvas.c b/drivers/video/meson/meson_canvas.c
>> index b71cbfcc0b..eccac2f8f2 100644
>> --- a/drivers/video/meson/meson_canvas.c
>> +++ b/drivers/video/meson/meson_canvas.c
>> @@ -6,6 +6,10 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* DMC Registers */
>> diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
>> index 2bc9327e1e..8edf451f13 100644
>> --- a/drivers/video/meson/meson_plane.c
>> +++ b/drivers/video/meson/meson_plane.c
>> @@ -6,6 +6,11 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +#include <linux/bitfield.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* OSDx_BLKx_CFG */
>> diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
>> index 0f628e920b..01bfa4bcb8 100644
>> --- a/drivers/video/meson/meson_vclk.c
>> +++ b/drivers/video/meson/meson_vclk.c
>> @@ -6,6 +6,8 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> #include <edid.h>
>> #include "meson_vpu.h"
>> #include <linux/iopoll.h>
>> diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
>> index 5da4b3f096..89e859b02a 100644
>> --- a/drivers/video/meson/meson_venc.c
>> +++ b/drivers/video/meson/meson_venc.c
>> @@ -6,7 +6,11 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> +#include <common.h>
>> +#include <dm.h>
>> #include <edid.h>
>> +#include <fdtdec.h>
>> +#include <asm/io.h>
>> #include "meson_vpu.h"
>>
>> enum {
>> diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
>> index c3af9b013c..4eb66398d0 100644
>> --- a/drivers/video/meson/meson_vpu.c
>> +++ b/drivers/video/meson/meson_vpu.c
>> @@ -6,13 +6,17 @@
>> * Author: Neil Armstrong <narmstrong@baylibre.com>
>> */
>>
>> -#include "meson_vpu.h"
>> +#include <common.h>
>> +#include <display.h>
>> +#include <dm.h>
>> #include <efi_loader.h>
>> -#include <dm/device-internal.h>
>> -#include <dm/uclass-internal.h>
>> #include <fdt_support.h>
>> #include <linux/sizes.h>
>> #include <asm/arch/mem.h>
>> +#include <dm/device-internal.h>
>> +#include <dm/uclass-internal.h>
>> +
>> +#include "meson_vpu.h"
>> #include "meson_registers.h"
>> #include "simplefb_common.h"
>>
>> @@ -27,6 +31,14 @@ static struct meson_framebuffer {
>> bool is_cvbs;
>> } meson_fb = { 0 };
>>
>> +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> + enum vpu_compatible family)
>> +{
>> + enum vpu_compatible compat = dev_get_driver_data(priv->dev);
>> +
>> + return compat == family;
>> +}
>> +
>> static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp)
>> {
>> struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
>> diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
>> index 0d9fddad2e..d9588c3775 100644
>> --- a/drivers/video/meson/meson_vpu.h
>> +++ b/drivers/video/meson/meson_vpu.h
>> @@ -9,14 +9,12 @@
>> #ifndef __MESON_VPU_H__
>> #define __MESON_VPU_H__
>>
>> -#include <common.h>
>> -#include <dm.h>
>> #include <video.h>
>> -#include <display.h>
>> -#include <linux/io.h>
>> -#include <linux/bitfield.h>
>> #include "meson_registers.h"
>>
>> +struct display_timing;
>> +struct udevice;
>> +
>> enum {
>> /* Maximum size we support */
>> VPU_MAX_WIDTH = 3840,
>> @@ -38,13 +36,8 @@ struct meson_vpu_priv {
>> void __iomem *dmc_base;
>> };
>>
>> -static inline bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> - enum vpu_compatible family)
>> -{
>> - enum vpu_compatible compat = dev_get_driver_data(priv->dev);
>> -
>> - return compat == family;
>> -}
>> +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
>> + enum vpu_compatible family);
>>
>> #define hhi_update_bits(offset, mask, value) \
>> writel_bits(mask, value, priv->hhi_base + offset)
>> diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
>> index 12f8c4194a..8408c59eaa 100644
>> --- a/drivers/video/meson/meson_vpu_init.c
>> +++ b/drivers/video/meson/meson_vpu_init.c
>> @@ -8,6 +8,10 @@
>>
>> #define DEBUG
>>
>> +#include <common.h>
>> +#include <dm.h>
>> +#include <asm/io.h>
>> +
>> #include "meson_vpu.h"
>>
>> /* HHI Registers */
>> diff --git a/include/video.h b/include/video.h
>> index 485071d072..e7c58e86cb 100644
>> --- a/include/video.h
>> +++ b/include/video.h
>> @@ -17,6 +17,8 @@
>>
>> #include <stdio_dev.h>
>>
>> +struct udevice;
>> +
>> struct video_uc_platdata {
>> uint align;
>> uint size;
>>
>
> Acked-by: Neil Armstrong <narmstrong@baylibre.com>
>
Applied to u-boot-amlogic
Neil
next prev parent reply other threads:[~2020-01-07 10:16 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 15:53 [U-Boot] [PATCH 01/30] lib: Allow crc32 to be disabled Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 02/30] spi: Allow separate control of SPI_FLASH_TINY for SPL/TPL Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 03/30] mtd: spi-nor: Tidy up error handling / debug code Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 04/30] mtd: spi: Export spi_flash_std_probe() Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 05/30] wdt: Move code out of the header Simon Glass
2019-10-28 5:07 ` Stefan Roese
2019-10-27 15:53 ` [U-Boot] [PATCH 06/30] wdt: Drop dm.h header file Simon Glass
2019-10-28 5:44 ` Stefan Roese
2019-10-27 15:53 ` [U-Boot] [PATCH 07/30] mtd: spi-mem: " Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 08/30] mtd: spi: Drop SPI_XFER_MMAP* Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 09/30] dm: core: Drop dm.h header file from dm-demo.h Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 10/30] dm: core: Drop header files from dm/test.h Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 11/30] fs: fs-loader: Drop dm.h header file Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 12/30] net: Drop dm.h header file from phy.h Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 13/30] sf: Drop dm.h header file from spi_flash.h Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 14/30] thermal: Drop dm.h header file Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 15/30] w1: " Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 16/30] efi: Tidy up header includes Simon Glass
2019-10-27 17:42 ` Heinrich Schuchardt
2019-10-27 18:59 ` Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 17/30] power: Tidy up inclusion of regulator_common.h Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 18/30] mmc: Drop duplicate dm.h inclusion Simon Glass
2019-10-27 15:53 ` [U-Boot] [PATCH 19/30] spi: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 20/30] ti: am654: " Simon Glass
2019-10-29 5:43 ` Lokesh Vutla
2019-10-27 15:54 ` [U-Boot] [PATCH 21/30] liebherr: " Simon Glass
2019-11-01 22:45 ` Lukasz Majewski
2019-10-27 15:54 ` [U-Boot] [PATCH 22/30] pci: Drop dm.h inclusion from header file Simon Glass
2019-10-27 15:54 ` [PATCH 23/30] video: meson: Drop unnecessary header includes Simon Glass
2019-10-27 15:54 ` [U-Boot] " Simon Glass
2019-10-27 17:06 ` Anatolij Gustschin
2019-10-27 17:06 ` [U-Boot] " Anatolij Gustschin
2019-10-27 17:48 ` Neil Armstrong
2019-10-27 17:48 ` [U-Boot] " Neil Armstrong
2020-01-07 10:16 ` Neil Armstrong [this message]
2020-01-07 10:16 ` Neil Armstrong
2019-10-27 15:54 ` [U-Boot] [PATCH 24/30] mediatek: Drop dm.h header file Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 25/30] mscc: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 26/30] adc: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 27/30] nand: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 28/30] ufs: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 29/30] usb: " Simon Glass
2019-10-27 15:54 ` [U-Boot] [PATCH 30/30] dm: core: Guard against including dm.h in header files Simon Glass
2019-10-27 16:48 ` [U-Boot] [PATCH 01/30] lib: Allow crc32 to be disabled Heinrich Schuchardt
2019-11-08 14:59 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f62ed074-22b3-3bf3-196e-9446cc9f63d2@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=agust@denx.de \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.