diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 20:20:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 20:20:12 -0700 |
commit | f5a8eb632b562bd9c16c389f5db3a5260fba4157 (patch) | |
tree | 82687234d772ff8f72a31e598fe16553885c56c9 /drivers/staging | |
parent | c9297d284126b80c9cfd72c690e0da531c99fc48 (diff) | |
parent | dd3b8c329aa270027fba61a02a12600972dc3983 (diff) | |
download | linux-f5a8eb632b562bd9c16c389f5db3a5260fba4157.tar.gz linux-f5a8eb632b562bd9c16c389f5db3a5260fba4157.tar.bz2 linux-f5a8eb632b562bd9c16c389f5db3a5260fba4157.zip |
Merge tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pul removal of obsolete architecture ports from Arnd Bergmann:
"This removes the entire architecture code for blackfin, cris, frv,
m32r, metag, mn10300, score, and tile, including the associated device
drivers.
I have been working with the (former) maintainers for each one to
ensure that my interpretation was right and the code is definitely
unused in mainline kernels. Many had fond memories of working on the
respective ports to start with and getting them included in upstream,
but also saw no point in keeping the port alive without any users.
In the end, it seems that while the eight architectures are extremely
different, they all suffered the same fate: There was one company in
charge of an SoC line, a CPU microarchitecture and a software
ecosystem, which was more costly than licensing newer off-the-shelf
CPU cores from a third party (typically ARM, MIPS, or RISC-V). It
seems that all the SoC product lines are still around, but have not
used the custom CPU architectures for several years at this point. In
contrast, CPU instruction sets that remain popular and have actively
maintained kernel ports tend to all be used across multiple licensees.
[ See the new nds32 port merged in the previous commit for the next
generation of "one company in charge of an SoC line, a CPU
microarchitecture and a software ecosystem" - Linus ]
The removal came out of a discussion that is now documented at
https://lwn.net/Articles/748074/. Unlike the original plans, I'm not
marking any ports as deprecated but remove them all at once after I
made sure that they are all unused. Some architectures (notably tile,
mn10300, and blackfin) are still being shipped in products with old
kernels, but those products will never be updated to newer kernel
releases.
After this series, we still have a few architectures without mainline
gcc support:
- unicore32 and hexagon both have very outdated gcc releases, but the
maintainers promised to work on providing something newer. At least
in case of hexagon, this will only be llvm, not gcc.
- openrisc, risc-v and nds32 are still in the process of finishing
their support or getting it added to mainline gcc in the first
place. They all have patched gcc-7.3 ports that work to some
degree, but complete upstream support won't happen before gcc-8.1.
Csky posted their first kernel patch set last week, their situation
will be similar
[ Palmer Dabbelt points out that RISC-V support is in mainline gcc
since gcc-7, although gcc-7.3.0 is the recommended minimum - Linus ]"
This really says it all:
2498 files changed, 95 insertions(+), 467668 deletions(-)
* tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (74 commits)
MAINTAINERS: UNICORE32: Change email account
staging: iio: remove iio-trig-bfin-timer driver
tty: hvc: remove tile driver
tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers
serial: remove tile uart driver
serial: remove m32r_sio driver
serial: remove blackfin drivers
serial: remove cris/etrax uart drivers
usb: Remove Blackfin references in USB support
usb: isp1362: remove blackfin arch glue
usb: musb: remove blackfin port
usb: host: remove tilegx platform glue
pwm: remove pwm-bfin driver
i2c: remove bfin-twi driver
spi: remove blackfin related host drivers
watchdog: remove bfin_wdt driver
can: remove bfin_can driver
mmc: remove bfin_sdh driver
input: misc: remove blackfin rotary driver
input: keyboard: remove bf54x driver
...
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/iio/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/iio/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/Kconfig | 19 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 292 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 25 | ||||
-rw-r--r-- | drivers/staging/speakup/Kconfig | 2 |
7 files changed, 1 insertions, 344 deletions
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig index 8abc1ab3c0c7..bd9445956511 100644 --- a/drivers/staging/iio/Kconfig +++ b/drivers/staging/iio/Kconfig @@ -14,6 +14,5 @@ source "drivers/staging/iio/impedance-analyzer/Kconfig" source "drivers/staging/iio/light/Kconfig" source "drivers/staging/iio/meter/Kconfig" source "drivers/staging/iio/resolver/Kconfig" -source "drivers/staging/iio/trigger/Kconfig" endmenu diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index 455bffc29649..e99a375c07b9 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile @@ -13,4 +13,3 @@ obj-y += impedance-analyzer/ obj-y += light/ obj-y += meter/ obj-y += resolver/ -obj-y += trigger/ diff --git a/drivers/staging/iio/trigger/Kconfig b/drivers/staging/iio/trigger/Kconfig deleted file mode 100644 index 0b01d24cea51..000000000000 --- a/drivers/staging/iio/trigger/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ - # -# Industrial I/O standalone triggers -# -comment "Triggers - standalone" - -if IIO_TRIGGER - -config IIO_BFIN_TMR_TRIGGER - tristate "Blackfin TIMER trigger" - depends on BLACKFIN - select BFIN_GPTIMERS - help - Provides support for using a Blackfin timer as IIO triggers. - If unsure, say N (but it's safe to say "Y"). - - To compile this driver as a module, choose M here: the - module will be called iio-trig-bfin-timer. - -endif # IIO_TRIGGER diff --git a/drivers/staging/iio/trigger/Makefile b/drivers/staging/iio/trigger/Makefile deleted file mode 100644 index 1300a21363db..000000000000 --- a/drivers/staging/iio/trigger/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for triggers not associated with iio-devices -# - -obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c deleted file mode 100644 index 71f11d7472c0..000000000000 --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Copyright 2011 Analog Devices Inc. - * - * Licensed under the GPL-2. - * - */ - -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/interrupt.h> -#include <linux/irq.h> -#include <linux/delay.h> - -#include <asm/gptimers.h> -#include <asm/portmux.h> - -#include <linux/iio/iio.h> -#include <linux/iio/trigger.h> - -#include "iio-trig-bfin-timer.h" - -struct bfin_timer { - unsigned short id, bit; - unsigned long irqbit; - int irq; - int pin; -}; - -/* - * this covers all hardware timer configurations on - * all Blackfin derivatives out there today - */ - -static struct bfin_timer iio_bfin_timer_code[MAX_BLACKFIN_GPTIMERS] = { - {TIMER0_id, TIMER0bit, TIMER_STATUS_TIMIL0, IRQ_TIMER0, P_TMR0}, - {TIMER1_id, TIMER1bit, TIMER_STATUS_TIMIL1, IRQ_TIMER1, P_TMR1}, - {TIMER2_id, TIMER2bit, TIMER_STATUS_TIMIL2, IRQ_TIMER2, P_TMR2}, -#if (MAX_BLACKFIN_GPTIMERS > 3) - {TIMER3_id, TIMER3bit, TIMER_STATUS_TIMIL3, IRQ_TIMER3, P_TMR3}, - {TIMER4_id, TIMER4bit, TIMER_STATUS_TIMIL4, IRQ_TIMER4, P_TMR4}, - {TIMER5_id, TIMER5bit, TIMER_STATUS_TIMIL5, IRQ_TIMER5, P_TMR5}, - {TIMER6_id, TIMER6bit, TIMER_STATUS_TIMIL6, IRQ_TIMER6, P_TMR6}, - {TIMER7_id, TIMER7bit, TIMER_STATUS_TIMIL7, IRQ_TIMER7, P_TMR7}, -#endif -#if (MAX_BLACKFIN_GPTIMERS > 8) - {TIMER8_id, TIMER8bit, TIMER_STATUS_TIMIL8, IRQ_TIMER8, P_TMR8}, - {TIMER9_id, TIMER9bit, TIMER_STATUS_TIMIL9, IRQ_TIMER9, P_TMR9}, - {TIMER10_id, TIMER10bit, TIMER_STATUS_TIMIL10, IRQ_TIMER10, P_TMR10}, -#if (MAX_BLACKFIN_GPTIMERS > 11) - {TIMER11_id, TIMER11bit, TIMER_STATUS_TIMIL11, IRQ_TIMER11, P_TMR11}, -#endif -#endif -}; - -struct bfin_tmr_state { - struct iio_trigger *trig; - struct bfin_timer *t; - unsigned int timer_num; - bool output_enable; - unsigned int duty; - int irq; -}; - -static int iio_bfin_tmr_set_state(struct iio_trigger *trig, bool state) -{ - struct bfin_tmr_state *st = iio_trigger_get_drvdata(trig); - - if (get_gptimer_period(st->t->id) == 0) - return -EINVAL; - - if (state) - enable_gptimers(st->t->bit); - else - disable_gptimers(st->t->bit); - - return 0; -} - -static ssize_t frequency_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct iio_trigger *trig = to_iio_trigger(dev); - struct bfin_tmr_state *st = iio_trigger_get_drvdata(trig); - unsigned int val; - bool enabled; - int ret; - - ret = kstrtouint(buf, 10, &val); - if (ret) - return ret; - - if (val > 100000) - return -EINVAL; - - enabled = get_enabled_gptimers() & st->t->bit; - - if (enabled) - disable_gptimers(st->t->bit); - - if (!val) - return count; - - val = get_sclk() / val; - if (val <= 4 || val <= st->duty) - return -EINVAL; - - set_gptimer_period(st->t->id, val); - set_gptimer_pwidth(st->t->id, val - st->duty); - - if (enabled) - enable_gptimers(st->t->bit); - - return count; -} - -static ssize_t frequency_show(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_trigger *trig = to_iio_trigger(dev); - struct bfin_tmr_state *st = iio_trigger_get_drvdata(trig); - unsigned int period = get_gptimer_period(st->t->id); - unsigned long val; - - if (!period) - val = 0; - else - val = get_sclk() / get_gptimer_period(st->t->id); - - return sprintf(buf, "%lu\n", val); -} - -static DEVICE_ATTR_RW(frequency); - -static struct attribute *iio_bfin_tmr_trigger_attrs[] = { - &dev_attr_frequency.attr, - NULL, -}; - -static const struct attribute_group iio_bfin_tmr_trigger_attr_group = { - .attrs = iio_bfin_tmr_trigger_attrs, -}; - -static const struct attribute_group *iio_bfin_tmr_trigger_attr_groups[] = { - &iio_bfin_tmr_trigger_attr_group, - NULL -}; - -static irqreturn_t iio_bfin_tmr_trigger_isr(int irq, void *devid) -{ - struct bfin_tmr_state *st = devid; - - clear_gptimer_intr(st->t->id); - iio_trigger_poll(st->trig); - - return IRQ_HANDLED; -} - -static int iio_bfin_tmr_get_number(int irq) -{ - int i; - - for (i = 0; i < MAX_BLACKFIN_GPTIMERS; i++) - if (iio_bfin_timer_code[i].irq == irq) - return i; - - return -ENODEV; -} - -static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = { - .set_trigger_state = iio_bfin_tmr_set_state, -}; - -static int iio_bfin_tmr_trigger_probe(struct platform_device *pdev) -{ - struct iio_bfin_timer_trigger_pdata *pdata; - struct bfin_tmr_state *st; - unsigned int config; - int ret; - - st = devm_kzalloc(&pdev->dev, sizeof(*st), GFP_KERNEL); - if (!st) - return -ENOMEM; - - st->irq = platform_get_irq(pdev, 0); - if (st->irq < 0) { - dev_err(&pdev->dev, "No IRQs specified"); - return st->irq; - } - - ret = iio_bfin_tmr_get_number(st->irq); - if (ret < 0) - return ret; - - st->timer_num = ret; - st->t = &iio_bfin_timer_code[st->timer_num]; - - st->trig = iio_trigger_alloc("bfintmr%d", st->timer_num); - if (!st->trig) - return -ENOMEM; - - st->trig->ops = &iio_bfin_tmr_trigger_ops; - st->trig->dev.groups = iio_bfin_tmr_trigger_attr_groups; - iio_trigger_set_drvdata(st->trig, st); - ret = iio_trigger_register(st->trig); - if (ret) - goto out; - - ret = request_irq(st->irq, iio_bfin_tmr_trigger_isr, - 0, st->trig->name, st); - if (ret) { - dev_err(&pdev->dev, - "request IRQ-%d failed", st->irq); - goto out1; - } - - config = PWM_OUT | PERIOD_CNT | IRQ_ENA; - - pdata = dev_get_platdata(&pdev->dev); - if (pdata && pdata->output_enable) { - unsigned long long val; - - st->output_enable = true; - - ret = peripheral_request(st->t->pin, st->trig->name); - if (ret) - goto out_free_irq; - - val = (unsigned long long)get_sclk() * pdata->duty_ns; - do_div(val, NSEC_PER_SEC); - st->duty = val; - - /** - * The interrupt will be generated at the end of the period, - * since we want the interrupt to be generated at end of the - * pulse we invert both polarity and duty cycle, so that the - * pulse will be generated directly before the interrupt. - */ - if (pdata->active_low) - config |= PULSE_HI; - } else { - st->duty = 1; - config |= OUT_DIS; - } - - set_gptimer_config(st->t->id, config); - - dev_info(&pdev->dev, "iio trigger Blackfin TMR%d, IRQ-%d", - st->timer_num, st->irq); - platform_set_drvdata(pdev, st); - - return 0; -out_free_irq: - free_irq(st->irq, st); -out1: - iio_trigger_unregister(st->trig); -out: - iio_trigger_free(st->trig); - return ret; -} - -static int iio_bfin_tmr_trigger_remove(struct platform_device *pdev) -{ - struct bfin_tmr_state *st = platform_get_drvdata(pdev); - - disable_gptimers(st->t->bit); - if (st->output_enable) - peripheral_free(st->t->pin); - free_irq(st->irq, st); - iio_trigger_unregister(st->trig); - iio_trigger_free(st->trig); - - return 0; -} - -static struct platform_driver iio_bfin_tmr_trigger_driver = { - .driver = { - .name = "iio_bfin_tmr_trigger", - }, - .probe = iio_bfin_tmr_trigger_probe, - .remove = iio_bfin_tmr_trigger_remove, -}; - -module_platform_driver(iio_bfin_tmr_trigger_driver); - -MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); -MODULE_DESCRIPTION("Blackfin system timer based trigger for the iio subsystem"); -MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:iio-trig-bfin-timer"); diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h b/drivers/staging/iio/trigger/iio-trig-bfin-timer.h deleted file mode 100644 index fb05a2a8397c..000000000000 --- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __IIO_BFIN_TIMER_TRIGGER_H__ -#define __IIO_BFIN_TIMER_TRIGGER_H__ - -/** - * struct iio_bfin_timer_trigger_pdata - timer trigger platform data - * @output_enable: Enable external trigger pulse generation. - * @active_low: Whether the trigger pulse is active low. - * @duty_ns: Length of the trigger pulse in nanoseconds. - * - * This struct is used to configure the output pulse generation of the blackfin - * timer trigger. If output_enable is set to true an external trigger signal - * will generated on the pin corresponding to the timer. This is useful for - * converters which needs an external signal to start conversion. active_low and - * duty_ns are used to configure the type of the trigger pulse. If output_enable - * is set to false no external trigger pulse will be generated and active_low - * and duty_ns are ignored. - **/ -struct iio_bfin_timer_trigger_pdata { - bool output_enable; - bool active_low; - unsigned int duty_ns; -}; - -#endif diff --git a/drivers/staging/speakup/Kconfig b/drivers/staging/speakup/Kconfig index 7e8037e230b8..efd6f4560d3e 100644 --- a/drivers/staging/speakup/Kconfig +++ b/drivers/staging/speakup/Kconfig @@ -1,7 +1,7 @@ menu "Speakup console speech" config SPEAKUP - depends on VT && !MN10300 + depends on VT tristate "Speakup core" ---help--- This is the Speakup screen reader. Think of it as a |