Commit 3002b7a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver updates from Greg KH:
 "Here is the large set of staging driver changes for 6.1-rc1.

  Nothing really interesting in here at all except we deleted a driver
  (fwserial) as no one had been using it for a long time. Other than
  that, just the normal cleanups and minor fixes:

   - rtl8723bs driver cleanups

   - loads of r8188eu driver cleanups, making the driver smaller and
     fixing up some firmware dependency issues.

   - vt6655 driver cleanups.

   - lots of other small staging driver cleanups.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (266 commits)
  staging: rtl8192e: Rename variable Bandwidth to avoid CamelCase
  staging: r8188eu: remove PHY_RFConfig8188E()
  staging: r8188eu: remove PHY_RF6052_Config8188E()
  staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int
  staging: rtl8192e: cmdpkt: Use skb_put_data() instead of skb_put/memcpy pair
  staging: r8188eu: Use skb_put_data() instead of skb_put/memcpy pair
  staging: r8188eu: remove hal/odm_RegConfig8188E.c
  staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static
  staging: r8188eu: make odm_ConfigMAC_8188E() static
  staging: r8188eu: don't check for stop/removal in the blink worker
  staging: r8188eu: don't check bSurpriseRemoved in SwLedOff
  staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ...
  staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU...
  staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI
  staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc
  staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and RxReorderDr...
  staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo...
  ...
parents a0947666 4256e500

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ source "drivers/staging/board/Kconfig" 


source "drivers/staging/gdm724x/Kconfig"



source "drivers/staging/fwserial/Kconfig"



source "drivers/staging/clocking-wizard/Kconfig"



source "drivers/staging/fbtft/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ obj-$(CONFIG_USB_EMXX) += emxx_udc/ 
obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_STAGING_BOARD)	+= board/

obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/

obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/

obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clocking-wizard/

obj-$(CONFIG_FB_TFT)		+= fbtft/

obj-$(CONFIG_MOST)		+= most/

drivers/staging/fwserial/Kconfig

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config FIREWIRE_SERIAL

	tristate "TTY over Firewire"

	depends on FIREWIRE && TTY

	help

	  This enables TTY over IEEE 1394, providing high-speed serial

	  connectivity to cabled peers. This driver implements a

	  ad-hoc transport protocol and is currently limited to

	  Linux-to-Linux communication.



	  To compile this driver as a module, say M here:  the module will

	  be called firewire-serial.



if FIREWIRE_SERIAL



config FWTTY_MAX_TOTAL_PORTS

	int "Maximum number of serial ports supported"

	default "64"

	help

	  Set this to the maximum number of serial ports you want the

	  firewire-serial driver to support.



config FWTTY_MAX_CARD_PORTS

	int "Maximum number of serial ports supported per adapter"

	range 0 FWTTY_MAX_TOTAL_PORTS

	default "32"

	help

	  Set this to the maximum number of serial ports each firewire

	  adapter supports. The actual number of serial ports registered

	  is set with the module parameter "ttys".



endif

drivers/staging/fwserial/Makefile

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_FIREWIRE_SERIAL) += firewire-serial.o

firewire-serial-objs := fwserial.o dma_fifo.o

drivers/staging/fwserial/TODO

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
TODOs prior to this driver moving out of staging

------------------------------------------------

1. Implement retries for RCODE_BUSY, RCODE_NO_ACK and RCODE_SEND_ERROR

   - I/O is handled asynchronously which presents some issues when error

     conditions occur.

2. Implement _robust_ console on top of this. The existing prototype console

   driver is not ready for the big leagues yet.

3. Expose means of controlling attach/detach of peers via sysfs. Include

   GUID-to-port matching/whitelist/blacklist.



-- Issues with firewire stack --

1. This driver uses the same unregistered vendor id that the firewire core does

     (0xd00d1e). Perhaps this could be exposed as a define in

     firewire.h?