diff options
author | charkear <charles.kearney@hpe.com> | 2023-03-01 02:17:14 +0300 |
---|---|---|
committer | Charles Kearney <charles.kearney@hpe.com> | 2023-04-05 19:13:41 +0300 |
commit | 582eb83df7ebb51a0fecce5da04964e4e682fa90 (patch) | |
tree | e5c6399a6cbe8817976651319e912243c5616279 | |
parent | b9b3aeaa846663106d8c8efc44212cba8fe91615 (diff) | |
download | openbmc-582eb83df7ebb51a0fecce5da04964e4e682fa90.tar.xz |
meta-hpe: update device tree to match new driver for gxp thumbnail video
Change-Id: Ifa9b38e824619fff9f7c6c228252c56714871d1d
Signed-off-by: charles kearney <charles.kearney@hpe.com>
3 files changed, 11 insertions, 4 deletions
diff --git a/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts b/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts index 92f933b50f..086b35bab3 100644 --- a/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts +++ b/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts @@ -10,6 +10,8 @@ }; aliases { + ethernet0 = &umac0; + ethernet1 = &umac1; }; memory@40000000 { @@ -459,11 +461,11 @@ }; thumbnail: thumbnail@c0000500 { - compatible = "hpe,gxp-thumbnail"; + compatible = "hpe,gxp-video-thumbnail"; reg = <0xc0000500 0x20>; bits-per-pixel = <32>; - width = <800>; - height = <600>; + width = <1024>; + height = <768>; }; xreg: xreg@d1000300 { diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig index 12e1eb6367..35de57fec0 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig @@ -170,6 +170,11 @@ CONFIG_GXP_WATCHDOG=y CONFIG_MFD_SYSCON=y CONFIG_FB=y CONFIG_FB_THUMBNAIL=y +CONFIG_HAS_IOMEM =y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_GXP_THUMBNAIL=y CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb index 030a6fa93d..3ea44761d6 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.14-gxp-openbmc" LINUX_VERSION ?= "5.14.0" -SRCREV="6f1a2c5c0cc59692d5beafe5ff8a4c7539b82d7d" +SRCREV="4ff23625306630ce50d9454fca590fa9b2daeb53" require linux-obmc.inc require conf/machine/include/fitimage-sign.inc |