OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 110... Line 110...
110 +#include <linux/qcom_scm.h> 110 +#include <linux/qcom_scm.h>
111 +#include <linux/io.h> 111 +#include <linux/io.h>
112 #include "../core.h" 112 #include "../core.h"
113 #include "../pinconf.h" 113 #include "../pinconf.h"
114 #include "pinctrl-msm.h" 114 #include "pinctrl-msm.h"
115 @@ -646,6 +647,9 @@ static void msm_gpio_irq_ack(struct irq_ 115 @@ -638,6 +639,9 @@ static void msm_gpio_irq_ack(struct irq_
116 const struct msm_pingroup *g; 116 const struct msm_pingroup *g;
117 unsigned long flags; 117 unsigned long flags;
118 u32 val; 118 u32 val;
119 + u32 addr; 119 + u32 addr;
120 + int ret; 120 + int ret;
121 + const __be32 *reg; 121 + const __be32 *reg;
Line 122... Line 122...
122 122
Line 123... Line 123...
123 g = &pctrl->soc->groups[d->hwirq]; 123 g = &pctrl->soc->groups[d->hwirq];
124 124
125 @@ -684,11 +688,30 @@ static int msm_gpio_irq_set_type(struct 125 @@ -676,11 +680,30 @@ static int msm_gpio_irq_set_type(struct
Line 126... Line 126...
126 else 126 else
127 clear_bit(d->hwirq, pctrl->dual_edge_irqs); 127 clear_bit(d->hwirq, pctrl->dual_edge_irqs);
Line 155... Line 155...
155 + } 155 + }
156 + } 156 + }
Line 157... Line 157...
157 157
158 /* Update configuration for gpio. 158 /* Update configuration for gpio.
159 * RAW_STATUS_EN is left on for all gpio irqs. Due to the 159 * RAW_STATUS_EN is left on for all gpio irqs. Due to the
160 @@ -975,4 +998,3 @@ int msm_pinctrl_remove(struct platform_d 160 @@ -954,4 +977,3 @@ int msm_pinctrl_remove(struct platform_d
161 return 0; 161 return 0;
162 } 162 }
163 EXPORT_SYMBOL(msm_pinctrl_remove); 163 EXPORT_SYMBOL(msm_pinctrl_remove);
164 - 164 -