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>
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 92f933b..086b35b 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 12e1eb6..35de57f 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_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 030a6fa..3ea4476 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