From: Shengzui You youshengzui@huawei.com
driver inclusion category: bugfix bugzilla: NA CVE: NA
-----------------------------------
Reviewed-by: Weiwei Deng dengweiwei@huawei.com Reviewed-by: Zhaohui Zhong zhongzhaohui@huawei.com Reviewed-by: Junxin Chen chenjunxin1@huawei.com Signed-off-by: Shengzui You youshengzui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h index cd1636e6dd65..343e036412d4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h @@ -36,14 +36,14 @@ typedef void (*nic_event_fn_t) (struct net_device *netdev, enum hnae3_event_type_custom);
/** - * nic_register_event - register for nic event listening + * nic_register_event - register for nic event handling * @event_call: nic event handler * return 0 - success , negative - fail */ int nic_register_event(nic_event_fn_t event_call);
/** - * nic_unregister_event - quit nic event listening + * nic_unregister_event - quit nic event handling * return 0 - success , negative - fail */ int nic_unregister_event(void);
From: Shengzui You youshengzui@huawei.com
driver inclusion category: bugfix bugzilla: NA CVE: NA
---------------------------------------------
This patch is used to update hns3 version to 1.9.38.8
Reviewed-by: Weiwei Deng dengweiwei@huawei.com Reviewed-by: Zhaohui Zhong zhongzhaohui@huawei.com Reviewed-by: Junxin Chen chenjunxin1@huawei.com Signed-off-by: Shengzui You youshengzui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index 6514d4ba2183..89906220e233 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -30,7 +30,7 @@ #include <linux/pci.h> #include <linux/types.h>
-#define HNAE3_MOD_VERSION "1.9.38.7" +#define HNAE3_MOD_VERSION "1.9.38.8"
#define HNAE3_MIN_VECTOR_NUM 2 /* first one for misc, another for IO */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h index 83c68e80fff6..4f9826ac18ad 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h @@ -4,7 +4,7 @@ #ifndef __HNS3_CAE_VERSION_H__ #define __HNS3_CAE_VERSION_H__
-#define HNS3_CAE_MOD_VERSION "1.9.38.7" +#define HNS3_CAE_MOD_VERSION "1.9.38.8"
#define CMT_ID_LEN 8 #define RESV_LEN 3 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h index 14052304b90c..4d0cef5a06da 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h @@ -8,7 +8,7 @@
#include "hnae3.h"
-#define HNS3_MOD_VERSION "1.9.38.7" +#define HNS3_MOD_VERSION "1.9.38.8"
extern char hns3_driver_version[];
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index e18b08d78849..a834b5d35226 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -12,7 +12,7 @@ #include "hclge_cmd.h" #include "hnae3.h"
-#define HCLGE_MOD_VERSION "1.9.38.7" +#define HCLGE_MOD_VERSION "1.9.38.8" #define HCLGE_DRIVER_NAME "hclge"
#define HCLGE_MAX_PF_NUM 8 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h index afff1ca1988e..8396ea21a454 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h @@ -10,7 +10,7 @@ #include "hclgevf_cmd.h" #include "hnae3.h"
-#define HCLGEVF_MOD_VERSION "1.9.38.7" +#define HCLGEVF_MOD_VERSION "1.9.38.8" #define HCLGEVF_DRIVER_NAME "hclgevf"
#define HCLGEVF_MAX_VLAN_ID 4095
From: Ding Tianhong dingtianhong@huawei.com
ascend inclusion category: feature bugzilla: NA CVE: NA
-------------------------------------------------
The spi-cpld device is used for ascend610 evb platform and would be initialized by default value at probe time.
Signed-off-by: Ding Tianhong dingtianhong@huawei.com Reviewed-by: Hanjun Guo guohanjun@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/spi/spidev.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index e444e7cc6968..3eb57f6de607 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -672,11 +672,34 @@ static const struct file_operations spidev_fops = { static struct class *spidev_class;
#ifdef CONFIG_OF + +static void spi_cpld_init(struct spi_device *spi) +{ + int ret; + unsigned int chip_select, mode; + + ret = of_property_read_u32(spi->dev.of_node, "reg", &(chip_select)); + if (ret != 0) + dev_warn(&spi->dev, "of_property_read_u8 get chip_select fail\n"); + + spi->chip_select = (u8)(chip_select); + ret = of_property_read_u32(spi->dev.of_node, "mode", &(mode)); + if (ret != 0) + dev_warn(&spi->dev, "of_property_read_u16 get num-cs fail\n"); + + spi->mode = (u16)(mode); + ret = of_property_read_u32(spi->dev.of_node, "spi-max-frequency", + &(spi->max_speed_hz)); + if (ret != 0) + dev_warn(&spi->dev, "of_property_read_u32 get spi-max-frequency fail\n"); +} + static const struct of_device_id spidev_dt_ids[] = { { .compatible = "rohm,dh2228fv" }, { .compatible = "lineartechnology,ltc2488" }, { .compatible = "ge,achc" }, { .compatible = "semtech,sx1301" }, + { .compatible = "spi-cpld", .data = spi_cpld_init, }, {}, }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); @@ -727,6 +750,8 @@ static int spidev_probe(struct spi_device *spi) int status; unsigned long minor;
+ void (*spi_init)(struct spi_device *dev); + /* * spidev should never be referenced in DT without a specific * compatible string, it is a Linux implementation thing @@ -738,6 +763,10 @@ static int spidev_probe(struct spi_device *spi)
spidev_probe_acpi(spi);
+ spi_init = of_device_get_match_data(&spi->dev); + if (spi_init) + spi_init(spi); + /* Allocate driver data */ spidev = kzalloc(sizeof(*spidev), GFP_KERNEL); if (!spidev)
-
Yang Yingliang