pmaports/device/linux-samsung-hero2lte/01-remove-android-defines.patch
William O-D 8ebafdf992 New device: samsung-hero2lte (Samsung Galaxy S7 Edge) (!179)
Display is working in both X and wayland (tested with weston and XFCE).
Not tried with osk-sdl yet, charging-sdl seems to work fine.
USB networking and SSH is working too.

Camera subsystem disabled to prevent bootloops. This device brings its
own dtb.img format, but there's a generator in the kernel source that
is used at build time (patched to make it work properly).

[skip ci]: already built in CI successfully
2019-02-13 21:09:48 +00:00

24 lines
926 B
Diff

# This patch removes the __ANDROID__ defines that activate the macros needed for
# the connection gadget system in the kernel.
# Needed for very obvious reasons.
diff --git a/drivers/usb/gadget/function/f_conn_gadget.ioctl.h b/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
index aed3e027..3486e7a3 100644
--- a/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
+++ b/drivers/usb/gadget/function/f_conn_gadget.ioctl.h
@@ -25,8 +25,6 @@ enum {
CONN_GADGET_IOCTL_BIND_STATUS_UNBIND = 2
};
-#if defined(__ANDROID__)||defined(__TIZEN__)
-
enum {
CONN_GADGET_IOCTL_NR_0 = 0,
CONN_GADGET_IOCTL_NR_1,
@@ -42,6 +40,5 @@ enum {
#define CONN_GADGET_IOCTL_BIND_WAIT_NOTIFY _IOR(CONN_GADGET_IOCTL_MAGIC_SIG, CONN_GADGET_IOCTL_NR_1, int)
#define CONN_GADGET_IOCTL_BIND_GET_STATUS _IOR(CONN_GADGET_IOCTL_MAGIC_SIG, CONN_GADGET_IOCTL_NR_2, int)
#define CONN_GADGET_IOCTL_MAX_NR CONN_GADGET_IOCTL_NR_MAX
-#endif
#endif