mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge tag 'video-20240421' of https://source.denx.de/u-boot/custodians/u-boot-video
CI: https://source.denx.de/u-boot/custodians/u-boot-video/-/pipelines/20466 - simple_panel: support timing parsing from EDID - dw_hdmi: fix gcc-14 compiler warnings - dw_hdmi: support vendor PHY for HDMI - rockchip: add Rockchip INNO HDMI PHY driver - rockchip: RK3328 HDMI and VOP support - evb-rk3328: enable vidconsole support - Tegra DC and DSI improvements and Tegra 114 support - add LG LG070WX3 MIPI DSI panel driver - add Samsung LTL106HL02 MIPI DSI panel driver - add Toshiba TC358768 RGB to DSI bridge support - add basic support for the Parade DP501 transmitter - Tegra 3 panel and bridge driver improvements - simplefb: modernise DT parsing - fdt_simplefb: Enumerate framebuffer info from video handoff - preserve framebuffer if SPL is passing video hand-off - fdt_support: allow reserving FB region without simplefb
This commit is contained in:
@@ -6,6 +6,11 @@
|
||||
#ifndef __EVB_RK3328_H
|
||||
#define __EVB_RK3328_H
|
||||
|
||||
#define ROCKCHIP_DEVICE_SETTINGS \
|
||||
"stdin=serial,usbkbd\0" \
|
||||
"stdout=serial,vidconsole\0" \
|
||||
"stderr=serial,vidconsole\0"
|
||||
|
||||
#include <configs/rk3328_common.h>
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
ENV_MEM_LAYOUT_SETTINGS \
|
||||
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
"partitions=" PARTS_DEFAULT \
|
||||
ROCKCHIP_DEVICE_SETTINGS \
|
||||
"boot_targets=" BOOT_TARGETS "\0"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -534,6 +534,14 @@ struct hdmi_data_info {
|
||||
struct hdmi_vmode video_mode;
|
||||
};
|
||||
|
||||
struct dw_hdmi;
|
||||
|
||||
struct dw_hdmi_phy_ops {
|
||||
int (*phy_set)(struct dw_hdmi *hdmi, uint mpixelclock);
|
||||
void (*read_hpd)(struct dw_hdmi *hdmi, bool hdp_status);
|
||||
void (*setup_hpd)(struct dw_hdmi *hdmi);
|
||||
};
|
||||
|
||||
struct dw_hdmi {
|
||||
ulong ioaddr;
|
||||
const struct hdmi_mpll_config *mpll_cfg;
|
||||
@@ -543,8 +551,8 @@ struct dw_hdmi {
|
||||
u8 reg_io_width;
|
||||
struct hdmi_data_info hdmi_data;
|
||||
struct udevice *ddc_bus;
|
||||
const struct dw_hdmi_phy_ops *ops;
|
||||
|
||||
int (*phy_set)(struct dw_hdmi *hdmi, uint mpixelclock);
|
||||
void (*write_reg)(struct dw_hdmi *hdmi, u8 val, int offset);
|
||||
u8 (*read_reg)(struct dw_hdmi *hdmi, int offset);
|
||||
};
|
||||
@@ -556,5 +564,6 @@ void dw_hdmi_phy_init(struct dw_hdmi *hdmi);
|
||||
int dw_hdmi_enable(struct dw_hdmi *hdmi, const struct display_timing *edid);
|
||||
int dw_hdmi_read_edid(struct dw_hdmi *hdmi, u8 *buf, int buf_size);
|
||||
void dw_hdmi_init(struct dw_hdmi *hdmi);
|
||||
int dw_hdmi_detect_hpd(struct dw_hdmi *hdmi);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -423,6 +423,8 @@ int arch_fixup_memory_node(void *blob);
|
||||
int fdt_setup_simplefb_node(void *fdt, int node, u64 base_address, u32 width,
|
||||
u32 height, u32 stride, const char *format);
|
||||
|
||||
int fdt_add_fb_mem_rsv(void *blob);
|
||||
|
||||
int fdt_overlay_apply_verbose(void *fdt, void *fdto);
|
||||
|
||||
int fdt_valid(struct fdt_header **blobp);
|
||||
|
||||
Reference in New Issue
Block a user