video: meson: Drop unnecessary header includes

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>
Reviewed-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Simon Glass 2019-10-27 09:54:03 -06:00 committed by Neil Armstrong
parent 0b0c6af387
commit b9dea62b6b
8 changed files with 41 additions and 15 deletions

View File

@ -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 */

View File

@ -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 */

View File

@ -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>

View File

@ -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 {

View File

@ -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);

View File

@ -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)

View File

@ -8,6 +8,10 @@
#define DEBUG
#include <common.h>
#include <dm.h>
#include <asm/io.h>
#include "meson_vpu.h"
/* HHI Registers */

View File

@ -17,6 +17,8 @@
#include <stdio_dev.h>
struct udevice;
struct video_uc_platdata {
uint align;
uint size;