WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit a43ac38

Browse files
committed
Adjusted the patches to apply on top of the hardkernel tree
1 parent f631e18 commit a43ac38

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117.patch renamed to patch/kernel/archive/odroidxu4-6.6/patch-6.6.116-117-fixed.patch

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8403,8 +8403,8 @@ index 9b502e8751d18c..0f065748f9ec07 100644
84038403
{ },
84048404
};
84058405

8406-
-static const char *exynos_get_domain_name(struct device_node *node)
8407-
+static const char *exynos_get_domain_name(struct device *dev,
8406+
-static __init const char *exynos_get_domain_name(struct device_node *node)
8407+
+static __init const char *exynos_get_domain_name(struct device *dev,
84088408
+ struct device_node *node)
84098409
{
84108410
const char *name;
@@ -8416,24 +8416,15 @@ index 9b502e8751d18c..0f065748f9ec07 100644
84168416
}
84178417

84188418
static int exynos_pd_probe(struct platform_device *pdev)
8419-
@@ -115,15 +116,13 @@ static int exynos_pd_probe(struct platform_device *pdev)
8420-
if (!pd)
8421-
return -ENOMEM;
8422-
8423-
- pd->pd.name = exynos_get_domain_name(np);
8424-
+ pd->pd.name = exynos_get_domain_name(dev, np);
8425-
if (!pd->pd.name)
8426-
return -ENOMEM;
8427-
8428-
pd->base = of_iomap(np, 0);
8429-
- if (!pd->base) {
8430-
- kfree_const(pd->pd.name);
8431-
+ if (!pd->base)
8432-
return -ENODEV;
8433-
- }
8434-
8435-
pd->pd.power_off = exynos_pd_power_off;
8436-
pd->pd.power_on = exynos_pd_power_on;
8419+
@@ -120,7 +121,7 @@ static __init int exynos4_pm_init_power_domain(void)
8420+
of_node_put(np);
8421+
return -ENOMEM;
8422+
}
8423+
- pd->pd.name = exynos_get_domain_name(np);
8424+
+ pd->pd.name = exynos_get_domain_name(dev, np);
8425+
if (!pd->pd.name) {
8426+
kfree(pd);
8427+
of_node_put(np);
84378428
diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c
84388429
index 190e8a4cfa97f4..0c993780d3ef29 100644
84398430
--- a/drivers/power/supply/qcom_battmgr.c

patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118.patch renamed to patch/kernel/archive/odroidxu4-6.6/patch-6.6.117-118-fixed.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,9 @@ index 75480ec3c15a2d..fa946666969b8d 100644
530530
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
531531
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
532532
- { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
533-
{ }
534-
};
535-
533+
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
534+
{ HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
535+
{ HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
536536
@@ -1057,6 +1056,18 @@ bool hid_ignore(struct hid_device *hdev)
537537
strlen(elan_acpi_id[i].id)))
538538
return true;

0 commit comments

Comments
 (0)