]> Git Repo - linux.git/commitdiff
Merge tag 'staging-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <[email protected]>
Mon, 5 Jul 2021 21:01:53 +0000 (14:01 -0700)
committerLinus Torvalds <[email protected]>
Mon, 5 Jul 2021 21:01:53 +0000 (14:01 -0700)
Pull staging / IIO driver updates from Greg KH:
 "Here is the big set of IIO and staging driver patches for 5.14-rc1.

  Loads of IIO driver updates and additions in here, the shortlog has
  the full details.

  For the staging side, we moved a few drivers out of staging, and
  deleted the kpc2000 drivers as the original developer asked us to
  because no one was working on them anymore.

  Also in here are loads of coding style cleanups due to different
  intern projects focusing on the staging tree to try to get experience
  doing kernel development.

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

* tag 'staging-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (744 commits)
  staging: hi6421-spmi-pmic: cleanup some macros
  staging: hi6421-spmi-pmic: change identation of a table
  staging: hi6421-spmi-pmic: change a return code
  staging: hi6421-spmi-pmic: better name IRQs
  staging: hi6421-spmi-pmic: use devm_request_threaded_irq()
  staging: hisilicon,hi6421-spmi-pmic.yaml: cleanup descriptions
  spmi: hisi-spmi-controller: move driver from staging
  phy: phy-hi3670-usb3: move driver from staging into phy
  staging: rtl8188eu: remove include/rtw_debug.h header
  staging: rtl8188eu: remove GlobalDebugLevel variable
  staging: rtl8188eu: remove DRIVER_PREFIX preprocessor definition
  staging: rtl8188eu: remove RT_TRACE macro
  staging: rtl8188eu: remove all RT_TRACE calls from hal/rtl8188eu_recv.c
  staging: rtl8188eu: remove all RT_TRACE calls from hal/hal_intf.c
  staging: rtl8188eu: remove all RT_TRACE calls from hal/rtl8188eu_xmit.c
  staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_xmit.c
  staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_pwrctrl.c
  staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_recv.c
  staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_ioctl_set.c
  staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_ieee80211.c
  ...

1  2 
Documentation/ABI/testing/sysfs-bus-iio
Documentation/devicetree/bindings/trivial-devices.yaml
MAINTAINERS
drivers/staging/mt7621-dts/mt7621.dtsi
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
include/linux/i2c.h

index 6f98b6a9b78548621f22f082c248880195925850,29c1097c5722357a3e12bca24048f590730a00bc..6ad47a67521c74ccbc5f7cf577a113e29330d45a
  Description:
                Hardware applied calibration offset (assumed to fix production
                inaccuracies).
+               icm42600: For this device values are real physical offsets
+               expressed in SI units (m/s^2 for accelerometers and rad/s
+               for gyroscope)/
+ What:         /sys/bus/iio/devices/iio:deviceX/in_accel_calibbias_available
+ What:         /sys/bus/iio/devices/iio:deviceX/in_anglvel_calibbias_available
+ KernelVersion:  5.8
+ Contact:        [email protected]
+ Description:
+               Available values of calibbias. Maybe expressed as either of:
+               - a small discrete set of values like "0 2 4 6 8"
+               - a range specified as "[min step max]"
  
  What:         /sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
  What:         /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_calibscale
@@@ -652,6 -665,25 +665,25 @@@ Description
                Output frequency for channel Y in Hz. The number must always be
                specified and unique if the output corresponds to a single
                channel.
+               Some drivers have additional constraints:
+               ADF4371 has an integrated VCO with fundamendal output
+               frequency ranging from 4000000000 Hz 8000000000 Hz.
+               out_altvoltage0_frequency:
+                       A divide by 1, 2, 4, 8, 16, 32 or circuit generates
+                       frequencies from 62500000 Hz to 8000000000 Hz.
+               out_altvoltage1_frequency:
+                       This channel duplicates the channel 0 frequency
+               out_altvoltage2_frequency:
+                       A frequency doubler generates frequencies from
+                       8000000000 Hz to 16000000000 Hz.
+               out_altvoltage3_frequency:
+                       A frequency quadrupler generates frequencies from
+                       16000000000 Hz to 32000000000 Hz.
+               Note: writes to one of the channels will affect the frequency of
+               all the other channels, since it involves changing the VCO
+               fundamental output frequency.
  
  What:         /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
  KernelVersion:        3.4.0
@@@ -663,6 -695,17 +695,17 @@@ Description
                specified and unique if the output corresponds to a single
                channel.
  
+ What:         /sys/bus/iio/devices/iio:deviceX/out_currentY_raw
+ Date:         May 2012
+ KernelVersion:        3.5
+ Contact:      Johan Hovold <[email protected]>
+ Description:
+               Set/get output current for channel Y. Units after application
+               of scale and offset are milliamps.
+               For some devices current channels are used to specify
+               current supplied to elements used in taking a measurement
+               of a different type. E.g. LED currents.
  What:         /sys/bus/iio/devices/iio:deviceX/events
  KernelVersion:        2.6.35
  Contact:      [email protected]
@@@ -786,7 -829,7 +829,7 @@@ What:              /sys/.../events/in_capacitanceY_
  What:         /sys/.../events/in_capacitanceY_adaptive_thresh_falling_en
  KernelVersion:        5.13
  Contact:      [email protected]
 -Descrption:
 +Description:
                Adaptive thresholds are similar to normal fixed thresholds
                but the value is expressed as an offset from a value which
                provides a low frequency approximation of the channel itself.
@@@ -798,10 -841,10 +841,10 @@@ What:           /sys/.../in_capacitanceY_adaptiv
  What:         /sys/.../in_capacitanceY_adaptive_thresh_falling_timeout
  KernelVersion:        5.11
  Contact:      [email protected]
 -Descrption:
 +Description:
                When adaptive thresholds are used, the tracking signal
                may adjust too slowly to step changes in the raw signal.
 -              *_timeout (in seconds) specifies a time for which the
 +              Thus these specify the time in seconds for which the
                difference between the slow tracking signal and the raw
                signal is allowed to remain out-of-range before a reset
                event occurs in which the tracking signal is made equal
@@@ -1195,16 -1238,12 +1238,12 @@@ Description
                The name of the trigger source being used, as per string given
                in /sys/class/iio/triggerY/name.
  
- What:         /sys/bus/iio/devices/iio:deviceX/buffer/length
- KernelVersion:        2.6.35
  What:         /sys/bus/iio/devices/iio:deviceX/bufferY/length
  KernelVersion:        5.11
  Contact:      [email protected]
  Description:
                Number of scans contained by the buffer.
  
- What:         /sys/bus/iio/devices/iio:deviceX/buffer/enable
- KernelVersion:        2.6.35
  What:         /sys/bus/iio/devices/iio:deviceX/bufferY/enable
  KernelVersion:        5.11
  Contact:      [email protected]
@@@ -1212,8 -1251,6 +1251,6 @@@ Description
                Actually start the buffer capture up.  Will start trigger
                if first device and appropriate.
  
- What:         /sys/bus/iio/devices/iio:deviceX/scan_elements
- KernelVersion:        2.6.37
  What:         /sys/bus/iio/devices/iio:deviceX/bufferY
  KernelVersion:        5.11
  Contact:      [email protected]
@@@ -1224,34 -1261,6 +1261,6 @@@ Description
                Since kernel 5.11 the scan_elements attributes are merged into
                the bufferY directory, to be configurable per buffer.
  
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_x_en
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_y_en
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_z_en
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_x_en
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_y_en
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_z_en
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en
- What:         /sys/.../iio:deviceX/scan_elements/in_timestamp_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_i_en
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_q_en
- What:         /sys/.../iio:deviceX/scan_elements/in_incli_x_en
- What:         /sys/.../iio:deviceX/scan_elements/in_incli_y_en
- What:         /sys/.../iio:deviceX/scan_elements/in_pressureY_en
- What:         /sys/.../iio:deviceX/scan_elements/in_pressure_en
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en
- What:         /sys/.../iio:deviceX/scan_elements/in_proximity_en
- KernelVersion:        2.6.37
  What:         /sys/.../iio:deviceX/bufferY/in_accel_x_en
  What:         /sys/.../iio:deviceX/bufferY/in_accel_y_en
  What:         /sys/.../iio:deviceX/bufferY/in_accel_z_en
@@@ -1284,23 -1293,6 +1293,6 @@@ Contact:       [email protected]
  Description:
                Scan element control for triggered data capture.
  
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_type
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_type
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_type
- What:         /sys/.../iio:deviceX/scan_elements/in_incli_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_i_type
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_q_type
- What:         /sys/.../iio:deviceX/scan_elements/in_timestamp_type
- What:         /sys/.../iio:deviceX/scan_elements/in_pressureY_type
- What:         /sys/.../iio:deviceX/scan_elements/in_pressure_type
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type
- What:         /sys/.../iio:deviceX/scan_elements/in_proximity_type
- KernelVersion:        2.6.37
  What:         /sys/.../iio:deviceX/bufferY/in_accel_type
  What:         /sys/.../iio:deviceX/bufferY/in_anglvel_type
  What:         /sys/.../iio:deviceX/bufferY/in_magn_type
@@@ -1347,33 -1339,6 +1339,6 @@@ Description
                If the type parameter can take one of a small set of values,
                this attribute lists them.
  
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_index
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
- What:         /sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_i_index
- What:         /sys/.../iio:deviceX/scan_elements/in_voltage_q_index
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_x_index
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_y_index
- What:         /sys/.../iio:deviceX/scan_elements/in_accel_z_index
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
- What:         /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_x_index
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_y_index
- What:         /sys/.../iio:deviceX/scan_elements/in_magn_z_index
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index
- What:         /sys/.../iio:deviceX/scan_elements/in_incli_x_index
- What:         /sys/.../iio:deviceX/scan_elements/in_incli_y_index
- What:         /sys/.../iio:deviceX/scan_elements/in_timestamp_index
- What:         /sys/.../iio:deviceX/scan_elements/in_pressureY_index
- What:         /sys/.../iio:deviceX/scan_elements/in_pressure_index
- What:         /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index
- What:         /sys/.../iio:deviceX/scan_elements/in_proximity_index
- KernelVersion:        2.6.37
  What:         /sys/.../iio:deviceX/bufferY/in_voltageY_index
  What:         /sys/.../iio:deviceX/bufferY/in_voltageY_supply_index
  What:         /sys/.../iio:deviceX/bufferY/in_voltageY_i_index
@@@ -1613,8 -1578,6 +1578,6 @@@ Description
                Specifies number of seconds in which we compute the steps
                that occur in order to decide if the consumer is making steps.
  
- What:         /sys/bus/iio/devices/iio:deviceX/buffer/watermark
- KernelVersion:        4.2
  What:         /sys/bus/iio/devices/iio:deviceX/bufferY/watermark
  KernelVersion:        5.11
  Contact:      [email protected]
@@@ -1633,8 -1596,6 +1596,6 @@@ Description
                the available samples after the timeout expires and thus have a
                maximum delay guarantee.
  
- What:         /sys/bus/iio/devices/iio:deviceX/buffer/data_available
- KernelVersion: 4.16
  What:         /sys/bus/iio/devices/iio:deviceX/bufferY/data_available
  KernelVersion:        5.11
  Contact:      [email protected]
index a3edbd2bcd155947a6382571474c18e41cff5c8b,35e58fe469999b1293d09d82cfb11e774c4a599a..919a4bf03a5a6189738e80b0d9785ff61cba7241
@@@ -73,8 -73,6 +73,8 @@@ properties
            - dallas,ds4510
              # Digital Thermometer and Thermostat
            - dallas,ds75
 +          # Delta Electronics DPS920AB 920W 54V Power Supply
 +          - delta,dps920ab
              # 1/4 Brick DC/DC Regulated Power Module
            - delta,q54sj108a2
              # Devantech SRF02 ultrasonic ranger in I2C mode
            - fsl,mpl3115
              # MPR121: Proximity Capacitive Touch Sensor Controller
            - fsl,mpr121
 +            # Monolithic Power Systems Inc. multi-phase controller mp2888
 +          - mps,mp2888
              # Monolithic Power Systems Inc. multi-phase controller mp2975
            - mps,mp2975
              # G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
            - meas,tsys01
              # MEMSIC magnetometer
            - memsic,mmc35240
+             # MEMSIC 3-axis accelerometer
+           - memsic,mx4005
              # MEMSIC 2-axis 8-bit digital accelerometer
            - memsic,mxc6225
+             # MEMSIC 2-axis 8-bit digital accelerometer
+           - memsic,mxc6255
+             # MEMSIC 3-axis accelerometer
+           - memsic,mxc6655
              # Microchip differential I2C ADC, 1 Channel, 18 bit
            - microchip,mcp3421
              # Microchip differential I2C ADC, 2 Channel, 18 bit
            - sensirion,sgpc3
              # Sensirion multi-pixel gas sensor with I2C interface
            - sensirion,sgp30
+             # Sensortek 3 axis accelerometer
+           - sensortek,stk8312
+             # Sensortek 3 axis accelerometer
+           - sensortek,stk8ba50
              # SGX Sensortech VZ89X Sensors
            - sgx,vz89x
              # Relative Humidity and Temperature Sensors
              # Socionext SynQuacer TPM MMIO module
            - socionext,synquacer-tpm-mmio
              # i2c serial eeprom  (24cxx)
 +          - sparkfun,qwiic-joystick
 +            # SparkFun Qwiic Joystick (COM-15168) with i2c interface
            - st,24c256
              # Ambient Light Sensor with SMBUS/Two Wire Serial Interface
            - taos,tsl2550
diff --combined MAINTAINERS
index 2dd5d046b0b56d898088c0fd446c997f518ac732,13339228f065b75652fde61d6cdb2502151789d9..f2bfabc9bc64dda07173075f49b0d0b492d146ac
@@@ -299,7 -299,6 +299,6 @@@ M: William Breathitt Gray <vilhelm.gray
  M:    Syed Nayyar Waris <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
  F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
@@@ -431,14 -430,6 +430,14 @@@ W:       https://01.org/linux-acp
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/acpi_video.c
  
 +ACPI VIOT DRIVER
 +M:    Jean-Philippe Brucker <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/acpi/viot.c
 +F:    include/linux/acpi_viot.h
 +
  ACPI WMI DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -791,14 -782,6 +790,14 @@@ M:       Ley Foon Tan <[email protected]
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
 +ALTERA MSGDMA IP CORE DRIVER
 +M:    Olivier Dautricourt <[email protected]>
 +R:    Stefan Roese <[email protected]>
 +L:    [email protected]
 +S:    Odd Fixes
 +F:    Documentation/devicetree/bindings/dma/altr,msgdma.yaml
 +F:    drivers/dma/altera-msgdma.c
 +
  ALTERA PIO DRIVER
  M:    Joyce Ooi <[email protected]>
  L:    [email protected]
@@@ -894,7 -877,7 +893,7 @@@ M: Harry Wentland <[email protected]
  M:    Leo Li <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/display/
  
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
@@@ -970,7 -953,7 +969,7 @@@ AMD POWERPLA
  M:    Evan Quan <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/pm/powerplay/
  
  AMD SEATTLE DEVICE TREE SUPPORT
@@@ -989,7 -972,7 +988,7 @@@ F: drivers/net/ethernet/amd/xgbe
  
  AMD SENSOR FUSION HUB DRIVER
  M:    Nehal Shah <[email protected]>
 -M:    Sandeep Singh <sandeep.singh@amd.com>
 +M:    Basavaraj Natikar <basavaraj.natikar@amd.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hid/amd-sfh*
@@@ -1327,7 -1310,6 +1326,7 @@@ W:      http://www.aquantia.co
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
  ARASAN NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]>
  M:    Naga Sureshkumar Relli <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1469,22 -1451,6 +1468,22 @@@ S:    Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]@bootlin.com>
 +M:    Naga Sureshkumar Relli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
 +F:    drivers/mtd/nand/raw/pl35x-nand-controller.c
 +
 +ARM PRIMECELL PL35X SMC DRIVER
 +M:    Miquel Raynal <[email protected]@bootlin.com>
 +M:    Naga Sureshkumar Relli <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/arm,pl353-smc.yaml
 +F:    drivers/memory/pl353-smc.c
 +
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1688,11 -1654,9 +1687,11 @@@ C:    irc://chat.freenode.net/asahi-de
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/irqchip/irq-apple-aic.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
 +F:    include/dt-bindings/pinctrl/apple.h
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
@@@ -1846,13 -1810,12 +1845,13 @@@ F:   Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/crypto/gemini/
  F:    drivers/net/ethernet/cortina/
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CZ.NIC TURRIS SUPPORT
 -M:    Marek Behun <[email protected]>
 +M:    Marek Behún <[email protected]>
  S:    Maintained
  W:    https://www.turris.cz/
  F:    Documentation/ABI/testing/debugfs-moxtet
@@@ -2008,7 -1971,6 +2007,7 @@@ F:      Documentation/devicetree/bindings/in
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/clocksource/timer-ixp4xx.c
 +F:    drivers/crypto/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
  F:    include/linux/irqchip/irq-ixp4xx.h
@@@ -3772,6 -3734,9 +3771,6 @@@ F:      drivers/gpio/gpio-bcm-kona.
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
 -M:    Devesh Sharma <[email protected]>
 -M:    Somnath Kotur <[email protected]>
 -M:    Sriharsha Basavapatna <[email protected]>
  M:    Naresh Kumar PBS <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4075,9 -4040,7 +4074,9 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
 +F:    Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml
  F:    drivers/net/can/
 +F:    drivers/phy/phy-can-transceiver.c
  F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
@@@ -4481,18 -4444,6 +4480,18 @@@ F:    include/linux/compiler-clang.
  F:    scripts/clang-tools/
  K:    \b(?i:clang|llvm)\b
  
 +CLANG CONTROL FLOW INTEGRITY SUPPORT
 +M:    Sami Tolvanen <[email protected]>
 +M:    Kees Cook <[email protected]>
 +R:    Nathan Chancellor <[email protected]>
 +R:    Nick Desaulniers <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +B:    https://github.com/ClangBuiltLinux/linux/issues
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/clang/features
 +F:    include/linux/cfi.h
 +F:    kernel/cfi.c
 +
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected]
@@@ -4658,12 -4609,6 +4657,12 @@@ S:    Supporte
  F:    drivers/video/console/
  F:    include/linux/console*
  
 +CONTEXT TRACKING
 +M:    Frederic Weisbecker <[email protected]>
 +S:    Maintained
 +F:    kernel/context_tracking.c
 +F:    include/linux/context_tracking*
 +
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
  M:    Zefan Li <[email protected]>
@@@ -4738,7 -4683,7 +4737,7 @@@ COUNTER SUBSYSTE
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/ABI/testing/sysfs-bus-counter*
+ F:    Documentation/ABI/testing/sysfs-bus-counter
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
  F:    include/linux/counter.h
@@@ -5061,10 -5006,11 +5060,10 @@@ S:   Maintaine
  F:    drivers/input/touchscreen/cy8ctma140.c
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:    Ferruh Yigit <[email protected]>
 +M:    Linus Walleij <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/input/touchscreen/cyttsp*
 -F:    include/linux/input/cyttsp.h
  
  D-LINK DIR-685 TOUCHKEYS DRIVER
  M:    Linus Walleij <[email protected]>
@@@ -5232,14 -5178,7 +5231,14 @@@ DELL WMI NOTIFICATIONS DRIVE
  M:    Matthew Garrett <[email protected]>
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell/dell-wmi.c
 +F:    drivers/platform/x86/dell/dell-wmi-base.c
 +
 +DELL WMI HARDWARE PRIVACY SUPPORT
 +M:    Perry Yuan <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/dell/dell-wmi-privacy.c
  
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <[email protected]>
@@@ -5249,13 -5188,6 +5248,13 @@@ W:    https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/platform/sti/delta
  
 +DELTA DPS920AB PSU DRIVER
 +M:    Robert Marko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/dps920ab.rst
 +F:    drivers/hwmon/pmbus/dps920ab.c
 +
  DENALI NAND DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -5945,13 -5877,6 +5944,13 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/savage/
  F:    include/uapi/drm/savage_drm.h
  
 +DRM DRIVER FOR SIMPLE FRAMEBUFFERS
 +M:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/tiny/simpledrm.c
 +
  DRM DRIVER FOR SIS VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/sis/
@@@ -6159,14 -6084,6 +6158,14 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/hisilicon/
  F:    drivers/gpu/drm/hisilicon/
  
 +DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE
 +M:    Deepak Rawat <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/hyperv
 +
  DRM DRIVERS FOR LIMA
  M:    Qiang Yu <[email protected]>
  L:    [email protected]
@@@ -6329,7 -6246,7 +6328,7 @@@ M:      Christian Koenig <christian.koenig@a
  M:    Huang Rui <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/ttm/
  F:    include/drm/ttm/
  
@@@ -6527,11 -6444,10 +6526,11 @@@ F:   Documentation/filesystems/ecryptfs.r
  F:    fs/ecryptfs/
  
  EDAC-AMD64
 -M:    Borislav Petkov <[email protected]>
 +M:    Yazen Ghannam <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/edac/amd64_edac*
 +F:    drivers/edac/mce_amd*
  
  EDAC-ARMADA
  M:    Jan Luebbe <[email protected]>
@@@ -6812,6 -6728,7 +6811,6 @@@ F:      drivers/net/ethernet/emulex/benet
  
  EMULEX ONECONNECT ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
 -M:    Devesh Sharma <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
  W:    http://www.broadcom.com
@@@ -6826,15 -6743,6 +6825,15 @@@ S:    Supporte
  W:    http://www.broadcom.com
  F:    drivers/scsi/lpfc/
  
 +EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
 +M:    James Smart <[email protected]>
 +M:    Ram Vegesna <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.broadcom.com
 +F:    drivers/scsi/elx/
 +
  ENE CB710 FLASH CARD READER DRIVER
  M:    MichaÅ‚ MirosÅ‚aw <[email protected]>
  S:    Maintained
@@@ -6862,7 -6770,7 +6861,7 @@@ F:      include/video/s1d13xxxfb.
  
  EROFS FILE SYSTEM
  M:    Gao Xiang <[email protected]>
 -M:    Chao Yu <[email protected]>
 +M:    Chao Yu <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
@@@ -6903,8 -6811,6 +6902,8 @@@ F:      Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
  F:    Documentation/networking/phy.rst
  F:    drivers/net/mdio/
 +F:    drivers/net/mdio/acpi_mdio.c
 +F:    drivers/net/mdio/fwnode_mdio.c
  F:    drivers/net/mdio/of_mdio.c
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
@@@ -7189,7 -7095,6 +7188,6 @@@ FLEXTIMER FTM-QUADDEC DRIVE
  M:    Patrick Havelange <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec
  F:    Documentation/devicetree/bindings/counter/ftm-quaddec.txt
  F:    drivers/counter/ftm-quaddec.c
  
  S:    Maintained
  F:    drivers/input/joystick/fsia6b.c
  
 +FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER
 +M:    Geoffrey D. Bennett <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +F:    sound/usb/mixer_scarlett_gen2.c
 +
  FORCEDETH GIGABIT ETHERNET DRIVER
  M:    Rain River <[email protected]>
  M:    Zhu Yanjun <[email protected]>
@@@ -7266,7 -7164,7 +7264,7 @@@ F:      include/video
  
  FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
  M:    Horia Geantă <[email protected]>
 -M:    Aymen Sghaier <aymen.sghaier@nxp.com>
 +M:    Pankaj Gupta <pankaj.gupta@nxp.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@@ -7454,6 -7352,7 +7452,6 @@@ F:      drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Timur Tabi <[email protected]>
  M:    Nicolin Chen <[email protected]>
  M:    Xiubo Li <[email protected]>
  R:    Fabio Estevam <[email protected]>
@@@ -7656,12 -7555,6 +7654,12 @@@ M:    Kieran Bingham <[email protected]
  S:    Supported
  F:    scripts/gdb/
  
 +GEMINI CRYPTO DRIVER
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/gemini/
 +
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/input/touchscreen/resistive-adc-touch.c
  
 +GENERIC STRING LIBRARY
 +R:    Andy Shevchenko <[email protected]>
 +S:    Maintained
 +F:    lib/string.c
 +F:    lib/string_helpers.c
 +F:    lib/test_string.c
 +F:    lib/test-string_helpers.c
 +
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]
@@@ -8397,6 -8282,13 +8395,13 @@@ S:    Maintaine
  W:    http://www.hisilicon.com
  F:    drivers/spi/spi-hisi-kunpeng.c
  
+ HISILICON SPMI CONTROLLER DRIVER FOR HIKEY 970
+ M:    Mauro Carvalho Chehab <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
+ F:    drivers/spmi/hisi-spmi-controller.c
  HISILICON STAGING DRIVERS FOR HIKEY 960/970
  M:    Mauro Carvalho Chehab <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    drivers/i2c/busses/i2c-icy.c
  
 -IDE SUBSYSTEM
 -M:    "David S. Miller" <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git
 -F:    Documentation/ide/
 -F:    drivers/ide/
 -F:    include/linux/ide.h
 -
 -IDE/ATAPI DRIVERS
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/cdrom/ide-cd.rst
 -F:    drivers/ide/ide-cd*
 -
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <[email protected]>
  L:    [email protected]
@@@ -8964,7 -8872,7 +8969,7 @@@ IIO MULTIPLEXE
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
 +F:    Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.yaml
  F:    drivers/iio/multiplexer/iio-mux.c
  
  IIO SCMI BASED DRIVER
@@@ -9236,15 -9144,6 +9241,15 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
 +F:    include/linux/net/intel/iidc.h
 +
 +INTEL ETHERNET PROTOCOL DRIVER FOR RDMA
 +M:    Mustafa Ismail <[email protected]>
 +M:    Shiraz Saleem <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/irdma/
 +F:    include/uapi/rdma/irdma-abi.h
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
  M:    Maik Broemme <[email protected]>
@@@ -9350,12 -9249,6 +9355,12 @@@ F:    Documentation/admin-guide/media/ipu3
  F:    Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
  F:    drivers/staging/media/ipu3/
  
 +INTEL IXP4XX CRYPTO SUPPORT
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/ixp4xx_crypto.c
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
@@@ -9420,6 -9313,16 +9425,6 @@@ F:     drivers/hwmon/intel-m10-bmc-hwmon.
  F:    drivers/mfd/intel-m10-bmc.c
  F:    include/linux/mfd/intel-m10-bmc.h
  
 -INTEL MAX 10 BMC MFD DRIVER
 -M:    Xu Yilun <[email protected]>
 -R:    Tom Rix <[email protected]>
 -S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
 -F:    Documentation/hwmon/intel-m10-bmc-hwmon.rst
 -F:    drivers/hwmon/intel-m10-bmc-hwmon.c
 -F:    drivers/mfd/intel-m10-bmc.c
 -F:    include/linux/mfd/intel-m10-bmc.h
 -
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/cpufreq/intel_pstate.c
  
 -INTEL RDMA RNIC DRIVER
 -M:    Faisal Latif <[email protected]>
 -M:    Shiraz Saleem <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/infiniband/hw/i40iw/
 -F:    include/uapi/rdma/i40iw-abi.h
 -
+ INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
+ M:    Jarkko Nikula <[email protected]>
+ L:    [email protected]
+ F:    drivers/counter/intel-qep.c
  INTEL SCU DRIVERS
  M:    Mika Westerberg <[email protected]>
  S:    Maintained
  F:    arch/x86/include/asm/intel_scu_ipc.h
  F:    drivers/platform/x86/intel_scu_*
  
 +INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
 +M:    Daniel Scally <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/intel/int3472/
 +
  INTEL SPEED SELECT TECHNOLOGY
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
@@@ -9506,7 -9417,7 +9516,7 @@@ F:      include/linux/firmware/intel/stratix
  F:    include/linux/firmware/intel/stratix10-svc-client.h
  
  INTEL TELEMETRY DRIVER
 -M:    Rajneesh Bhardwaj <[email protected]l.com>
 +M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
  M:    "David E. Box" <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Maintained
  F:    drivers/platform/x86/intel-wmi-thunderbolt.c
  
 +INTEL WWAN IOSM DRIVER
 +M:    M Chetan Kumar <[email protected]>
 +M:    Intel Corporation <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wwan/iosm/
 +
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <[email protected]>
  S:    Supported
@@@ -9834,14 -9738,6 +9844,14 @@@ Q:    http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/it913x*
  
 +ITE IT66121 HDMI BRIDGE DRIVER
 +M:    Phong LE <[email protected]>
 +M:    Neil Armstrong <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
 +F:    drivers/gpu/drm/bridge/ite-it66121.c
 +
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
  L:    [email protected]
@@@ -10109,8 -10005,6 +10119,8 @@@ F:   arch/arm64/include/asm/kvm
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/kvm/
  F:    include/kvm/arm_*
 +F:    tools/testing/selftests/kvm/*/aarch64/
 +F:    tools/testing/selftests/kvm/aarch64/
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    Huacai Chen <[email protected]>
@@@ -10976,7 -10870,6 +10986,7 @@@ S:   Maintaine
  F:    drivers/mailbox/
  F:    include/linux/mailbox_client.h
  F:    include/linux/mailbox_controller.h
 +F:    include/dt-bindings/mailbox/
  F:    Documentation/devicetree/bindings/mailbox/
  
  MAILBOX ARM MHUv2
@@@ -11014,7 -10907,7 +11024,7 @@@ MARVELL ARMADA 3700 PHY DRIVER
  M:    Miquel Raynal <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 -F:    Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
 +F:    Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml
  F:    drivers/phy/marvell/phy-mvebu-a3700-comphy.c
  F:    drivers/phy/marvell/phy-mvebu-a3700-utmi.c
  
@@@ -11063,7 -10956,7 +11073,7 @@@ F:   include/linux/mv643xx.
  
  MARVELL MV88X3310 PHY DRIVER
  M:    Russell King <[email protected]>
 -M:    Marek Behun <[email protected]>
 +M:    Marek Behún <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/phy/marvell10g.c
@@@ -11409,7 -11302,6 +11419,7 @@@ F:   include/media/imx.
  
  MEDIA DRIVERS FOR FREESCALE IMX7
  M:    Rui Miguel Silva <[email protected]>
 +M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
 +F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
  F:    drivers/media/platform/rcar-vin/
  
@@@ -11948,7 -11839,6 +11958,7 @@@ F:   include/linux/mmzone.
  F:    include/linux/pagewalk.h
  F:    include/linux/vmalloc.h
  F:    mm/
 +F:    tools/testing/selftests/vm/
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    Miquel Raynal <[email protected]>
@@@ -12110,13 -12000,11 +12120,13 @@@ MICROCHIP ISC DRIVE
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/atmel-isc.txt
 +F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
 +F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
  F:    drivers/media/platform/atmel/atmel-isc-base.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    drivers/media/platform/atmel/atmel-isc.h
  F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 +F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -12314,7 -12202,7 +12324,7 @@@ M:   Maximilian Luz <luzmaximilian@gmail.
  L:    [email protected]
  S:    Maintained
  W:    https://github.com/linux-surface/surface-aggregator-module
 -C:    irc://chat.freenode.net/##linux-surface
 +C:    irc://irc.libera.chat/linux-surface
  F:    Documentation/driver-api/surface_aggregator/
  F:    drivers/platform/surface/aggregator/
  F:    drivers/platform/surface/surface_acpi_notify.c
@@@ -12510,12 -12398,6 +12520,12 @@@ F: Documentation/userspace-api/media/dr
  F:    drivers/media/pci/meye/
  F:    include/uapi/linux/meye.h
  
 +MOTORCOMM PHY DRIVER
 +M:    Peter Geis <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/motorcomm.c
 +
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  S:    Orphan
  F:    Documentation/driver-api/serial/moxa-smartio.rst
@@@ -12730,7 -12612,7 +12740,7 @@@ S:   Orpha
  F:    drivers/net/ethernet/natsemi/natsemi.c
  
  NCR 5380 SCSI DRIVERS
 -M:    Finn Thain <fthain@telegraphics.com.au>
 +M:    Finn Thain <fthain@linux-m68k.org>
  M:    Michael Schmitz <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -12787,7 -12669,6 +12797,7 @@@ W:   http://www.netfilter.org
  W:    http://www.iptables.org/
  W:    http://www.nftables.org/
  Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
 +C:    irc://irc.libera.chat/netfilter
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
  F:    include/linux/netfilter*
@@@ -13203,7 -13084,7 +13213,7 @@@ F:   Documentation/filesystems/ntfs.rs
  F:    fs/ntfs/
  
  NUBUS SUBSYSTEM
 -M:    Finn Thain <fthain@telegraphics.com.au>
 +M:    Finn Thain <fthain@linux-m68k.org>
  L:    [email protected]
  S:    Maintained
  F:    arch/*/include/asm/nubus.h
@@@ -13325,7 -13206,6 +13335,7 @@@ M:   Vladimir Oltean <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/sja1105
 +F:    drivers/net/pcs/pcs-xpcs-nxp.c
  
  NXP TDA998X DRM DRIVER
  M:    Russell King <[email protected]>
@@@ -13344,13 -13224,6 +13354,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/tfa9879.txt
  F:    sound/soc/codecs/tfa9879*
  
 +NXP/Goodix TFA989X (TFA1) DRIVER
 +M:    Stephan Gerhold <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
 +F:    sound/soc/codecs/tfa989x.c
 +
  NXP-NCI NFC DRIVER
  R:    Charles Gorand <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -13471,7 -13344,7 +13481,7 @@@ M:   Santosh Shilimkar <[email protected]
  M:    Kevin Hilman <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
 +F:    Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml
  F:    drivers/gpio/gpio-omap.c
  
  OMAP HARDWARE SPINLOCK SUPPORT
@@@ -13510,7 -13383,7 +13520,7 @@@ M:   Vignesh R <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-omap.txt
 +F:    Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml
  F:    drivers/i2c/busses/i2c-omap.c
  
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
@@@ -15278,13 -15151,6 +15288,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
  F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
 +QUALCOMM CRYPTO DRIVERS
 +M:    Thara Gopinath <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/qce/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -15413,7 -15279,6 +15423,7 @@@ F:   drivers/net/wireless/quantenn
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
 +M:    Pan, Xinhui <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
@@@ -15721,13 -15586,6 +15731,13 @@@ F: include/linux/rpmsg
  F:    include/uapi/linux/rpmsg.h
  F:    samples/rpmsg/
  
 +REMOTE PROCESSOR MESSAGING (RPMSG) WWAN CONTROL DRIVER
 +M:    Stephan Gerhold <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wwan/rpmsg_wwan_ctrl.c
 +
  RENESAS CLOCK DRIVERS
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -15738,9 -15596,8 +15748,9 @@@ F:   drivers/clk/renesas
  
  RENESAS EMEV2 I2C DRIVER
  M:    Wolfram Sang <[email protected]>
 +L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET DRIVERS
@@@ -15760,10 -15617,9 +15770,10 @@@ F: drivers/iio/adc/rcar-gyroadc.
  
  RENESAS R-CAR I2C DRIVERS
  M:    Wolfram Sang <[email protected]>
 +L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/renesas,i2c.txt
 -F:    Documentation/devicetree/bindings/i2c/renesas,iic.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,rcar-i2c.yaml
 +F:    Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
@@@ -15778,9 -15634,8 +15788,9 @@@ F:   drivers/thermal/rcar_thermal.
  
  RENESAS RIIC DRIVER
  M:    Chris Brandt <[email protected]>
 +L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/renesas,riic.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,riic.yaml
  F:    drivers/i2c/busses/i2c-riic.c
  
  RENESAS USB PHY DRIVER
@@@ -15860,14 -15715,6 +15870,14 @@@ F: arch/riscv
  N:    riscv
  K:    riscv
  
 +RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
 +M:    Lewis Hanly <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mailbox/mailbox-mpfs.c
 +F:    drivers/soc/microchip/
 +F:    include/soc/microchip/mpfs.h
 +
  RNBD BLOCK DRIVERS
  M:    Md. Haris Iqbal <[email protected]>
  M:    Jack Wang <[email protected]>
@@@ -16661,6 -16508,8 +16671,8 @@@ M:   Tomasz Duszynski <[email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/chemical/sensirion,sps30.yaml
  F:    drivers/iio/chemical/sps30.c
+ F:    drivers/iio/chemical/sps30_i2c.c
+ F:    drivers/iio/chemical/sps30_serial.c
  
  SERIAL DEVICE BUS
  M:    Rob Herring <[email protected]>
@@@ -16723,7 -16572,6 +16735,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
 +M:    Guvenc Gulce <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17169,13 -17017,6 +17181,13 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX208 SENSOR DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/imx208.c
 +
  SONY IMX214 SENSOR DRIVER
  M:    Ricardo Ribalda <[email protected]>
  L:    [email protected]
@@@ -17844,7 -17685,6 +17856,7 @@@ M:   Jose Abreu <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/pcs/pcs-xpcs.c
 +F:    drivers/net/pcs/pcs-xpcs.h
  F:    include/linux/pcs/pcs-xpcs.h
  
  SYNOPSYS DESIGNWARE I2C DRIVER
@@@ -17887,7 -17727,7 +17899,7 @@@ M:   Sudeep Holla <[email protected]
  R:    Cristian Marussi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
 +F:    Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml
  F:    drivers/clk/clk-sc[mp]i.c
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
@@@ -18260,11 -18100,11 +18272,11 @@@ L:        [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
  F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 -F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
 +F:    Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
 -F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
 -F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
 +F:    Documentation/devicetree/bindings/reset/ti,sci-reset.yaml
 +F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml
  F:    drivers/clk/keystone/sci-clk.c
  F:    drivers/firmware/ti_sci*
  F:    drivers/irqchip/irq-ti-sci-inta.c
@@@ -18285,6 -18125,13 +18297,13 @@@ F: Documentation/devicetree/bindings/hw
  F:    Documentation/hwmon/tps23861.rst
  F:    drivers/hwmon/tps23861.c
  
+ TEXAS INSTRUMENTS' TMP117 TEMPERATURE SENSOR DRIVER
+ M:    Puranjay Mohan <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/iio/temperature/ti,tmp117.yaml
+ F:    drivers/iio/temperature/tmp117.c
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -18347,13 -18194,6 +18366,13 @@@ W: http://thinkwiki.org/wiki/Ibm-acp
  T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
  F:    drivers/platform/x86/thinkpad_acpi.c
  
 +THINKPAD LMI DRIVER
 +M:    Mark Pearson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-firmware-attributes
 +F:    drivers/platform/x86/think-lmi.?
 +
  THUNDERBOLT DMA TRAFFIC TEST DRIVER
  M:    Isaac Hazan <[email protected]>
  L:    [email protected]
@@@ -18448,7 -18288,7 +18467,7 @@@ TI DAVINCI SERIES GPIO DRIVE
  M:    Keerthy <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 +F:    Documentation/devicetree/bindings/gpio/gpio-davinci.yaml
  F:    drivers/gpio/gpio-davinci.c
  
  TI DAVINCI SERIES MEDIA DRIVER
@@@ -18521,6 -18361,14 +18540,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
  F:    drivers/nfc/trf7970a.c
  
+ TI TSC2046 ADC DRIVER
+ M:    Oleksij Rempel <[email protected]>
+ R:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/adc/ti,tsc2046.yaml
+ F:    drivers/iio/adc/ti-tsc2046.c
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
  
- USB IP DRIVER FOR HISILICON KIRIN
+ USB IP DRIVER FOR HISILICON KIRIN 960
  M:    Yu Chen <[email protected]>
  M:    Binghui Wang <[email protected]>
  L:    [email protected]
@@@ -19045,6 -18893,13 +19072,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
  F:    drivers/phy/hisilicon/phy-hi3660-usb3.c
  
+ USB IP DRIVER FOR HISILICON KIRIN 970
+ M:    Mauro Carvalho Chehab <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
+ F:    drivers/phy/hisilicon/phy-kirin970-usb3.c
  USB ISP116X DRIVER
  M:    Olav Kongas <[email protected]>
  L:    [email protected]
@@@ -19756,10 -19611,6 +19790,10 @@@ F: include/dt-bindings/regulator
  F:    include/linux/regulator/
  K:    regulator_get_optional
  
 +VOLTAGE AND CURRENT REGULATOR IRQ HELPERS
 +R:    Matti Vaittinen <[email protected]>
 +F:    drivers/regulator/irq_helpers.c
 +
  VRF
  M:    David Ahern <[email protected]>
  L:    [email protected]
@@@ -19777,7 -19628,6 +19811,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git
  F:    Documentation/core-api/printk-formats.rst
  F:    lib/test_printf.c
 +F:    lib/test_scanf.c
  F:    lib/vsprintf.c
  
  VT1211 HARDWARE MONITOR DRIVER
@@@ -19961,16 -19811,6 +19995,16 @@@ F: Documentation/core-api/workqueue.rs
  F:    include/linux/workqueue.h
  F:    kernel/workqueue.c
  
 +WWAN DRIVERS
 +M:    Loic Poulain <[email protected]>
 +M:    Sergey Ryazanov <[email protected]>
 +R:    Johannes Berg <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wwan/
 +F:    include/linux/wwan.h
 +F:    include/uapi/linux/wwan.h
 +
  X-POWERS AXP288 PMIC DRIVERS
  M:    Hans de Goede <[email protected]>
  S:    Maintained
@@@ -20366,6 -20206,7 +20400,6 @@@ M:   Seth Jennings <[email protected]
  M:    Dan Streetman <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    include/linux/zbud.h
  F:    mm/zbud.c
  
  ZD1211RW WIRELESS DRIVER
index 093a7f8091b5eab44466037d0581dff3aba91105,f15ea61851b2963d287bef915946927c9b6b001c..eeabe9c0f4fb8169d47a8fc93abb42df7454e71b
@@@ -55,7 -55,7 +55,7 @@@
                #address-cells = <1>;
                #size-cells = <1>;
  
-               sysc: sysc@0 {
+               sysc: syscon@0 {
                        compatible = "mediatek,mt7621-sysc", "syscon";
                        reg = <0x0 0x100>;
                        #clock-cells = <1>;
                        status = "disabled";
                };
  
-               memc: memc@5000 {
+               memc: syscon@5000 {
                        compatible = "mediatek,mt7621-memc", "syscon";
                        reg = <0x5000 0x1000>;
                };
                clock-names = "nand";
        };
  
-       ethsys: syscon@1e000000 {
-               compatible = "mediatek,mt7621-ethsys",
-                            "syscon";
-               reg = <0x1e000000 0x1000>;
-               #clock-cells = <1>;
-       };
        ethernet: ethernet@1e100000 {
                compatible = "mediatek,mt7621-eth";
                reg = <0x1e100000 0x10000>;
                interrupt-parent = <&gic>;
                interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>;
  
-               mediatek,ethsys = <&ethsys>;
+               mediatek,ethsys = <&sysc>;
  
  
                gmac0: mac@0 {
                                mediatek,mcm;
                                resets = <&rstctrl 2>;
                                reset-names = "mcm";
 +                              interrupt-controller;
 +                              #interrupt-cells = <1>;
 +                              interrupt-parent = <&gic>;
 +                              interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
  
                                ports {
                                        #address-cells = <1>;
  
        pcie: pcie@1e140000 {
                compatible = "mediatek,mt7621-pci";
-               reg = <0x1e140000 0x100     /* host-pci bridge registers */
-                       0x1e142000 0x100    /* pcie port 0 RC control registers */
-                       0x1e143000 0x100    /* pcie port 1 RC control registers */
-                       0x1e144000 0x100>;  /* pcie port 2 RC control registers */
+               reg = <0x1e140000 0x100>, /* host-pci bridge registers */
+                     <0x1e142000 0x100>, /* pcie port 0 RC control registers */
+                     <0x1e143000 0x100>, /* pcie port 1 RC control registers */
+                     <0x1e144000 0x100>; /* pcie port 2 RC control registers */
                #address-cells = <3>;
                #size-cells = <2>;
  
  
                device_type = "pci";
  
-               bus-range = <0 255>;
-               ranges = <
-                       0x02000000 0 0x00000000 0x60000000 0 0x10000000 /* pci memory */
-                       0x01000000 0 0x00000000 0x1e160000 0 0x00010000 /* io space */
-               >;
+               ranges = <0x02000000 0 0x60000000 0x60000000 0 0x10000000>, /* pci memory */
+                        <0x01000000 0 0x00000000 0x1e160000 0 0x00010000>; /* io space */
  
-               interrupt-parent = <&gic>;
-               interrupts = <GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH
-                               GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
-                               GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
+               #interrupt-cells = <1>;
+               interrupt-map-mask = <0xF800 0 0 0>;
+               interrupt-map = <0x0000 0 0 0 &gic GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH>,
+                               <0x0800 0 0 0 &gic GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>,
+                               <0x1000 0 0 0 &gic GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
  
                status = "disabled";
  
-               resets = <&rstctrl 24 &rstctrl 25 &rstctrl 26>;
-               reset-names = "pcie0", "pcie1", "pcie2";
-               clocks = <&sysc MT7621_CLK_PCIE0>,
-                        <&sysc MT7621_CLK_PCIE1>,
-                        <&sysc MT7621_CLK_PCIE2>;
-               clock-names = "pcie0", "pcie1", "pcie2";
-               phys = <&pcie0_phy 1>, <&pcie2_phy 0>;
-               phy-names = "pcie-phy0", "pcie-phy2";
                reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
  
                pcie@0,0 {
                        reg = <0x0000 0 0 0 0>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &gic GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 24>;
+                       clocks = <&sysc MT7621_CLK_PCIE0>;
+                       phys = <&pcie0_phy 1>;
+                       phy-names = "pcie-phy0";
                        ranges;
-                       bus-range = <0x00 0xff>;
                };
  
                pcie@1,0 {
                        reg = <0x0800 0 0 0 0>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &gic GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 25>;
+                       clocks = <&sysc MT7621_CLK_PCIE1>;
+                       phys = <&pcie0_phy 1>;
+                       phy-names = "pcie-phy1";
                        ranges;
-                       bus-range = <0x00 0xff>;
                };
  
                pcie@2,0 {
                        reg = <0x1000 0 0 0 0>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0>;
+                       interrupt-map = <0 0 0 0 &gic GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 26>;
+                       clocks = <&sysc MT7621_CLK_PCIE2>;
+                       phys = <&pcie2_phy 0>;
+                       phy-names = "pcie-phy2";
                        ranges;
-                       bus-range = <0x00 0xff>;
                };
        };
  
        pcie0_phy: pcie-phy@1e149000 {
                compatible = "mediatek,mt7621-pci-phy";
                reg = <0x1e149000 0x0700>;
+               clocks = <&sysc MT7621_CLK_XTAL>;
                #phy-cells = <1>;
        };
  
        pcie2_phy: pcie-phy@1e14a000 {
                compatible = "mediatek,mt7621-pci-phy";
                reg = <0x1e14a000 0x0700>;
+               clocks = <&sysc MT7621_CLK_XTAL>;
                #phy-cells = <1>;
        };
  };
index 437859228371a28c0a884ee7ce84d467057cef97,427f0b88abd70c465f291cc91205da0349f0f8e4..fd747c8d920e4240237ec6c8ca853bb8ced5f450
@@@ -77,7 -77,6 +77,6 @@@ static struct ieee80211_rate rtw_rates[
  #define RTW_G_RATES_NUM       12
  
  #define RTW_2G_CHANNELS_NUM 14
- #define RTW_5G_CHANNELS_NUM 37
  
  static struct ieee80211_channel rtw_2ghz_channels[] = {
        CHAN2G(1, 2412, 0),
@@@ -203,8 -202,6 +202,6 @@@ rtw_cfg80211_default_mgmt_stypes[NUM_NL
  
  static int rtw_ieee80211_channel_to_frequency(int chan, int band)
  {
-       /* see 802.11 17.3.8.3.2 and Annex J
-       * there are overlapping channel numbers in 5GHz and 2GHz bands */
        if (band == NL80211_BAND_2GHZ) {
                if (chan == 14)
                        return 2484;
@@@ -229,7 -226,6 +226,6 @@@ struct cfg80211_bss *rtw_cfg80211_infor
        size_t len, bssinf_len = 0;
        struct ieee80211_hdr *pwlanhdr;
        __le16 *fctrl;
-       u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
  
        struct wireless_dev *wdev = padapter->rtw_wdev;
        struct wiphy *wiphy = wdev->wiphy;
        /* pmlmeext->mgnt_seq++; */
  
        if (pnetwork->network.Reserved[0] == 1) { /*  WIFI_BEACON */
-               memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN);
+               eth_broadcast_addr(pwlanhdr->addr1);
                SetFrameSubType(pbuf, WIFI_BEACON);
        } else {
                memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN);
@@@ -960,7 -956,7 +956,7 @@@ static int cfg80211_rtw_add_key(struct 
        memset(param, 0, param_len);
  
        param->cmd = IEEE_CMD_SET_ENCRYPTION;
-       memset(param->sta_addr, 0xff, ETH_ALEN);
+       eth_broadcast_addr(param->sta_addr);
  
        switch (params->cipher) {
        case IW_AUTH_CIPHER_NONE:
@@@ -1265,18 -1261,12 +1261,12 @@@ void rtw_cfg80211_surveydone_event_call
        spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
  
        phead = get_list_head(queue);
-       plist = get_next(phead);
-       while (1)
+       list_for_each(plist, phead)
        {
-               if (phead == plist)
-                       break;
-               pnetwork = container_of(plist, struct wlan_network, list);
+               pnetwork = list_entry(plist, struct wlan_network, list);
  
                /* report network only if the current channel set contains the channel to which this network belongs */
                if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
-                       && rtw_mlme_band_check(padapter, pnetwork->network.Configuration.DSConfig) == true
                        && true == rtw_validate_ssid(&(pnetwork->network.Ssid))
                )
                {
                        rtw_cfg80211_inform_bss(padapter, pnetwork);
                }
  
-               plist = get_next(plist);
        }
  
        spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
@@@ -2284,7 -2272,7 +2272,7 @@@ static int rtw_cfg80211_add_monitor_if(
        mon_wdev->iftype = NL80211_IFTYPE_MONITOR;
        mon_ndev->ieee80211_ptr = mon_wdev;
  
 -      ret = register_netdevice(mon_ndev);
 +      ret = cfg80211_register_netdevice(mon_ndev);
        if (ret) {
                goto out;
        }
@@@ -2360,7 -2348,7 +2348,7 @@@ static int cfg80211_rtw_del_virtual_int
        adapter = rtw_netdev_priv(ndev);
        pwdev_priv = adapter_wdev_data(adapter);
  
 -      unregister_netdevice(ndev);
 +      cfg80211_unregister_netdevice(ndev);
  
        if (ndev == pwdev_priv->pmon_ndev) {
                pwdev_priv->pmon_ndev = NULL;
@@@ -2460,7 -2448,7 +2448,7 @@@ static int cfg80211_rtw_del_station(str
                                    struct station_del_parameters *params)
  {
        int ret = 0;
-       struct list_head        *phead, *plist;
+       struct list_head *phead, *plist, *tmp;
        u8 updated = false;
        struct sta_info *psta = NULL;
        struct adapter *padapter = rtw_netdev_priv(ndev);
        spin_lock_bh(&pstapriv->asoc_list_lock);
  
        phead = &pstapriv->asoc_list;
-       plist = get_next(phead);
        /* check asoc_queue */
-       while (phead != plist) {
-               psta = container_of(plist, struct sta_info, asoc_list);
-               plist = get_next(plist);
+       list_for_each_safe(plist, tmp, phead) {
+               psta = list_entry(plist, struct sta_info, asoc_list);
  
                if (!memcmp((u8 *)mac, psta->hwaddr, ETH_ALEN)) {
                        if (psta->dot8021xalg != 1 || psta->bpairwise_key_installed) {
@@@ -2598,7 -2582,7 +2582,7 @@@ static int _cfg80211_rtw_mgmt_tx(struc
        struct pkt_attrib       *pattrib;
        unsigned char *pframe;
        int ret = _FAIL;
-       bool ack = true;
+       bool __maybe_unused ack = true;
        struct ieee80211_hdr *pwlanhdr;
        struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
diff --combined include/linux/i2c.h
index 685f8c73d99efe6227ef66051798e4a9c8e22c71,7d71131c394effb6593348bec1648b8ddee6d7ab..3eb60a2e9e6184b96c09eb80f708a647f043fc3d
@@@ -15,7 -15,6 +15,7 @@@
  #include <linux/device.h>     /* for struct device */
  #include <linux/sched.h>      /* for completion */
  #include <linux/mutex.h>
 +#include <linux/regulator/consumer.h>
  #include <linux/rtmutex.h>
  #include <linux/irqdomain.h>          /* for Host Notify IRQ */
  #include <linux/of.h>         /* for struct device_node */
@@@ -148,7 -147,6 +148,7 @@@ s32 __i2c_smbus_xfer(struct i2c_adapte
  /* Now follow the 'nice' access routines. These also document the calling
     conventions of i2c_smbus_xfer. */
  
 +u8 i2c_smbus_pec(u8 crc, u8 *p, size_t count);
  s32 i2c_smbus_read_byte(const struct i2c_client *client);
  s32 i2c_smbus_write_byte(const struct i2c_client *client, u8 value);
  s32 i2c_smbus_read_byte_data(const struct i2c_client *client, u8 command);
@@@ -345,7 -343,6 +345,6 @@@ struct i2c_client 
  };
  #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
  
- struct i2c_client *i2c_verify_client(struct device *dev);
  struct i2c_adapter *i2c_verify_adapter(struct device *dev);
  const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
                                         const struct i2c_client *client);
@@@ -479,6 -476,13 +478,13 @@@ i2c_new_ancillary_device(struct i2c_cli
                         u16 default_addr);
  
  void i2c_unregister_device(struct i2c_client *client);
+ struct i2c_client *i2c_verify_client(struct device *dev);
+ #else
+ static inline struct i2c_client *i2c_verify_client(struct device *dev)
+ {
+       return NULL;
+ }
  #endif /* I2C */
  
  /* Mainboard arch_initcall() code should register all its I2C devices.
@@@ -731,7 -735,6 +737,7 @@@ struct i2c_adapter 
        const struct i2c_adapter_quirks *quirks;
  
        struct irq_domain *host_notify_domain;
 +      struct regulator *bus_regulator;
  };
  #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
  
This page took 0.216986 seconds and 4 git commands to generate.