Commit e1ae0a7e authored by Andy Gross's avatar Andy Gross
Browse files

Merge tag 'qcom-drivers-for-4.10' into drivers-for-4.10-2 

Qualcomm ARM Based Driver Updates for v4.10

* Fixup QCOM SCM to use devm_reset_controller_register
* Add QCOM pinctrl to Qualcomm MAINTAINERS entry
* Add PM8994 regulator definitions
* Add stub for WCNSS_CTRL API
parents 1001354c bd4760ca

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1600,6 +1600,7 @@ F: arch/arm/mach-qcom/ 
F:	arch/arm64/boot/dts/qcom/*

F:	drivers/i2c/busses/i2c-qup.c

F:	drivers/clk/qcom/

F:	drivers/pinctrl/qcom/

F:	drivers/soc/qcom/

F:	drivers/spi/spi-qup.c

F:	drivers/tty/serial/msm_serial.h

drivers/firmware/qcom_scm.c

+3 −1
Original line number Diff line number Diff line
@@ -356,7 +356,9 @@ static int qcom_scm_probe(struct platform_device *pdev) 
	scm->reset.ops = &qcom_scm_pas_reset_ops;

	scm->reset.nr_resets = 1;

	scm->reset.of_node = pdev->dev.of_node;

	reset_controller_register(&scm->reset);

	ret = devm_reset_controller_register(&pdev->dev, &scm->reset);

	if (ret)

		return ret;



	/* vote for max clk rate for highest performance */

	ret = clk_set_rate(scm->core_clk, INT_MAX);

include/dt-bindings/pinctrl/qcom,pmic-gpio.h

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
#define PMA8084_GPIO_S4			2

#define PMA8084_GPIO_L6			3



#define PM8994_GPIO_VPH			0

#define PM8994_GPIO_S4			2

#define PM8994_GPIO_L12			3



/* To be used with "function" */

#define PMIC_GPIO_FUNC_NORMAL		"normal"

#define PMIC_GPIO_FUNC_PAIRED		"paired"

include/dt-bindings/pinctrl/qcom,pmic-mpp.h

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ 
#define PMA8084_MPP_S4			2

#define PMA8084_MPP_L6			3



#define PM8994_MPP_VPH			0

/* Only supported for MPP_05-MPP_08 */

#define PM8994_MPP_L19			1

#define PM8994_MPP_S4			2

#define PM8994_MPP_L12			3



/*

 * Analog Input - Set the source for analog input.

 * To be used with "qcom,amux-route" property

include/linux/soc/qcom/wcnss_ctrl.h

+13 −0
Original line number Diff line number Diff line
@@ -3,6 +3,19 @@ 


#include <linux/soc/qcom/smd.h>



#if IS_ENABLED(CONFIG_QCOM_WCNSS_CTRL)



struct qcom_smd_channel *qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb);



#else



static inline struct qcom_smd_channel*

qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb)

{

	WARN_ON(1);

	return ERR_PTR(-ENXIO);

}



#endif



#endif