Commit 900452f3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-4.14' of... 

Merge tag 'qcom-drivers-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Pull "Qualcomm ARM Based Driver Updates for v4.14" from Andy Gross:

* Minor fixes for SMSM and WCNSS_CTRL
* Move Qcom SoC drivers to submenu
* Fix mdt_loader to use request_firmware_into_buf()

* tag 'qcom-drivers-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  soc: qcom: mdt_loader: Use request_firmware_into_buf()
  soc: qcom: bring all qcom drivers into a submenu
  soc: qcom: wcnss_ctrl: add missing MODULE_DEVICE_TABLE()
  soc: qcom: smsm: fix of_node refcnting problem
parents 526ca89e 445c2410

drivers/soc/qcom/Kconfig

+4 −0
Original line number Diff line number Diff line 
#

# QCOM Soc drivers

#

menu "Qualcomm SoC drivers"



config QCOM_GSBI

        tristate "QCOM General Serial Bus Interface"

        depends on ARCH_QCOM
@@ -74,3 +76,5 @@ config QCOM_WCNSS_CTRL 
	help

	  Client driver for the WCNSS_CTRL SMD channel, used to download nv

	  firmware to a newly booted WCNSS chip.



endmenu

drivers/soc/qcom/mdt_loader.c

+2 −3
Original line number Diff line number Diff line
@@ -178,14 +178,13 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, 


		if (phdr->p_filesz) {

			sprintf(fw_name + fw_name_len - 3, "b%02d", i);

			ret = request_firmware(&seg_fw, fw_name, dev);

			ret = request_firmware_into_buf(&seg_fw, fw_name, dev,

							ptr, phdr->p_filesz);

			if (ret) {

				dev_err(dev, "failed to load %s\n", fw_name);

				break;

			}



			memcpy(ptr, seg_fw->data, seg_fw->size);



			release_firmware(seg_fw);

		}

drivers/soc/qcom/smsm.c

+2 −1
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ static int qcom_smsm_probe(struct platform_device *pdev) 
	if (!smsm->hosts)

		return -ENOMEM;



	local_node = of_find_node_with_property(pdev->dev.of_node, "#qcom,smem-state-cells");

	local_node = of_find_node_with_property(of_node_get(pdev->dev.of_node),

						"#qcom,smem-state-cells");

	if (!local_node) {

		dev_err(&pdev->dev, "no state entry\n");

		return -EINVAL;

drivers/soc/qcom/wcnss_ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static const struct of_device_id wcnss_ctrl_of_match[] = { 
	{ .compatible = "qcom,wcnss", },

	{}

};

MODULE_DEVICE_TABLE(of, wcnss_ctrl_of_match);



static struct rpmsg_driver wcnss_ctrl_driver = {

	.probe = wcnss_ctrl_probe,

CRA Git | Maintained and supported by SUSTech CRA and CCSE