projects / openwrt / staging / ynezz.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ipq806x: refresh 4.19 patches
[openwrt/staging/ynezz.git] / target / linux / ipq806x / patches-4.19 / 0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch
diff --git a/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch
index 15076864562c47b0a4c2a26130956b9973879517..78a5bb41731cadc8bb791db7eee00223ef9361a4 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch
+++ b/target/linux/ipq806x/patches-4.19/0073-pinctrl-qom-use-scm_call-to-route-GPIO-irq-to-Apps.patch
@@ -11,95 +11,7 @@ to application processor. Also the scm call interface is changed.
 Change-Id: Ib6c06829d04bc8c20483c36e63da92e26cdef9ce
 Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
 ---
- drivers/firmware/qcom_scm-32.c     | 17 +++++++++++++++++
- drivers/firmware/qcom_scm-64.c     |  9 +++++++++
- drivers/firmware/qcom_scm.c        | 13 +++++++++++++
- drivers/firmware/qcom_scm.h        |  8 ++++++++
- drivers/pinctrl/qcom/pinctrl-msm.c | 34 ++++++++++++++++++++++++++++------
- include/linux/qcom_scm.h           |  3 ++-
- 6 files changed, 77 insertions(+), 7 deletions(-)
 
---- a/drivers/firmware/qcom_scm-32.c
-+++ b/drivers/firmware/qcom_scm-32.c
-@@ -561,6 +561,24 @@ int __qcom_scm_pas_mss_reset(struct devi
-       return ret ? : le32_to_cpu(out);
- }
- 
-+int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1)
-+{
-+      s32 ret;
-+
-+      ret = qcom_scm_call_atomic1(svc_id, cmd_id, arg1);
-+
-+      return ret;
-+}
-+
-+int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2)
-+{
-+      s32 ret;
-+
-+      ret = qcom_scm_call_atomic2(svc_id, cmd_id, arg1, arg2);
-+
-+ return ret;
-+}
-+
- int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id)
- {
-       struct {
---- a/drivers/firmware/qcom_scm-64.c
-+++ b/drivers/firmware/qcom_scm-64.c
-@@ -366,6 +366,16 @@ int __qcom_scm_pas_mss_reset(struct devi
-       return ret ? : res.a1;
- }
- 
-+int __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1)
-+{
-+      return -ENOTSUPP;
-+}
-+
-+int __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2)
-+{
-+      return -ENOTSUPP;
-+}
-+
- int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id)
- {
-       struct qcom_scm_desc desc = {0};
---- a/drivers/firmware/qcom_scm.c
-+++ b/drivers/firmware/qcom_scm.c
-@@ -470,3 +470,16 @@ static int __init qcom_scm_init(void)
-       return platform_driver_register(&qcom_scm_driver);
- }
- subsys_initcall(qcom_scm_init);
-+
-+int qcom_scm_pinmux_read(u32 arg1)
-+{
-+      return __qcom_scm_pinmux_read(SCM_SVC_IO_ACCESS, SCM_IO_READ, arg1);
-+}
-+EXPORT_SYMBOL(qcom_scm_pinmux_read);
-+
-+int qcom_scm_pinmux_write(u32 arg1, u32 arg2)
-+{
-+      return __qcom_scm_pinmux_write(SCM_SVC_IO_ACCESS, SCM_IO_WRITE,
-+                                      arg1, arg2);
-+}
-+EXPORT_SYMBOL(qcom_scm_pinmux_write);
---- a/drivers/firmware/qcom_scm.h
-+++ b/drivers/firmware/qcom_scm.h
-@@ -58,6 +58,13 @@ extern int  __qcom_scm_pas_auth_and_rese
- extern int  __qcom_scm_pas_shutdown(struct device *dev, u32 peripheral);
- extern int  __qcom_scm_pas_mss_reset(struct device *dev, bool reset);
- 
-+#define SCM_IO_READ   1
-+#define SCM_IO_WRITE  2
-+#define SCM_SVC_IO_ACCESS     0x5
-+
-+s32 __qcom_scm_pinmux_read(u32 svc_id, u32 cmd_id, u32 arg1);
-+s32 __qcom_scm_pinmux_write(u32 svc_id, u32 cmd_id, u32 arg1, u32 arg2);
-+
- /* common error codes */
- #define QCOM_SCM_V2_EBUSY     -12
- #define QCOM_SCM_ENOMEM               -5
 --- a/drivers/pinctrl/qcom/pinctrl-msm.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
 @@ -30,7 +30,8 @@
@@ -112,7 +24,7 @@ Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
  #include "../core.h"
  #include "../pinconf.h"
  #include "pinctrl-msm.h"
-@@ -646,6 +647,9 @@ static void msm_gpio_irq_ack(struct irq_
+@@ -628,6 +629,9 @@ static void msm_gpio_irq_mask(struct irq
        const struct msm_pingroup *g;
        unsigned long flags;
        u32 val;
@@ -122,7 +34,7 @@ Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
  
        g = &pctrl->soc->groups[d->hwirq];
  
-@@ -684,11 +688,30 @@ static int msm_gpio_irq_set_type(struct
+@@ -732,11 +736,30 @@ static int msm_gpio_irq_set_type(struct
        else
                clear_bit(d->hwirq, pctrl->dual_edge_irqs);
  
@@ -142,14 +54,14 @@ Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
 +              const __be32 *reg = of_get_property(pctrl->dev->of_node, "reg", NULL);
 +              if (reg) {
 +                      u32 addr = be32_to_cpup(reg) + g->intr_target_reg;
-+                      val = qcom_scm_pinmux_read(addr);
++                      qcom_scm_io_readl(addr, &val);
 +                      __iormb();
 +
 +                      val &= ~(7 << g->intr_target_bit);
 +                      val |= g->intr_target_kpss_val << g->intr_target_bit;
 +
 +                      __iowmb();
-+                      ret = qcom_scm_pinmux_write(addr, val);
++                      ret = qcom_scm_io_writel(addr, val);
 +                      if (ret)
 +                              pr_err("\n Routing interrupts to Apps proc failed");
 +              }
@@ -157,27 +69,3 @@ Signed-off-by: Ajay Kishore <akisho@codeaurora.org>
  
        /* Update configuration for gpio.
         * RAW_STATUS_EN is left on for all gpio irqs. Due to the
-@@ -975,4 +998,3 @@ int msm_pinctrl_remove(struct platform_d
-       return 0;
- }
- EXPORT_SYMBOL(msm_pinctrl_remove);
--
---- a/include/linux/qcom_scm.h
-+++ b/include/linux/qcom_scm.h
-@@ -43,6 +43,8 @@ extern int qcom_scm_set_remote_state(u32
- extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare);
- extern int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size);
- extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
-+extern s32 qcom_scm_pinmux_read(u32 arg1);
-+extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2);
- #else
- static inline
- int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
-@@ -73,5 +75,7 @@ qcom_scm_set_remote_state(u32 state,u32
- static inline int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) { return -ENODEV; }
- static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) { return -ENODEV; }
- static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) { return -ENODEV; }
-+extern s32 qcom_scm_pinmux_read(u32 arg1) { return -ENODEV; }
-+extern s32 qcom_scm_pinmux_write(u32 arg1, u32 arg2) { return -ENODEV; }
- #endif
- #endif
Staging tree of Petr Stetiar