Refreshed all patches.
Compile-tested on: ipq40xx, apm821xx
Runtime-tested on: ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
LINUX_VERSION-4.9 = .206
LINUX_VERSION-4.14 = .159
-LINUX_VERSION-4.19 = .90
+LINUX_VERSION-4.19 = .91
LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6
LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2
-LINUX_KERNEL_HASH-4.19.90 = 29d86c0a6daf169ec0b4b42a12f8d55dc894c52bd901f876f52a05906a5cf7fd
+LINUX_KERNEL_HASH-4.19.91 = f403c3dee12ded0af1889c78871abf7a531a978ba423f1ca772de702a92c3447
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type);
-@@ -2913,6 +2920,7 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2876,6 +2883,7 @@ static int mmc_blk_probe(struct mmc_card
{
struct mmc_blk_data *md, *part_md;
char cap_str[10];
/*
* Check that the card supports the command class(es) we need.
-@@ -2920,7 +2928,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2883,7 +2891,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV;
card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2935,9 +2952,14 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2898,9 +2915,14 @@ static int mmc_blk_probe(struct mmc_card
string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
cap_str, sizeof(cap_str));
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
-@@ -14,6 +14,7 @@
- #include <linux/module.h>
+@@ -15,6 +15,7 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
+ #include <linux/slab.h>
+#include <linux/reboot.h>
#include <linux/slab.h>
#include <soc/bcm2835/raspberrypi-firmware.h>
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1919,6 +1926,10 @@ struct net_device {
+@@ -1924,6 +1931,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
#include <linux/uaccess.h>
#include "br_private.h"
-@@ -370,6 +374,28 @@ static const struct ethtool_ops br_ethto
+@@ -376,6 +380,28 @@ static const struct ethtool_ops br_ethto
.get_link = ethtool_op_get_link,
};
static const struct net_device_ops br_netdev_ops = {
.ndo_open = br_dev_open,
.ndo_stop = br_dev_stop,
-@@ -397,6 +423,9 @@ static const struct net_device_ops br_ne
+@@ -403,6 +429,9 @@ static const struct net_device_ops br_ne
.ndo_bridge_setlink = br_setlink,
.ndo_bridge_dellink = br_dellink,
.ndo_features_check = passthru_features_check,
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1882,6 +1882,8 @@ struct net_device {
+@@ -1887,6 +1887,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
}
-@@ -7732,6 +7779,7 @@ int dev_set_mac_address(struct net_devic
+@@ -7733,6 +7780,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
-@@ -128,6 +128,7 @@
+@@ -128,6 +128,7 @@ int __init init_common(struct tsens_devi
{
void __iomem *base;
struct resource *res;
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1925,6 +1925,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1926,6 +1926,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
static int kernel_init(void *);
extern void init_IRQ(void);
-@@ -594,6 +598,18 @@ asmlinkage __visible void __init start_k
+@@ -593,6 +597,18 @@ asmlinkage __visible void __init start_k
pr_notice("Kernel command line: %s\n", boot_command_line);
/* parameters may set static keys */
jump_label_init();
/* Set the Max TLP size to 2K, instead of using default of 4K */
-@@ -1369,6 +1377,8 @@ static int qcom_pcie_probe(struct platfo
+@@ -1367,6 +1375,8 @@ static int qcom_pcie_probe(struct platfo
struct dw_pcie *pci;
struct qcom_pcie *pcie;
int ret;
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
if (!pcie)
-@@ -1391,6 +1401,9 @@ static int qcom_pcie_probe(struct platfo
- if (IS_ERR(pcie->reset))
- return PTR_ERR(pcie->reset);
+@@ -1397,6 +1407,9 @@ static int qcom_pcie_probe(struct platfo
+ goto err_pm_runtime_put;
+ }
+ of_property_read_u32(np, "force_gen1", &force_gen1);
+ pcie->force_gen1 = force_gen1;
+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "parf");
pcie->parf = devm_ioremap_resource(dev, res);
- if (IS_ERR(pcie->parf))
+ if (IS_ERR(pcie->parf)) {
#define QCOM_PCIE_2_1_0_MAX_SUPPLY 3
struct qcom_pcie_resources_2_1_0 {
struct clk *iface_clk;
-@@ -1453,6 +1461,35 @@ static int qcom_pcie_probe(struct platfo
- return 0;
+@@ -1475,6 +1483,35 @@ err_pm_runtime_put:
+ return ret;
}
+static void qcom_pcie_fixup_final(struct pci_dev *dev)
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
-@@ -606,6 +606,9 @@ static const struct of_device_id qcom_sc
+@@ -609,6 +609,9 @@ static const struct of_device_id qcom_sc
{ .compatible = "qcom,scm-ipq4019",
.data = NULL, /* no clocks */
},
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -653,6 +653,7 @@
+@@ -625,6 +625,7 @@
reg = <0x800000 0x4000>;
gpio-controller;
projects / openwrt / staging / lynxis.git / commitdiff