46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
--- a/arch/mips/ath79/gpio.c
|
|
+++ b/arch/mips/ath79/gpio.c
|
|
@@ -186,6 +186,7 @@ static void __iomem *ath79_gpio_get_func
|
|
reg = AR71XX_GPIO_REG_FUNC;
|
|
else if (soc_is_ar934x() ||
|
|
soc_is_qca953x() ||
|
|
+ soc_is_qca955x() ||
|
|
soc_is_qca956x() ||
|
|
soc_is_tp9343())
|
|
reg = AR934X_GPIO_REG_FUNC;
|
|
@@ -223,15 +224,30 @@ void __init ath79_gpio_output_select(uns
|
|
{
|
|
void __iomem *base = ath79_gpio_base;
|
|
unsigned long flags;
|
|
- unsigned int reg;
|
|
+ unsigned int reg, reg_base;
|
|
+ unsigned long gpio_count;
|
|
u32 t, s;
|
|
|
|
- BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
|
|
+ if (soc_is_ar934x()) {
|
|
+ gpio_count = AR934X_GPIO_COUNT;
|
|
+ reg_base = AR934X_GPIO_REG_OUT_FUNC0;
|
|
+ } else if (soc_is_qca953x()) {
|
|
+ gpio_count = QCA953X_GPIO_COUNT;
|
|
+ reg_base = QCA953X_GPIO_REG_OUT_FUNC0;
|
|
+ } else if (soc_is_qca955x()) {
|
|
+ gpio_count = QCA955X_GPIO_COUNT;
|
|
+ reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
|
|
+ } else if (soc_is_qca956x()) {
|
|
+ gpio_count = QCA956X_GPIO_COUNT;
|
|
+ reg_base = QCA956X_GPIO_REG_OUT_FUNC0;
|
|
+ } else {
|
|
+ BUG();
|
|
+ }
|
|
|
|
- if (gpio >= AR934X_GPIO_COUNT)
|
|
+ if (gpio >= gpio_count)
|
|
return;
|
|
|
|
- reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
|
|
+ reg = reg_base + 4 * (gpio / 4);
|
|
s = 8 * (gpio % 4);
|
|
|
|
spin_lock_irqsave(&ath79_gpio_lock, flags);
|