diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 10:44:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 10:44:16 -0500 |
commit | aebb2afd5420c860b7fbc3882a323ef1247fbf16 (patch) | |
tree | 05ee0efcebca5ec421de44de7a6d6271088c64a8 /arch/mips/loongson/common/gpio.c | |
parent | 8eae508b7c6ff502a71d0293b69e97c5505d5840 (diff) | |
parent | edb15d83a875a1f4b1576188844db5c330c3267d (diff) |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
o Add basic support for the Mediatek/Ralink Wireless SoC family.
o The Qualcomm Atheros platform is extended by support for the new
QCA955X SoC series as well as a bunch of patches that get the code
ready for OF support.
o Lantiq and BCM47XX platform have a few improvements and bug fixes.
o MIPS has sent a few patches that get the kernel ready for the
upcoming microMIPS support.
o The rest of the series is made up of small bug fixes and cleanups
that relate to various parts of the MIPS code. The biggy in there is
a whitespace cleanup. After I was sent another set of whitespace
cleanup patches I decided it was the time to clean the whitespace
"issues" for once and and that touches many files below arch/mips/.
Fix up silly conflicts, mostly due to whitespace cleanups.
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
MIPS: remove broken conditional inside vpe loader code
MIPS: SMTC: fix implicit declaration of set_vi_handler
MIPS: early_printk: drop __init annotations
MIPS: Probe for and report hardware virtualization support.
MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
MIPS: ath79: add USB controller registration code for the QCA955X SoCs
MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
MIPS: ath79: add WMAC registration code for the QCA955X SoCs
MIPS: ath79: register UART for the QCA955X SoCs
MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
MIPS: ath79: add GPIO setup code for the QCA955X SoCs
MIPS: ath79: add IRQ handling code for the QCA955X SoCs
MIPS: ath79: add clock setup code for the QCA955X SoCs
MIPS: ath79: add SoC detection code for the QCA955X SoCs
MIPS: ath79: add early printk support for the QCA955X SoCs
MIPS: ath79: fix WMAC IRQ resource assignment
mips: reserve elfcorehdr
mips: Make sure kernel memory is in iomem
MIPS: ath79: use dynamically allocated USB platform devices
...
Diffstat (limited to 'arch/mips/loongson/common/gpio.c')
-rw-r--r-- | arch/mips/loongson/common/gpio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/loongson/common/gpio.c b/arch/mips/loongson/common/gpio.c index e8a0ffa935b4..21869908aaa4 100644 --- a/arch/mips/loongson/common/gpio.c +++ b/arch/mips/loongson/common/gpio.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * STLS2F GPIO Support | 2 | * STLS2F GPIO Support |
3 | * | 3 | * |
4 | * Copyright (c) 2008 Richard Liu, STMicroelectronics <richard.liu@st.com> | 4 | * Copyright (c) 2008 Richard Liu, STMicroelectronics <richard.liu@st.com> |
5 | * Copyright (c) 2008-2010 Arnaud Patard <apatard@mandriva.com> | 5 | * Copyright (c) 2008-2010 Arnaud Patard <apatard@mandriva.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
@@ -123,13 +123,13 @@ static void ls2f_gpio_set_value(struct gpio_chip *chip, | |||
123 | } | 123 | } |
124 | 124 | ||
125 | static struct gpio_chip ls2f_chip = { | 125 | static struct gpio_chip ls2f_chip = { |
126 | .label = "ls2f", | 126 | .label = "ls2f", |
127 | .direction_input = ls2f_gpio_direction_input, | 127 | .direction_input = ls2f_gpio_direction_input, |
128 | .get = ls2f_gpio_get_value, | 128 | .get = ls2f_gpio_get_value, |
129 | .direction_output = ls2f_gpio_direction_output, | 129 | .direction_output = ls2f_gpio_direction_output, |
130 | .set = ls2f_gpio_set_value, | 130 | .set = ls2f_gpio_set_value, |
131 | .base = 0, | 131 | .base = 0, |
132 | .ngpio = STLS2F_N_GPIO, | 132 | .ngpio = STLS2F_N_GPIO, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static int __init ls2f_gpio_setup(void) | 135 | static int __init ls2f_gpio_setup(void) |