Merge branch 'tracking-qcomlt-pmic-gpio' into integration-linux-qcomlt

* tracking-qcomlt-pmic-gpio:
  pinctrl: qcom: fix compiler errors.
  pinctrl:qcom:ssbi: Enable gpio mode
  pinctrl: qcom: ssbi-pmic: promote driver to sub system level
  pinctrl: Introduce pinctrl driver for Qualcomm SSBI PMIC's
  mfd: pm8921: Expose pm8xxx_read_irq_status
  pinctrl: Qualcomm SPMI PMIC MPP pin controller driver
  pinctrl: Qualcomm SPMI PMIC GPIO pin controller driver
  pinctrl: Device tree bindings for Qualcomm PMIC MPP block
  pinctrl: Device tree bindings for Qualcomm PMIC GPIO block

1 files changed, 31 insertions, 0 deletions

diff --git a/include/linux/mfd/pm8921-core.h b/include/linux/mfd/pm8921-core.h
new file mode 100644
index 000000000000..b31d785761f4
--- /dev/null
+++ b/include/linux/mfd/pm8921-core.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2014, Sony Mobile Communications AB
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MFD_PM8921_CORE_H
+#define __MFD_PM8921_CORE_H
+
+#include <linux/err.h>
+
+#if IS_ENABLED(CONFIG_MFD_PM8921_CORE)
+
+int pm8xxx_read_irq_status(int irq);
+
+#else
+static inline int pm8xxx_read_irq_status(int irq)
+{
+	return -ENOSYS;
+}
+
+#endif
+
+#endif