summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarna Csorogi2017-04-30 11:13:31 +0200
committerBarna Csorogi2017-04-30 11:13:31 +0200
commitec30f155f5db1acbfc1be9dd25783d5244dca40a (patch)
tree0c2e0baaf20d0335bda9bf578b9103491c60d6f5
parent2879047ca86ccd2cf9c9cd5570c1f70057c4c903 (diff)
downloadaur-ec30f155f5db1acbfc1be9dd25783d5244dca40a.tar.gz
add patch for dmi product family support
-rw-r--r--PKGBUILD4
-rw-r--r--dmi_product_family.diff44
2 files changed, 48 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index bee1ad6bc68e..a6d318aad219 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,11 @@ options=('!strip')
source=("git+https://github.com/GalliumOS/linux.git#branch=v${pkgver}"
# standard config files for mkinitcpio ramdisk
"${pkgbase}.preset"
+ "dmi_product_family.diff"
"cherryview-pinctrl.diff")
sha256sums=('SKIP'
'7f9b77e1ac3b59453f6bb3858d0549c3022e6ae93ca3978427d96ae23f87e451'
+ '949990c191638f63f1906dbd7f4be8b82b40da94ef873b15af68c9e726b13c51'
'SKIP')
_kernelname=${pkgbase#linux}
@@ -28,6 +30,8 @@ _kernelname=${pkgbase#linux}
prepare() {
cd "${_srcname}"
+ patch -p1 < ${srcdir}/dmi_product_family.diff
+
cp $srcdir/cherryview-pinctrl.diff galliumos/diffs/
rm galliumos/diffs/increase-cherryview-num-irqs.diff
sed -i 's/increase-cherryview-num-irqs.diff/cherryview-pinctrl.diff/' \
diff --git a/dmi_product_family.diff b/dmi_product_family.diff
new file mode 100644
index 000000000000..92a5cbbbee10
--- /dev/null
+++ b/dmi_product_family.diff
@@ -0,0 +1,44 @@
+diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
+index 44c01390d..dc269cb28 100644
+--- a/drivers/firmware/dmi-id.c
++++ b/drivers/firmware/dmi-id.c
+@@ -47,6 +47,7 @@ DEFINE_DMI_ATTR_WITH_SHOW(product_name, 0444, DMI_PRODUCT_NAME);
+ DEFINE_DMI_ATTR_WITH_SHOW(product_version, 0444, DMI_PRODUCT_VERSION);
+ DEFINE_DMI_ATTR_WITH_SHOW(product_serial, 0400, DMI_PRODUCT_SERIAL);
+ DEFINE_DMI_ATTR_WITH_SHOW(product_uuid, 0400, DMI_PRODUCT_UUID);
++DEFINE_DMI_ATTR_WITH_SHOW(product_family, 0400, DMI_PRODUCT_FAMILY);
+ DEFINE_DMI_ATTR_WITH_SHOW(board_vendor, 0444, DMI_BOARD_VENDOR);
+ DEFINE_DMI_ATTR_WITH_SHOW(board_name, 0444, DMI_BOARD_NAME);
+ DEFINE_DMI_ATTR_WITH_SHOW(board_version, 0444, DMI_BOARD_VERSION);
+@@ -191,6 +192,7 @@ static void __init dmi_id_init_attr_table(void)
+ ADD_DMI_ATTR(product_version, DMI_PRODUCT_VERSION);
+ ADD_DMI_ATTR(product_serial, DMI_PRODUCT_SERIAL);
+ ADD_DMI_ATTR(product_uuid, DMI_PRODUCT_UUID);
++ ADD_DMI_ATTR(product_family, DMI_PRODUCT_FAMILY);
+ ADD_DMI_ATTR(board_vendor, DMI_BOARD_VENDOR);
+ ADD_DMI_ATTR(board_name, DMI_BOARD_NAME);
+ ADD_DMI_ATTR(board_version, DMI_BOARD_VERSION);
+diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
+index 54be60ead..93f7acdaa 100644
+--- a/drivers/firmware/dmi_scan.c
++++ b/drivers/firmware/dmi_scan.c
+@@ -430,6 +430,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
+ dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
+ dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
+ dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
++ dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);
+ break;
+ case 2: /* Base Board Information */
+ dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
+diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+index 8a57f0b12..909c0b0eb 100644
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h
+@@ -457,6 +457,7 @@ enum dmi_field {
+ DMI_PRODUCT_VERSION,
+ DMI_PRODUCT_SERIAL,
+ DMI_PRODUCT_UUID,
++ DMI_PRODUCT_FAMILY,
+ DMI_BOARD_VENDOR,
+ DMI_BOARD_NAME,
+ DMI_BOARD_VERSION,