[mvebu dev] moving to 4.19.y

This commit is contained in:
Igor Pecovnik 2018-11-12 17:21:05 +01:00
parent f4c0b00459
commit f04ca8bd58
5 changed files with 1738 additions and 1153 deletions

File diff suppressed because it is too large Load diff

View file

@ -36,7 +36,7 @@ case $BRANCH in
OVERLAY_PREFIX='armada-388' OVERLAY_PREFIX='armada-388'
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:linux-4.18.y' KERNELBRANCH='branch:linux-4.19.y'
KERNELDIR=$MAINLINE_KERNEL_DIR KERNELDIR=$MAINLINE_KERNEL_DIR
LINUXCONFIG='linux-mvebu-dev' LINUXCONFIG='linux-mvebu-dev'
KERNELPATCHDIR="mvebu-dev" KERNELPATCHDIR="mvebu-dev"

View file

@ -4,16 +4,17 @@ bootloader hacks that write special register values.
--- a/drivers/rtc/rtc-armada38x.c --- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c +++ b/drivers/rtc/rtc-armada38x.c
@@ -30,6 +30,9 @@ @@ -30,7 +30,10 @@
#define RTC_IRQ_FREQ_1HZ BIT(2) #define RTC_IRQ_FREQ_1HZ BIT(2)
#define RTC_CCR 0x18 #define RTC_CCR 0x18
#define RTC_CCR_MODE BIT(15) #define RTC_CCR_MODE BIT(15)
+#define RTC_CCR_NORMAL_PPB 0x2000 +#define RTC_CCR_NORMAL_PPB 0x2000
+#define RTC_TEST_CONF 0x1c #define RTC_CONF_TEST 0x1C
+#define RTC_TEST_CONF 0x1c
+#define RTC_TEST_CONF_MASK 0xff +#define RTC_TEST_CONF_MASK 0xff
#define RTC_NOMINAL_TIMING BIT(13)
#define RTC_TIME 0xC #define RTC_TIME 0xC
#define RTC_ALARM1 0x10
@@ -91,6 +94,7 @@ struct armada38x_rtc_data { @@ -91,6 +94,7 @@ struct armada38x_rtc_data {
void (*clear_isr)(struct armada38x_rtc *rtc); void (*clear_isr)(struct armada38x_rtc *rtc);
void (*unmask_interrupt)(struct armada38x_rtc *rtc); void (*unmask_interrupt)(struct armada38x_rtc *rtc);

View file

@ -301875,7 +301875,7 @@ new file mode 100644
index 0000000000000..324b45bd223fd index 0000000000000..324b45bd223fd
--- /dev/null --- /dev/null
+++ b/drivers/net/wireless/rtl8188eu/include/wifi.h +++ b/drivers/net/wireless/rtl8188eu/include/wifi.h
@@ -0,0 +1,1103 @@ @@ -0,0 +1,1105 @@
+/****************************************************************************** +/******************************************************************************
+ * + *
+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@ -302608,7 +302608,9 @@ index 0000000000000..324b45bd223fd
+ * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) + * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
+ */ + */
+#define IEEE80211_MIN_AMPDU_BUF 0x8 +#define IEEE80211_MIN_AMPDU_BUF 0x8
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0))
+#define IEEE80211_MAX_AMPDU_BUF 0x40 +#define IEEE80211_MAX_AMPDU_BUF 0x40
+#endif
+ +
+/* Spatial Multiplexing Power Save Modes */ +/* Spatial Multiplexing Power Save Modes */
+#define WLAN_HT_CAP_SM_PS_STATIC 0 +#define WLAN_HT_CAP_SM_PS_STATIC 0
@ -311898,7 +311900,7 @@ new file mode 100644
index 0000000000000..fadf117a54b6a index 0000000000000..fadf117a54b6a
--- /dev/null --- /dev/null
+++ b/drivers/net/wireless/rtl8188eu/os_dep/os_intfs.c +++ b/drivers/net/wireless/rtl8188eu/os_dep/os_intfs.c
@@ -0,0 +1,1273 @@ @@ -0,0 +1,1276 @@
+/****************************************************************************** +/******************************************************************************
+ * + *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. + * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
@ -312553,7 +312555,10 @@ index 0000000000000..fadf117a54b6a
+} +}
+ +
+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
+ ,struct net_device *sb_dev
+ ,select_queue_fallback_t fallback
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ ,void *unused + ,void *unused
+ ,select_queue_fallback_t fallback + ,select_queue_fallback_t fallback
+#elif (LINUX_VERSION_CODE == KERNEL_VERSION(3, 13, 0)) +#elif (LINUX_VERSION_CODE == KERNEL_VERSION(3, 13, 0))