diff options
| author | Koen Vandeputte <koen.vandeputte@citymesh.com> | 2021-03-29 11:43:31 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2021-04-09 15:43:38 +0200 |
| commit | c43c434b5851f585adf154e6278620870e12c861 (patch) | |
| tree | 716d74f7b62ff2ccc4c2dd3736f8d178ca2f6018 /target/linux/layerscape | |
| parent | 81266d900104d657275aa5df3fb7629f7892c57a (diff) | |
| download | upstream-c43c434b5851f585adf154e6278620870e12c861.tar.gz upstream-c43c434b5851f585adf154e6278620870e12c861.tar.bz2 upstream-c43c434b5851f585adf154e6278620870e12c861.zip | |
kernel: bump 4.14 to 4.14.227
Refreshed all patches.
Altered patches:
- 809-flexcan-support-layerscape.patch
Compile-tested on: ar71xx, cns3xxx, imx6, layerscape, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@citymesh.com>
Diffstat (limited to 'target/linux/layerscape')
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 66f54684e1..f54c29c324 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -539,7 +539,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2349,7 +2349,8 @@ int register_netdevice_notifier(struct n +@@ -2350,7 +2350,8 @@ int register_netdevice_notifier(struct n int unregister_netdevice_notifier(struct notifier_block *nb); struct netdev_notifier_info { @@ -549,7 +549,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> }; struct netdev_notifier_info_ext { -@@ -2381,6 +2382,7 @@ static inline void netdev_notifier_info_ +@@ -2382,6 +2383,7 @@ static inline void netdev_notifier_info_ struct net_device *dev) { info->dev = dev; @@ -557,7 +557,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } static inline struct net_device * -@@ -2389,6 +2391,12 @@ netdev_notifier_info_to_dev(const struct +@@ -2390,6 +2392,12 @@ netdev_notifier_info_to_dev(const struct return info->dev; } diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 89390320e9..6371e99575 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -1340,7 +1340,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> while (ep_ring->dequeue != td->last_trb) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1605,13 +1605,38 @@ static int xhci_urb_dequeue(struct usb_h +@@ -1615,13 +1615,38 @@ static int xhci_urb_dequeue(struct usb_h ret = -ENOMEM; goto done; } diff --git a/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch b/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch index d1849a5699..b2ac8a0096 100644 --- a/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch @@ -161,7 +161,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> - reg = flexcan_read(®s->mcr); + reg = priv->read(®s->mcr); - reg |= FLEXCAN_MCR_HALT; + reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT; - flexcan_write(reg, ®s->mcr); + priv->write(reg, ®s->mcr); @@ -527,7 +527,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> flexcan_transceiver_disable(priv); priv->can.state = CAN_STATE_STOPPED; -@@ -1209,26 +1226,26 @@ static int register_flexcandev(struct ne +@@ -1209,9 +1226,9 @@ static int register_flexcandev(struct ne err = flexcan_chip_disable(priv); if (err) goto out_disable_per; @@ -539,13 +539,13 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> err = flexcan_chip_enable(priv); if (err) +@@ -1223,16 +1240,16 @@ static int register_flexcandev(struct ne goto out_chip_disable; - /* set freeze, halt and activate FIFO, restrict register access */ + /* activate FIFO, restrict register access */ - reg = flexcan_read(®s->mcr); + reg = priv->read(®s->mcr); - reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT | - FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV; + reg |= FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV; - flexcan_write(reg, ®s->mcr); + priv->write(reg, ®s->mcr); @@ -559,7 +559,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> if (!(reg & FLEXCAN_MCR_FEN)) { netdev_err(dev, "Could not enable RX FIFO, unsupported core\n"); err = -ENODEV; -@@ -1256,8 +1273,12 @@ static void unregister_flexcandev(struct +@@ -1260,8 +1277,12 @@ static void unregister_flexcandev(struct static const struct of_device_id flexcan_of_match[] = { { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, @@ -572,7 +572,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, flexcan_of_match); -@@ -1337,6 +1358,21 @@ static int flexcan_probe(struct platform +@@ -1341,6 +1362,21 @@ static int flexcan_probe(struct platform dev->flags |= IFF_ECHO; priv = netdev_priv(dev); diff --git a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch index cc2d72290f..b89916b55d 100644 --- a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch @@ -22,7 +22,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c -@@ -1173,6 +1173,9 @@ static int mmc_select_hs400(struct mmc_c +@@ -1180,6 +1180,9 @@ static int mmc_select_hs400(struct mmc_c goto out_err; /* Switch card to DDR */ |