kernel: bump 6.1 to 6.1.66

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.66

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <therealgraysky@proton.me>

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 6038c652a9f948ea2e7ae32d97623ca802e7f72b..747079455a146fb9ce192c8e836500b0630b7540 100644 (file)
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .65
-LINUX_KERNEL_HASH-6.1.65 = 407229936802a44b1e484c2e9ac3bbe53a65d825cc468ccdbd76281b491ab20a
+LINUX_VERSION-6.1 = .66
+LINUX_KERNEL_HASH-6.1.66 = 419e62cd6c4239e6950b688db9e8753eb1e99c216dc3204f7932398a3fef1a0c

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0001-net-dpaa2-eth-don-t-use-ENOTSUPP-error-code.patch b/target/linux/armsr/patches-6.1/701-v6.2-0001-net-dpaa2-eth-don-t-use-ENOTSUPP-error-code.patch
index 6238c0a9039cd69cb9fd8183bcd3890c84242345..2c70b44f4b321dbb320465fd84f8d39da83fc504 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0001-net-dpaa2-eth-don-t-use-ENOTSUPP-error-code.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0001-net-dpaa2-eth-don-t-use-ENOTSUPP-error-code.patch
@@ -22,7 +22,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3613,7 +3613,7 @@ static int dpaa2_eth_setup_dpni(struct f
+@@ -3611,7 +3611,7 @@ static int dpaa2_eth_setup_dpni(struct f
                dev_err(dev, "DPNI version %u.%u not supported, need >= %u.%u\n",
                        priv->dpni_ver_major, priv->dpni_ver_minor,
                        DPNI_VER_MAJOR, DPNI_VER_MINOR);

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0003-net-dpaa2-mac-absorb-phylink_start-call-into-dpaa2_m.patch b/target/linux/armsr/patches-6.1/701-v6.2-0003-net-dpaa2-mac-absorb-phylink_start-call-into-dpaa2_m.patch
index e84195f3cd7effcef4c158cb8d7423c2667cdd50..c47598749cd090d2377cba215bec2ccca970b8ae 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0003-net-dpaa2-mac-absorb-phylink_start-call-into-dpaa2_m.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0003-net-dpaa2-mac-absorb-phylink_start-call-into-dpaa2_m.patch
@@ -21,7 +21,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -2082,10 +2082,8 @@ static int dpaa2_eth_open(struct net_dev
+@@ -2080,10 +2080,8 @@ static int dpaa2_eth_open(struct net_dev
                goto enable_err;
        }
  
@@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        return 0;
  
-@@ -2159,7 +2157,6 @@ static int dpaa2_eth_stop(struct net_dev
+@@ -2157,7 +2155,6 @@ static int dpaa2_eth_stop(struct net_dev
        int retries = 10;
  
        if (dpaa2_eth_is_type_phy(priv)) {

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0005-net-dpaa2-eth-assign-priv-mac-after-dpaa2_mac_connec.patch b/target/linux/armsr/patches-6.1/701-v6.2-0005-net-dpaa2-eth-assign-priv-mac-after-dpaa2_mac_connec.patch
index 8c7ed6c793fefa15887e9229ff7e2f184d791502..45f07decc91b0c13449df390a91a1e3bfa5ea2a4 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0005-net-dpaa2-eth-assign-priv-mac-after-dpaa2_mac_connec.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0005-net-dpaa2-eth-assign-priv-mac-after-dpaa2_mac_connec.patch
@@ -49,7 +49,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4443,9 +4443,8 @@ static int dpaa2_eth_connect_mac(struct
+@@ -4441,9 +4441,8 @@ static int dpaa2_eth_connect_mac(struct
        err = dpaa2_mac_open(mac);
        if (err)
                goto err_free_mac;
@@ -60,7 +60,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                err = dpaa2_mac_connect(mac);
                if (err && err != -EPROBE_DEFER)
                        netdev_err(priv->net_dev, "Error connecting to the MAC endpoint: %pe",
-@@ -4454,11 +4453,12 @@ static int dpaa2_eth_connect_mac(struct
+@@ -4452,11 +4451,12 @@ static int dpaa2_eth_connect_mac(struct
                        goto err_close_mac;
        }
  
@@ -74,7 +74,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  err_free_mac:
        kfree(mac);
        return err;
-@@ -4466,15 +4466,18 @@ err_free_mac:
+@@ -4464,15 +4464,18 @@ err_free_mac:
  
  static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv)
  {

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0009-net-dpaa2-eth-connect-to-MAC-before-requesting-the-e.patch b/target/linux/armsr/patches-6.1/701-v6.2-0009-net-dpaa2-eth-connect-to-MAC-before-requesting-the-e.patch
index 37831f264b8e64675577da6e54382b8e518e99d1..7c394c55db1f4a10194c545ff580076ca8b5e004 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0009-net-dpaa2-eth-connect-to-MAC-before-requesting-the-e.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0009-net-dpaa2-eth-connect-to-MAC-before-requesting-the-e.patch
@@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4710,6 +4710,10 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -4708,6 +4708,10 @@ static int dpaa2_eth_probe(struct fsl_mc
        }
  #endif
  
@@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        err = dpaa2_eth_setup_irqs(dpni_dev);
        if (err) {
                netdev_warn(net_dev, "Failed to set link interrupt, fall back to polling\n");
-@@ -4722,10 +4726,6 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -4720,10 +4724,6 @@ static int dpaa2_eth_probe(struct fsl_mc
                priv->do_link_poll = true;
        }
  

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0010-net-dpaa2-eth-serialize-changes-to-priv-mac-with-a-m.patch b/target/linux/armsr/patches-6.1/701-v6.2-0010-net-dpaa2-eth-serialize-changes-to-priv-mac-with-a-m.patch
index 89f58412d405232f230dcefc6bcf26cef2d555d6..28ffe2288c94c248c2ed3fee4841b37b6e2e3712 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0010-net-dpaa2-eth-serialize-changes-to-priv-mac-with-a-m.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0010-net-dpaa2-eth-serialize-changes-to-priv-mac-with-a-m.patch
@@ -41,7 +41,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -2020,8 +2020,11 @@ static int dpaa2_eth_link_state_update(s
+@@ -2018,8 +2018,11 @@ static int dpaa2_eth_link_state_update(s
  
        /* When we manage the MAC/PHY using phylink there is no need
         * to manually update the netif_carrier.
@@ -54,7 +54,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                goto out;
  
        /* Chech link state; speed / duplex changes are not treated yet */
-@@ -2060,6 +2063,8 @@ static int dpaa2_eth_open(struct net_dev
+@@ -2058,6 +2061,8 @@ static int dpaa2_eth_open(struct net_dev
                           priv->dpbp_dev->obj_desc.id, priv->bpid);
        }
  
@@ -63,7 +63,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        if (!dpaa2_eth_is_type_phy(priv)) {
                /* We'll only start the txqs when the link is actually ready;
                 * make sure we don't race against the link up notification,
-@@ -2078,6 +2083,7 @@ static int dpaa2_eth_open(struct net_dev
+@@ -2076,6 +2081,7 @@ static int dpaa2_eth_open(struct net_dev
  
        err = dpni_enable(priv->mc_io, 0, priv->mc_token);
        if (err < 0) {
@@ -71,7 +71,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                netdev_err(net_dev, "dpni_enable() failed\n");
                goto enable_err;
        }
-@@ -2085,6 +2091,8 @@ static int dpaa2_eth_open(struct net_dev
+@@ -2083,6 +2089,8 @@ static int dpaa2_eth_open(struct net_dev
        if (dpaa2_eth_is_type_phy(priv))
                dpaa2_mac_start(priv->mac);
  
@@ -80,7 +80,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        return 0;
  
  enable_err:
-@@ -2156,6 +2164,8 @@ static int dpaa2_eth_stop(struct net_dev
+@@ -2154,6 +2162,8 @@ static int dpaa2_eth_stop(struct net_dev
        int dpni_enabled = 0;
        int retries = 10;
  
@@ -89,7 +89,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        if (dpaa2_eth_is_type_phy(priv)) {
                dpaa2_mac_stop(priv->mac);
        } else {
-@@ -2163,6 +2173,8 @@ static int dpaa2_eth_stop(struct net_dev
+@@ -2161,6 +2171,8 @@ static int dpaa2_eth_stop(struct net_dev
                netif_carrier_off(net_dev);
        }
  
@@ -98,7 +98,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        /* On dpni_disable(), the MC firmware will:
         * - stop MAC Rx and wait for all Rx frames to be enqueued to software
         * - cut off WRIOP dequeues from egress FQs and wait until transmission
-@@ -2488,12 +2500,20 @@ static int dpaa2_eth_ts_ioctl(struct net
+@@ -2486,12 +2498,20 @@ static int dpaa2_eth_ts_ioctl(struct net
  static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  {
        struct dpaa2_eth_priv *priv = netdev_priv(dev);
@@ -121,7 +121,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        return -EOPNOTSUPP;
  }
-@@ -4453,7 +4473,9 @@ static int dpaa2_eth_connect_mac(struct
+@@ -4451,7 +4471,9 @@ static int dpaa2_eth_connect_mac(struct
                        goto err_close_mac;
        }
  
@@ -131,7 +131,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        return 0;
  
-@@ -4466,9 +4488,12 @@ err_free_mac:
+@@ -4464,9 +4486,12 @@ err_free_mac:
  
  static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv)
  {
@@ -145,7 +145,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        if (!mac)
                return;
-@@ -4487,6 +4512,7 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4485,6 +4510,7 @@ static irqreturn_t dpni_irq0_handler_thr
        struct fsl_mc_device *dpni_dev = to_fsl_mc_device(dev);
        struct net_device *net_dev = dev_get_drvdata(dev);
        struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
@@ -153,7 +153,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        int err;
  
        err = dpni_get_irq_status(dpni_dev->mc_io, 0, dpni_dev->mc_handle,
-@@ -4504,7 +4530,12 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4502,7 +4528,12 @@ static irqreturn_t dpni_irq0_handler_thr
                dpaa2_eth_update_tx_fqids(priv);
  
                rtnl_lock();
@@ -167,7 +167,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                        dpaa2_eth_disconnect_mac(priv);
                else
                        dpaa2_eth_connect_mac(priv);
-@@ -4605,6 +4636,8 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -4603,6 +4634,8 @@ static int dpaa2_eth_probe(struct fsl_mc
        priv = netdev_priv(net_dev);
        priv->net_dev = net_dev;
  

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch b/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
index 976c2a03354e0606a8652280d6fb9e3ecd8e96c5..a4ad00ef4dcf245aa44e89b5cfc6d1db5c2debe4 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
@@ -34,7 +34,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4529,7 +4529,6 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4527,7 +4527,6 @@ static irqreturn_t dpni_irq0_handler_thr
                dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
                dpaa2_eth_update_tx_fqids(priv);
  
@@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
                /* We can avoid locking because the "endpoint changed" IRQ
                 * handler is the only one who changes priv->mac at runtime,
                 * so we are not racing with anyone.
-@@ -4539,7 +4538,6 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4537,7 +4536,6 @@ static irqreturn_t dpni_irq0_handler_thr
                        dpaa2_eth_disconnect_mac(priv);
                else
                        dpaa2_eth_connect_mac(priv);

diff --git a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
index b7940da9e4fd54fac348681d5add90ee18799427..a74b2cd62fa0773d45e4ba27e534088d5c7ab0ea 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
                                      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -2996,6 +3003,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2998,6 +3005,8 @@ static int mmc_blk_probe(struct mmc_card
  {
        struct mmc_blk_data *md;
        int ret = 0;
@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        /*
         * Check that the card supports the command class(es) we need.
-@@ -3003,7 +3012,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3005,7 +3014,16 @@ static int mmc_blk_probe(struct mmc_card
        if (!(card->csd.cmdclass & CCC_BLOCK_READ))
                return -ENODEV;
  
@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        card->complete_wq = alloc_workqueue("mmc_complete",
                                        WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -3018,6 +3036,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3020,6 +3038,17 @@ static int mmc_blk_probe(struct mmc_card
                goto out_free;
        }
  
@@ -313,7 +313,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
                goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1814,7 +1814,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase);
  
  int mmc_can_erase(struct mmc_card *card)
  {

diff --git a/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch
index 4c2741eb25dc98970059115e75e577e004350d33..e4e4909510d4d4687059478e16b9d4cfe96c0354 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch
@@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
-@@ -770,6 +770,8 @@ static bool sc16is7xx_port_irq(struct sc
+@@ -771,6 +771,8 @@ static bool sc16is7xx_port_irq(struct sc
                        rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
                        if (rxlen)
                                sc16is7xx_handle_rx(port, rxlen, iir);

diff --git a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
index 923c0dc3fc2c3e3b3d228cdc6345bccccabb70a2..dfbea6258f85148a32e3d20ac8769888051951ca 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3614,6 +3614,7 @@ static int __spi_validate_bits_per_word(
+@@ -3633,6 +3633,7 @@ static int __spi_validate_bits_per_word(
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        unsigned        bad_bits, ugly_bits;
        int             status = 0;
  
-@@ -3634,6 +3635,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3653,6 +3654,14 @@ int spi_setup(struct spi_device *spi)
                (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
                 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                return -EINVAL;

diff --git a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index 6b486eb7ee935e11dc2dd5f14b4cbae57f3fc804..de9378f79ad78d9e98615e6b09867c57b7927f7d 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -1926,7 +1926,7 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1928,7 +1928,7 @@ static void mmc_blk_mq_rw_recovery(struc
                return;
        }
  

diff --git a/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch b/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
index 280993e5db7685c1695daff7c16ced5cb696fdce..4f9ad9aceff47a0569fe8c4a5743d0cbc37f671b 100644 (file)
--- a/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
+++ b/target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
@@ -212,7 +212,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static inline struct spi_driver *to_spi_driver(struct device_driver *drv)
  {
        return drv ? container_of(drv, struct spi_driver, driver) : NULL;
-@@ -682,6 +716,11 @@ struct spi_controller {
+@@ -683,6 +717,11 @@ struct spi_controller {
        void                    *dummy_rx;
        void                    *dummy_tx;
  
@@ -224,7 +224,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
        int (*fw_translate_cs)(struct spi_controller *ctlr, unsigned cs);
  
        /*
-@@ -1489,6 +1528,9 @@ spi_register_board_info(struct spi_board
+@@ -1490,6 +1529,9 @@ spi_register_board_info(struct spi_board
        { return 0; }
  #endif