These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mfd / qcom_rpm.c

diff --git a/kernel/drivers/mfd/qcom_rpm.c b/kernel/drivers/mfd/qcom_rpm.c
index 12e3243..207a3bd 100644 (file)
--- a/kernel/drivers/mfd/qcom_rpm.c
+++ b/kernel/drivers/mfd/qcom_rpm.c
@@ -149,6 +149,7 @@ static const struct qcom_rpm_resource apq8064_rpm_resource_table[] = {
        [QCOM_RPM_USB_OTG_SWITCH] =             { 210, 125, 82, 1 },
        [QCOM_RPM_HDMI_SWITCH] =                { 211, 126, 83, 1 },
        [QCOM_RPM_DDR_DMM] =                    { 212, 127, 84, 2 },
+       [QCOM_RPM_QDSS_CLK] =                   { 214, ~0, 7, 1 },
        [QCOM_RPM_VDDMIN_GPIO] =                { 215, 131, 89, 1 },
 };
 
@@ -549,7 +550,7 @@ static int qcom_rpm_probe(struct platform_device *pdev)
        ret = devm_request_irq(&pdev->dev,
                               irq_ack,
                               qcom_rpm_ack_interrupt,
-                              IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND,
+                              IRQF_TRIGGER_RISING,
                               "qcom_rpm_ack",
                               rpm);
        if (ret) {