diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/Kconfig (renamed from drivers/uwb/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/Makefile (renamed from drivers/uwb/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/TODO | 8 | ||||
| -rw-r--r-- | drivers/staging/uwb/address.c (renamed from drivers/uwb/address.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/allocator.c (renamed from drivers/uwb/allocator.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/beacon.c (renamed from drivers/uwb/beacon.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/driver.c (renamed from drivers/uwb/driver.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/drp-avail.c (renamed from drivers/uwb/drp-avail.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/drp-ie.c (renamed from drivers/uwb/drp-ie.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/drp.c (renamed from drivers/uwb/drp.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/est.c (renamed from drivers/uwb/est.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/hwa-rc.c (renamed from drivers/uwb/hwa-rc.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/Makefile (renamed from drivers/uwb/i1480/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/Makefile (renamed from drivers/uwb/i1480/dfu/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/dfu.c (renamed from drivers/uwb/i1480/dfu/dfu.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/i1480-dfu.h (renamed from drivers/uwb/i1480/dfu/i1480-dfu.h) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/mac.c (renamed from drivers/uwb/i1480/dfu/mac.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/phy.c (renamed from drivers/uwb/i1480/dfu/phy.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/dfu/usb.c (renamed from drivers/uwb/i1480/dfu/usb.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/uwb/i1480/i1480-est.c (renamed from drivers/uwb/i1480/i1480-est.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/ie-rcv.c (renamed from drivers/uwb/ie-rcv.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/ie.c (renamed from drivers/uwb/ie.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/include/debug-cmd.h | 57 | ||||
| -rw-r--r-- | drivers/staging/uwb/include/spec.h | 767 | ||||
| -rw-r--r-- | drivers/staging/uwb/include/umc.h | 192 | ||||
| -rw-r--r-- | drivers/staging/uwb/include/whci.h | 102 | ||||
| -rw-r--r-- | drivers/staging/uwb/lc-dev.c (renamed from drivers/uwb/lc-dev.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/lc-rc.c (renamed from drivers/uwb/lc-rc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/neh.c (renamed from drivers/uwb/neh.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/pal.c (renamed from drivers/uwb/pal.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/radio.c (renamed from drivers/uwb/radio.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/reset.c (renamed from drivers/uwb/reset.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/rsv.c (renamed from drivers/uwb/rsv.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/scan.c (renamed from drivers/uwb/scan.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/umc-bus.c (renamed from drivers/uwb/umc-bus.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/umc-dev.c (renamed from drivers/uwb/umc-dev.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/umc-drv.c (renamed from drivers/uwb/umc-drv.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/uwb-debug.c (renamed from drivers/uwb/uwb-debug.c) | 3 | ||||
| -rw-r--r-- | drivers/staging/uwb/uwb-internal.h (renamed from drivers/uwb/uwb-internal.h) | 2 | ||||
| -rw-r--r-- | drivers/staging/uwb/uwb.h | 817 | ||||
| -rw-r--r-- | drivers/staging/uwb/uwbd.c (renamed from drivers/uwb/uwbd.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/uwb/whc-rc.c (renamed from drivers/uwb/whc-rc.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/uwb/whci.c (renamed from drivers/uwb/whci.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/Documentation/wusb-cbaf | 130 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/Documentation/wusb-design-overview.rst | 457 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/Kconfig (renamed from drivers/usb/wusbcore/Kconfig) | 1 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/Makefile (renamed from drivers/usb/wusbcore/Makefile) | 2 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/TODO | 8 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/cbaf.c (renamed from drivers/usb/wusbcore/cbaf.c) | 6 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/crypto.c (renamed from drivers/usb/wusbcore/crypto.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/dev-sysfs.c (renamed from drivers/usb/wusbcore/dev-sysfs.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/devconnect.c (renamed from drivers/usb/wusbcore/devconnect.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/hwa-hc.c (renamed from drivers/usb/host/hwa-hc.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/Makefile (renamed from drivers/usb/host/whci/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/asl.c (renamed from drivers/usb/host/whci/asl.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/debug.c (renamed from drivers/usb/host/whci/debug.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/hcd.c (renamed from drivers/usb/host/whci/hcd.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/hw.c (renamed from drivers/usb/host/whci/hw.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/init.c (renamed from drivers/usb/host/whci/init.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/int.c (renamed from drivers/usb/host/whci/int.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/pzl.c (renamed from drivers/usb/host/whci/pzl.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/qset.c (renamed from drivers/usb/host/whci/qset.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/whcd.h (renamed from drivers/usb/host/whci/whcd.h) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/whci-hc.h (renamed from drivers/usb/host/whci/whci-hc.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/host/whci/wusb.c (renamed from drivers/usb/host/whci/wusb.c) | 4 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/include/association.h | 151 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/include/wusb-wa.h | 304 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/include/wusb.h | 362 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/mmc.c (renamed from drivers/usb/wusbcore/mmc.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/pal.c (renamed from drivers/usb/wusbcore/pal.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/reservation.c (renamed from drivers/usb/wusbcore/reservation.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/rh.c (renamed from drivers/usb/wusbcore/rh.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/security.c (renamed from drivers/usb/wusbcore/security.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wa-hc.c (renamed from drivers/usb/wusbcore/wa-hc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wa-hc.h (renamed from drivers/usb/wusbcore/wa-hc.h) | 6 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wa-nep.c (renamed from drivers/usb/wusbcore/wa-nep.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wa-rpipe.c (renamed from drivers/usb/wusbcore/wa-rpipe.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wa-xfer.c (renamed from drivers/usb/wusbcore/wa-xfer.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wusbhc.c (renamed from drivers/usb/wusbcore/wusbhc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/wusbcore/wusbhc.h (renamed from drivers/usb/wusbcore/wusbhc.h) | 4 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/Makefile | 2 | ||||
| -rw-r--r-- | drivers/usb/host/Kconfig | 26 | ||||
| -rw-r--r-- | drivers/usb/host/Makefile | 3 |
90 files changed, 3453 insertions, 96 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 61cf4ea2c229..e8852c09184b 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -108,8 +108,6 @@ source "drivers/hid/Kconfig" source "drivers/usb/Kconfig" -source "drivers/uwb/Kconfig" - source "drivers/mmc/Kconfig" source "drivers/memstick/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 6d37564e783c..cf046e9bd88c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -100,7 +100,6 @@ obj-$(CONFIG_ZORRO) += zorro/ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ -obj-$(CONFIG_UWB) += uwb/ obj-$(CONFIG_USB_PHY) += usb/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB_SUPPORT) += usb/ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 7c96a01eef6c..cf419d9c942d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -120,4 +120,7 @@ source "drivers/staging/kpc2000/Kconfig" source "drivers/staging/isdn/Kconfig" +source "drivers/staging/wusbcore/Kconfig" +source "drivers/staging/uwb/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index fcaac9693b83..38179bc842a8 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -50,3 +50,5 @@ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_ISDN_CAPI) += isdn/ +obj-$(CONFIG_UWB) += uwb/ +obj-$(CONFIG_USB_WUSB) += wusbcore/ diff --git a/drivers/uwb/Kconfig b/drivers/staging/uwb/Kconfig index 259e053e1e09..259e053e1e09 100644 --- a/drivers/uwb/Kconfig +++ b/drivers/staging/uwb/Kconfig diff --git a/drivers/uwb/Makefile b/drivers/staging/uwb/Makefile index 32f4de7afbd6..32f4de7afbd6 100644 --- a/drivers/uwb/Makefile +++ b/drivers/staging/uwb/Makefile diff --git a/drivers/staging/uwb/TODO b/drivers/staging/uwb/TODO new file mode 100644 index 000000000000..abae57000534 --- /dev/null +++ b/drivers/staging/uwb/TODO @@ -0,0 +1,8 @@ +TODO: Remove in late 2019 unless there are users + +There seems to not be any real wireless USB devices anywhere in the wild +anymore. It turned out to be a failed technology :( + +This will be removed from the tree if no one objects. + +Greg Kroah-Hartman <gregkh@linuxfoundation.org> diff --git a/drivers/uwb/address.c b/drivers/staging/uwb/address.c index 857d5cd56a95..857d5cd56a95 100644 --- a/drivers/uwb/address.c +++ b/drivers/staging/uwb/address.c diff --git a/drivers/uwb/allocator.c b/drivers/staging/uwb/allocator.c index 2e1590124d5f..1f429fba20b7 100644 --- a/drivers/uwb/allocator.c +++ b/drivers/staging/uwb/allocator.c @@ -6,7 +6,7 @@ */ #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/uwb.h> +#include "uwb.h" #include "uwb-internal.h" diff --git a/drivers/uwb/beacon.c b/drivers/staging/uwb/beacon.c index c483c19c5ef8..c483c19c5ef8 100644 --- a/drivers/uwb/beacon.c +++ b/drivers/staging/uwb/beacon.c diff --git a/drivers/uwb/driver.c b/drivers/staging/uwb/driver.c index 5755c2e49ffc..5755c2e49ffc 100644 --- a/drivers/uwb/driver.c +++ b/drivers/staging/uwb/driver.c diff --git a/drivers/uwb/drp-avail.c b/drivers/staging/uwb/drp-avail.c index 02392ab82a7d..02392ab82a7d 100644 --- a/drivers/uwb/drp-avail.c +++ b/drivers/staging/uwb/drp-avail.c diff --git a/drivers/uwb/drp-ie.c b/drivers/staging/uwb/drp-ie.c index 4b545b41161c..b2a862cf76de 100644 --- a/drivers/uwb/drp-ie.c +++ b/drivers/staging/uwb/drp-ie.c @@ -8,8 +8,8 @@ #include <linux/kernel.h> #include <linux/random.h> #include <linux/slab.h> -#include <linux/uwb.h> +#include "uwb.h" #include "uwb-internal.h" diff --git a/drivers/uwb/drp.c b/drivers/staging/uwb/drp.c index 869987bede7b..869987bede7b 100644 --- a/drivers/uwb/drp.c +++ b/drivers/staging/uwb/drp.c diff --git a/drivers/uwb/est.c b/drivers/staging/uwb/est.c index d4141ffdd775..d4141ffdd775 100644 --- a/drivers/uwb/est.c +++ b/drivers/staging/uwb/est.c diff --git a/drivers/uwb/hwa-rc.c b/drivers/staging/uwb/hwa-rc.c index cd03b7f827c1..b6effad749d7 100644 --- a/drivers/uwb/hwa-rc.c +++ b/drivers/staging/uwb/hwa-rc.c @@ -38,9 +38,9 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/usb.h> -#include <linux/usb/wusb.h> -#include <linux/usb/wusb-wa.h> -#include <linux/uwb.h> +#include "../wusbcore/include/wusb.h" +#include "../wusbcore/include/wusb-wa.h" +#include "uwb.h" #include "uwb-internal.h" diff --git a/drivers/uwb/i1480/Makefile b/drivers/staging/uwb/i1480/Makefile index d26fb9b845ae..d26fb9b845ae 100644 --- a/drivers/uwb/i1480/Makefile +++ b/ |