mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
f577cb25c0
The following patches were dropped because they are already applied
upstream:
- 0038-MIPS-lantiq-fpi-on-ar9.patch
- 0039-MIPS-lantiq-initialize-usb-on-boot.patch
- 0042-USB-DWC2-big-endian-support.patch
- 0043-gpio-stp-xway-fix-phy-mask.patch
All other patches were simply refreshed, except the following:
- 0001-MIPS-lantiq-add-pcie-driver.patch
Changes to arch/mips/lantiq/xway/sysctrl.c (these changes disabled
some PMU gates for the vrx200 / VR9 SoCs) were removed since the
upstream kernel disables unused PMU gates automatically (since
95135bfa7ead1becc2879230f72583dde2b71a0c
"MIPS: Lantiq: Deactivate most of the devices by default").
- 0025-NET-MIPS-lantiq-adds-xrx200-net.patch
Since OpenWrt commit 55ba20afcc drivers
should use of_get_mac_address(). of_get_mac_address_mtd is not
available for drivers anymore since it's called automatically within
of_get_mac_address().
- 0028-NET-lantiq-various-etop-fixes.patch
Same changes as in 0025-NET-MIPS-lantiq-adds-xrx200-net.patch
While refreshing the kernel configuration SPI support had to be moved to
config-4.4 because otherwise M25P80 was disabled.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 48307
69 lines
1.9 KiB
Diff
69 lines
1.9 KiB
Diff
From 25494c55a4007a1409f53ddbafd661636e47ea34 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Fri, 9 Aug 2013 20:38:15 +0200
|
|
Subject: [PATCH 12/36] pinctrl/lantiq: fix up pinmux
|
|
|
|
We found out how to set the gphy led pinmuxing.
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/pinctrl/pinctrl-xway.c | 28 ++++++++++++++++++++++++++--
|
|
1 file changed, 26 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/pinctrl-xway.c
|
|
+++ b/drivers/pinctrl/pinctrl-xway.c
|
|
@@ -609,10 +609,9 @@ static struct pinctrl_desc xway_pctrl_de
|
|
.confops = &xway_pinconf_ops,
|
|
};
|
|
|
|
-static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
|
|
+static int mux_apply(struct ltq_pinmux_info *info,
|
|
int pin, int mux)
|
|
{
|
|
- struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctrldev);
|
|
int port = PORT(pin);
|
|
u32 alt1_reg = GPIO_ALT1(pin);
|
|
|
|
@@ -632,6 +631,14 @@ static inline int xway_mux_apply(struct
|
|
return 0;
|
|
}
|
|
|
|
+static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
|
|
+ int pin, int mux)
|
|
+{
|
|
+ struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctrldev);
|
|
+
|
|
+ return mux_apply(info, pin, mux);
|
|
+}
|
|
+
|
|
static const struct ltq_cfg_param xway_cfg_params[] = {
|
|
{"lantiq,pull", LTQ_PINCONF_PARAM_PULL},
|
|
{"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN},
|
|
@@ -682,6 +689,18 @@ static int xway_gpio_dir_out(struct gpio
|
|
return 0;
|
|
}
|
|
|
|
+static int xway_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
|
|
+{
|
|
+ struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev);
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < info->num_exin; i++)
|
|
+ if (info->exin[i] == offset)
|
|
+ return ltq_eiu_get_irq(i);
|
|
+
|
|
+ return -1;
|
|
+}
|
|
+
|
|
static struct gpio_chip xway_chip = {
|
|
.label = "gpio-xway",
|
|
.direction_input = xway_gpio_dir_in,
|
|
@@ -690,6 +709,7 @@ static struct gpio_chip xway_chip = {
|
|
.set = xway_gpio_set,
|
|
.request = gpiochip_generic_request,
|
|
.free = gpiochip_generic_free,
|
|
+ .to_irq = xway_gpio_to_irq,
|
|
.base = -1,
|
|
};
|
|
|