diff --git a/patch.sh b/patch.sh index 7db793595ce3d1a1d5959defcfbfbee475eafddc..69e715fe44eec44264646d99d68cfe9d23c92de1 100644 --- a/patch.sh +++ b/patch.sh @@ -591,16 +591,13 @@ beaglebone () { ${git} "${DIR}/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch" ${git} "${DIR}/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch" - - if [ "x${merged_in_4_6}" = "xenable" ] ; then - ${git} "${DIR}/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch" - ${git} "${DIR}/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch" - fi - + ${git} "${DIR}/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch" + ${git} "${DIR}/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch" ${git} "${DIR}/patches/beaglebone/abbbi/0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch" + ${git} "${DIR}/patches/beaglebone/abbbi/0006-adihdmi_drv-reg_default-reg_sequence.patch" if [ "x${regenerate}" = "xenable" ] ; then - number=5 + number=6 cleanup fi diff --git a/patches/beaglebone/abbbi/0006-adihdmi_drv-reg_default-reg_sequence.patch b/patches/beaglebone/abbbi/0006-adihdmi_drv-reg_default-reg_sequence.patch new file mode 100644 index 0000000000000000000000000000000000000000..e41ff77e56543d601e0b27598b9b0fb61fc8f99d --- /dev/null +++ b/patches/beaglebone/abbbi/0006-adihdmi_drv-reg_default-reg_sequence.patch @@ -0,0 +1,26 @@ +From 9925712e7c37b5e557dd01d8a30446d777d84d60 Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Mon, 28 Mar 2016 09:16:04 -0500 +Subject: [PATCH 6/6] adihdmi_drv: reg_default -> reg_sequence + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +--- + drivers/gpu/drm/i2c/adihdmi_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i2c/adihdmi_drv.c b/drivers/gpu/drm/i2c/adihdmi_drv.c +index 3d38626..6792224 100644 +--- a/drivers/gpu/drm/i2c/adihdmi_drv.c ++++ b/drivers/gpu/drm/i2c/adihdmi_drv.c +@@ -60,7 +60,7 @@ struct adihdmi2 { + }; + + /* ADI recommended values for proper operation. */ +-static const struct reg_default adihdmi_fixed_registers[] = { ++static const struct reg_sequence adihdmi_fixed_registers[] = { + { 0x98, 0x03 }, + { 0x9a, 0xe0 }, + { 0x9c, 0x30 }, +-- +2.8.0.rc3 + diff --git a/version.sh b/version.sh index 429e8b3ef770628b4d9316191234692ff8682f80..0d5f5a7d4cd05467d69c65962f12921bc32e1a79 100644 --- a/version.sh +++ b/version.sh @@ -25,7 +25,7 @@ toolchain="gcc_linaro_gnueabihf_5" #Kernel/Build KERNEL_REL=4.6 KERNEL_TAG=${KERNEL_REL}-rc1 -BUILD=${build_prefix}0 +BUILD=${build_prefix}0.1 kernel_rt=".X-rtY" #v4.X-rcX + upto SHA