]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ca7984d 8396980)
Merge tag 'pinctrl-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorLinus Torvalds <[email protected]>
Sat, 28 May 2022 18:15:54 +0000 (11:15 -0700)
committerLinus Torvalds <[email protected]>
Sat, 28 May 2022 18:15:54 +0000 (11:15 -0700)
Pull pin control updates from Linus Walleij:
 "Pretty big this time. Mostly due to (nice) Renesas refactorings.

  Core changes:

   - New helpers from Andy such as for_each_gpiochip_node() affecting
     both GPIO and pin control, improving a bunch of drivers in the
     process.

   - Pulled in Marc Zyngiers work to make IRQ chips immutable, and
     started to apply fixups on top.

  New drivers:

   - New driver for Marvell MVEBU 98DX2530.

   - New driver for Mediatek MT8195.

   - Support Qualcomm PMX65 and PM6125.

   - New driver for Qualcomm SC7280 LPASS pin control.

   - New driver for Rockchip RK3588.

   - New driver for NXP Freescale i.MXRT1170.

   - New driver for Mediatek MT6795 Helio X10.

  Improvements:

   - Several Aspeed G6 cleanups and non-critical fixes.

   - Thorought refactoring of some of the ever improving Renesas
     drivers.

   - Clean up Mediatek MT8192 bindings a bit.

   - PWM output and clock monitoring in the Ocelot LAN966x driver.

   - Thorough refactoring and cleanup of the Ralink drivers such as
     RT2880, RT3883, RT305X, MT7620, MT7621, MT7628 splitting these into
     proper sub-drivers"

* tag 'pinctrl-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (161 commits)
  pinctrl: apple: Use a raw spinlock for the regmap
  pinctrl: berlin: bg4ct: Use devm_platform_*ioremap_resource() APIs
  pinctrl: intel: Fix kernel doc format, i.e. add return sections
  dt-bindings: pinctrl: qcom: Drop 'maxItems' on 'wakeup-parent'
  pinctrl: starfive: Make the irqchip immutable
  pinctrl: mediatek: Add pinctrl driver for MT6795 Helio X10
  dt-bindings: pinctrl: Add MediaTek MT6795 pinctrl bindings
  pinctrl: freescale: Add i.MXRT1170 pinctrl driver support
  dt-bindings: pinctrl: add i.MXRT1170 pinctrl Documentation
  dt-bindings: pinctrl: rockchip: increase max amount of device functions
  dt-bindings: pinctrl: qcom,pmic-gpio: add 'gpio-reserved-ranges'
  dt-bindings: pinctrl: qcom,pmic-gpio: add 'input-disable'
  dt-bindings: pinctrl: qcom,pmic-gpio: describe gpio-line-names
  dt-bindings: pinctrl: qcom,pmic-gpio: fix matching pin config
  dt-bindings: pinctrl: qcom,pmic-gpio: document PM8150L and PMM8155AU
  pinctrl: qcom: spmi-gpio: Add pm6125 compatible
  dt-bindings: pinctrl: qcom-pmic-gpio: Add pm6125 compatible
  pinctrl: intel: Drop unused irqchip member in struct intel_pinctrl
  pinctrl: intel: make irq_chip immutable
  pinctrl: cherryview: Use GPIO chip pointer in chv_gpio_irq_mask_unmask()
  ...

1  2 
Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/gpio/gpiolib-of.c patch | diff1 | diff2 | blob | history
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c patch | diff1 | diff2 | blob | history
drivers/pinctrl/pinctrl-ocelot.c patch | diff1 | diff2 | blob | history
include/linux/gpio/driver.h patch | diff1 | diff2 | blob | history

diff --combined Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
index 3b7b1134dea99785b55640ace51397aeace70244,bd3539644d3f611637b750fc0a4c26d1b63177fa..159a423e558690b9f09f1c16e07f2aad7b7b63d0
--- 1/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
--- 2/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
@@@ -21,9 -21,9 +21,10 @@@ Properties
                    - "qcom,sc7180-pdc": For SC7180
                    - "qcom,sc7280-pdc": For SC7280
                    - "qcom,sdm845-pdc": For SDM845
 -                  - "qcom,sdm8150-pdc": For SM8150
 -                  - "qcom,sdm8250-pdc": For SM8250
 -                  - "qcom,sdm8350-pdc": For SM8350
 +                  - "qcom,sm6350-pdc": For SM6350
++                  - "qcom,sm8150-pdc": For SM8150
 +                  - "qcom,sm8250-pdc": For SM8250
 +                  - "qcom,sm8350-pdc": For SM8350
  
  - reg:
        Usage: required
diff --combined MAINTAINERS
index 392467e9ab739c41e2acd657cc3357b829892c17,98e1374c02192d017d36df6e1df0d456d46a3799..e02f4601f8219713cf0b691e2a80f7093fe06b27
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1044,6 -1044,7 +1044,6 @@@ F:      arch/arm64/boot/dts/amd/amd-seattle-
  F:    drivers/net/ethernet/amd/xgbe/
  
  AMD SENSOR FUSION HUB DRIVER
 -M:    Nehal Shah <[email protected]>
  M:    Basavaraj Natikar <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1446,7 -1447,6 +1446,7 @@@ F:      drivers/media/i2c/aptina-pll.
  
  AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
  M:    Aleksa Savic <[email protected]>
 +M:    Jack Doan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/aquacomputer_d5next.rst
@@@ -1526,7 -1526,10 +1526,7 @@@ F:     Documentation/devicetree/bindings/mt
  F:    arch/arm/boot/dts/arm-realview-*
  F:    arch/arm/boot/dts/integrator*
  F:    arch/arm/boot/dts/versatile*
 -F:    arch/arm/mach-integrator/
 -F:    arch/arm/mach-realview/
  F:    arch/arm/mach-versatile/
 -F:    arch/arm/plat-versatile/
  F:    drivers/bus/arm-integrator-lm.c
  F:    drivers/clk/versatile/
  F:    drivers/i2c/busses/i2c-versatile.c
@@@ -1834,9 -1837,7 +1834,9 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/clock/apple,nco.yaml
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
 +F:    Documentation/devicetree/bindings/iommu/apple,sart.yaml
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 +F:    Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    Documentation/devicetree/bindings/power/apple*
@@@ -1847,14 -1848,12 +1847,14 @@@ F:   drivers/i2c/busses/i2c-pasemi-core.
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
 +F:    drivers/nvme/host/apple.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
  F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
 +F:    include/linux/soc/apple/*
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
@@@ -2573,7 -2572,7 +2573,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
 -F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
 +F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
  F:    arch/arm/boot/dts/rda8810pl-*
  F:    drivers/clocksource/timer-rda.c
  F:    drivers/gpio/gpio-rda.c
@@@ -3102,16 -3101,6 +3102,16 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
  F:    drivers/mmc/host/sdhci-of-aspeed*
  
 +ASPEED SMC SPI DRIVER
 +M:    Chin-Ting Kuo <[email protected]>
 +M:    Cédric Le Goater <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
 +F:    drivers/spi/spi-aspeed-smc.c
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -3582,9 -3571,8 +3582,9 @@@ M:      Andy Gospodarek <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://sourceforge.net/projects/bonding/
 +F:    Documentation/networking/bonding.rst
  F:    drivers/net/bonding/
 -F:    include/net/bonding.h
 +F:    include/net/bond*
  F:    include/uapi/linux/if_bonding.h
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@@ -3754,23 -3742,9 +3754,23 @@@ F:    drivers/net/dsa/bcm_sf2
  F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
 +BROADCOM BCMBCA ARM ARCHITECTURE
 +M:    William Zhang <[email protected]>
 +M:    Anand Gore <[email protected]>
 +M:    Kursad Oney <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 +F:    arch/arm/boot/dts/bcm47622.dtsi
 +F:    arch/arm/boot/dts/bcm947622.dts
 +N:    bcmbca
 +N:    bcm[9]?47622
 +
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Nicolas Saenz Julienne <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3780,13 -3754,12 +3780,13 @@@ F:   drivers/pci/controller/pcie-brcmstb.
  F:    drivers/staging/vc04_services
  N:    bcm2711
  N:    bcm283*
 +N:    raspberrypi
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  T:    git git://github.com/broadcom/mach-bcm
  F:    arch/arm/mach-bcm/
@@@ -3806,7 -3779,7 +3806,7 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
  
  BROADCOM BCM4908 ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@@ -3815,7 -3788,7 +3815,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM BCM4908 PINMUX DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
@@@ -3825,7 -3798,7 +3825,7 @@@ BROADCOM BCM5301X ARM ARCHITECTUR
  M:    Florian Fainelli <[email protected]>
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm470*
@@@ -3836,7 -3809,7 +3836,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm47189*
@@@ -3844,7 -3817,7 +3844,7 @@@ F:      arch/arm/boot/dts/bcm53573
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3858,7 -3831,7 +3858,7 @@@ F:      drivers/usb/gadget/udc/bcm63xx_udc.
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3876,21 -3849,21 +3876,21 @@@ N:   bcm712
  BROADCOM BDC DRIVER
  M:    Al Cooper <[email protected]>
  L:    [email protected]
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/
  
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/cpufreq/bmips-cpufreq.c
  
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3958,14 -3931,14 +3958,14 @@@ F:   drivers/net/wireless/broadcom/brcm80
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
  F:    drivers/gpio/gpio-brcmstb.c
  
  BROADCOM BRCMSTB I2C DRIVER
  M:    Kamal Dasu <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
@@@ -3973,7 -3946,7 +3973,7 @@@ F:      drivers/i2c/busses/i2c-brcmstb.
  
  BROADCOM BRCMSTB UART DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
@@@ -3981,7 -3954,7 +3981,7 @@@ F:      drivers/tty/serial/8250/8250_bcm7271
  
  BROADCOM BRCMSTB USB EHCI DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
@@@ -3989,7 -3962,7 +3989,7 @@@ F:      drivers/usb/host/ehci-brcm.
  
  BROADCOM BRCMSTB USB PIN MAP DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
@@@ -3997,14 -3970,14 +3997,14 @@@ F:   drivers/usb/misc/brcmstb-usb-pinmap.
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
  BROADCOM ETHERNET PHY DRIVERS
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@@ -4015,7 -3988,7 +4015,7 @@@ F:      include/linux/brcmphy.
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@@ -4029,7 -4002,7 +4029,7 @@@ F:      include/linux/platform_data/mdio-bcm
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4057,7 -4030,7 +4057,7 @@@ N:      stingra
  
  BROADCOM IPROC GBIT ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
@@@ -4066,7 -4039,7 +4066,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  F:    drivers/gpio/gpio-bcm-kona.c
@@@ -4099,7 -4072,7 +4099,7 @@@ F:      drivers/firmware/broadcom/
  BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
  M:    Rafał Miłecki <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4115,7 -4088,7 +4115,7 @@@ F:      include/linux/bcma
  
  BROADCOM SPI DRIVER
  M:    Kamal Dasu <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
  F:    drivers/spi/spi-bcm-qspi.*
@@@ -4124,7 -4097,7 +4124,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
@@@ -4132,7 -4105,7 +4132,7 @@@ F:      drivers/cpufreq/brcmstb
  
  BROADCOM STB AVS TMON DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
@@@ -4140,7 -4113,7 +4140,7 @@@ F:      drivers/thermal/broadcom/brcmstb
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@@ -4149,7 -4122,7 +4149,7 @@@ F:      drivers/memory/brcmstb_dpfe.
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <[email protected]>
  M:    Kamal Dasu <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/
@@@ -4159,7 -4132,7 +4159,7 @@@ BROADCOM STB PCIE DRIVE
  M:    Jim Quinlan <[email protected]>
  M:    Nicolas Saenz Julienne <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
@@@ -4167,7 -4140,7 +4167,7 @@@ F:      drivers/pci/controller/pcie-brcmstb.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -4184,7 -4157,7 +4184,7 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM VK DRIVER
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    drivers/misc/bcm-vk/
  F:    include/uapi/linux/misc/bcm_vk.h
@@@ -4402,6 -4375,7 +4402,6 @@@ 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
  F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
@@@ -4600,9 -4574,7 +4600,9 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/module-signing.rst
  F:    certs/
 +F:    scripts/check-blacklist-hashes.awk
  F:    scripts/sign-file.c
 +F:    tools/certs/
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda <[email protected]>
@@@ -4647,7 -4619,6 +4647,7 @@@ F:      Documentation/dev-tools/checkpatch.r
  
  CHINESE DOCUMENTATION
  M:    Alex Shi <[email protected]>
 +M:    Yanteng Si <[email protected]>
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -4721,12 -4692,10 +4721,12 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  M:    Lucas Tanure <[email protected]>
 +M:    Richard Fitzgerald <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
 +F:    include/dt-bindings/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/soc/codecs/cs*
  
@@@ -5027,7 -4996,6 +5027,7 @@@ F:      Documentation/admin-guide/cgroup-v1
  F:    Documentation/admin-guide/cgroup-v2.rst
  F:    include/linux/cgroup*
  F:    kernel/cgroup/
 +F:    tools/testing/selftests/cgroup/
  
  CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
  M:    Tejun Heo <[email protected]>
@@@ -5056,15 -5024,11 +5056,15 @@@ M:   Johannes Weiner <[email protected]
  M:    Michal Hocko <[email protected]>
  M:    Roman Gushchin <[email protected]>
  M:    Shakeel Butt <[email protected]>
 +R:    Muchun Song <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
 +F:    tools/testing/selftests/cgroup/memcg_protection.m
 +F:    tools/testing/selftests/cgroup/test_kmem.c
 +F:    tools/testing/selftests/cgroup/test_memcontrol.c
  
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <[email protected]>
@@@ -5086,6 -5050,12 +5086,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/corsair-psu.rst
  F:    drivers/hwmon/corsair-psu.c
  
 -COSA/SRP SYNC SERIAL DRIVER
 -M:    Jan "Yenya" Kasprzak <[email protected]>
 -S:    Maintained
 -W:    http://www.fi.muni.cz/~kas/cosa/
 -F:    drivers/net/wan/cosa*
 -
  COUNTER SUBSYSTEM
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
@@@ -5267,14 -5237,6 +5267,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  F:    drivers/media/platform/sunxi/sun6i-csi/
  
 +CTU CAN FD DRIVER
 +M:    Pavel Pisa <[email protected]>
 +M:    Ondrej Ille <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
 +F:    drivers/net/can/ctucanfd/
 +
  CW1200 WLAN driver
  M:    Solomon Peachy <[email protected]>
  S:    Maintained
@@@ -5477,7 -5439,6 +5477,7 @@@ F:      net/ax25/sysctl_net_ax25.
  
  DATA ACCESS MONITOR
  M:    SeongJae Park <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
@@@ -5956,7 -5917,7 +5956,7 @@@ R:      Benjamin Gaignard <benjamin.gaignard
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6031,12 -5992,6 +6031,12 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/translations/it_IT
  
 +DOCUMENTATION/JAPANESE
 +R:    Akira Yokosawa <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/translations/ja_JP
 +
  DONGWOON DW9714 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -6303,9 -6258,8 +6303,9 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
  
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <[email protected]>
 -M:    Sean Paul <[email protected]>
 -R:    Abhinav Kumar <[email protected]>
 +M:    Abhinav Kumar <[email protected]>
 +M:    Dmitry Baryshkov <[email protected]>
 +R:    Sean Paul <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -6358,11 -6312,6 +6358,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
  F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
  
 +DRM DRIVER FOR PARADE PS8640 BRIDGE CHIP
 +R:    Douglas Anderson <[email protected]>
 +F:    Documentation/devicetree/bindings/display/bridge/ps8640.yaml
 +F:    drivers/gpu/drm/bridge/parade-ps8640.c
 +
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
  M:    Noralf Trønnes <[email protected]>
  S:    Maintained
@@@ -6476,11 -6425,6 +6476,11 @@@ DRM DRIVER FOR TDFX VIDEO CARD
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
  
 +DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 +R:    Douglas Anderson <[email protected]>
 +F:    Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
 +F:    drivers/gpu/drm/bridge/ti-sn65dsi86.c
 +
  DRM DRIVER FOR TPO TPG110 PANELS
  M:    Linus Walleij <[email protected]>
  S:    Maintained
@@@ -6600,7 -6544,6 +6600,7 @@@ R:      Jonas Karlman <[email protected]
  R:    Jernej Skrabec <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  
  DRM DRIVERS FOR EXYNOS
@@@ -6644,7 -6587,7 +6644,7 @@@ F:      drivers/gpu/drm/gma500
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
  M:    Tian Tao  <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
  L:    [email protected]
@@@ -7440,6 -7383,7 +7440,6 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
 -F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -7555,7 -7499,7 +7555,7 @@@ F:      Documentation/hwmon/f71805f.rs
  F:    drivers/hwmon/f71805f.c
  
  FADDR2LINE
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  S:    Maintained
  F:    scripts/faddr2line
  
@@@ -8168,7 -8112,7 +8168,7 @@@ M:      Ingo Molnar <[email protected]
  R:    Peter Zijlstra <[email protected]>
  R:    Darren Hart <[email protected]>
  R:    Davidlohr Bueso <[email protected]>
 -R:    André Almeida <andrealmeid@collabora.com>
 +R:    André Almeida <andrealmeid@igalia.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -8441,7 -8385,7 +8441,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/admin-guide/gpio/
@@@ -8612,6 -8556,17 +8612,6 @@@ L:     [email protected]
  S:    Maintained
  F:    block/partitions/efi.*
  
 -H8/300 ARCHITECTURE
 -M:    Yoshinori Sato <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://uclinux-h8.sourceforge.jp
 -T:    git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
 -F:    arch/h8300/
 -F:    drivers/clk/h8300/
 -F:    drivers/clocksource/h8300_*.c
 -F:    drivers/irqchip/irq-renesas-h8*.c
 -
  HABANALABS PCI DRIVER
  M:    Oded Gabbay <[email protected]>
  S:    Supported
@@@ -8797,14 -8752,6 +8797,14 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 +HID WACOM DRIVER
 +M:    Ping Cheng <[email protected]>
 +M:    Jason Gerecke  <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/wacom.h
 +F:    drivers/hid/wacom_*
 +
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -8820,6 -8767,7 +8820,6 @@@ F:      kernel/time/timer_*.
  HIGH-SPEED SCC DRIVER FOR AX.25
  L:    [email protected]
  S:    Orphan
 -F:    drivers/net/hamradio/dmascc.c
  F:    drivers/net/hamradio/scc.c
  
  HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
@@@ -8900,7 -8848,7 +8900,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/hisilicon/
  
  HIKEY960 ONBOARD USB GPIO HUB DRIVER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/hisi_hikey_usb.c
@@@ -9069,20 -9017,16 +9069,20 @@@ S:   Orpha
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
 -HUGETLB FILESYSTEM
 +HUGETLB SUBSYSTEM
  M:    Mike Kravetz <[email protected]>
 +M:    Muchun Song <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  F:    Documentation/admin-guide/mm/hugetlbpage.rst
  F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/vm/vmemmap_dedup.rst
  F:    fs/hugetlbfs/
  F:    include/linux/hugetlb.h
  F:    mm/hugetlb.c
 +F:    mm/hugetlb_vmemmap.c
 +F:    mm/hugetlb_vmemmap.h
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <[email protected]>
@@@ -9918,14 -9862,6 +9918,14 @@@ B:    https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
  F:    drivers/idle/intel_idle.c
  
 +INTEL IN FIELD SCAN (IFS) DEVICE
 +M:    Jithu Joseph <[email protected]>
 +R:    Ashok Raj <[email protected]>
 +R:    Tony Luck <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/intel/ifs
 +F:    include/trace/events/intel_ifs.h
 +
  INTEL INTEGRATED SENSOR HUB DRIVER
  M:    Srinivas Pandruvada <[email protected]>
  M:    Jiri Kosina <[email protected]>
@@@ -10051,7 -9987,6 +10051,7 @@@ S:    Supporte
  F:    Documentation/driver-api/mei/*
  F:    drivers/misc/mei/
  F:    drivers/watchdog/mei_wdt.c
 +F:    include/linux/mei_aux.h
  F:    include/linux/mei_cl_bus.h
  F:    include/uapi/linux/mei.h
  F:    samples/mei/*
@@@ -10196,7 -10131,7 +10196,7 @@@ S:   Supporte
  F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Luca Coelho <luciano.coelho@intel.com>
 +M:    Gregory Greenman <gregory.greenman@intel.com>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -10832,8 -10767,6 +10832,8 @@@ T:   git git://github.com/kvm-riscv/linux
  F:    arch/riscv/include/asm/kvm*
  F:    arch/riscv/include/uapi/asm/kvm*
  F:    arch/riscv/kvm/
 +F:    tools/testing/selftests/kvm/*/riscv/
 +F:    tools/testing/selftests/kvm/riscv/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
@@@ -10848,12 -10781,9 +10848,12 @@@ F: Documentation/virt/kvm/s390
  F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/include/uapi/asm/kvm*
 +F:    arch/s390/include/uapi/asm/uvdevice.h
  F:    arch/s390/kernel/uv.c
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
 +F:    drivers/s390/char/uvdevice.c
 +F:    tools/testing/selftests/drivers/s390x/uvdevice/
  F:    tools/testing/selftests/kvm/*/s390x/
  F:    tools/testing/selftests/kvm/s390x/
  
@@@ -10926,15 -10856,6 +10926,15 @@@ S: Supporte
  F:    include/keys/trusted_tee.h
  F:    security/keys/trusted-keys/trusted_tee.c
  
 +KEYS-TRUSTED-CAAM
 +M:    Ahmad Fatoum <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    include/keys/trusted_caam.h
 +F:    security/keys/trusted-keys/trusted_caam.c
 +
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  M:    Jarkko Sakkinen <[email protected]>
@@@ -10989,7 -10910,6 +10989,7 @@@ F:   drivers/tty/serial/kgdboc.
  F:    include/linux/kdb.h
  F:    include/linux/kgdb.h
  F:    kernel/debug/
 +F:    kernel/module/kdb.c
  
  KHADAS MCU MFD DRIVER
  M:    Neil Armstrong <[email protected]>
@@@ -11428,7 -11348,7 +11428,7 @@@ F:   drivers/mmc/host/litex_mmc.
  N:    litex
  
  LIVE PATCHING
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Jiri Kosina <[email protected]>
  M:    Miroslav Benes <[email protected]>
  M:    Petr Mladek <[email protected]>
@@@ -11443,7 -11363,6 +11443,7 @@@ F:   arch/s390/include/asm/livepatch.
  F:    arch/x86/include/asm/livepatch.h
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
 +F:    kernel/module/livepatch.c
  F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
@@@ -11909,16 -11828,9 +11909,16 @@@ MARVELL XENON MMC/SD/SDIO HOST CONTROLL
  M:    Hu Ziji <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 +F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
  F:    drivers/mmc/host/sdhci-xenon*
  
 +MARVELL OCTEON ENDPOINT DRIVER
 +M:    Veerasenareddy Burru <[email protected]>
 +M:    Abhijit Ayarekar <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/marvell/octeon_ep
 +
  MATROX FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -12244,7 -12156,7 +12244,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/imx7.rst
  F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 -F:    drivers/media/platform/imx/imx-mipi-csis.c
 +F:    drivers/media/platform/nxp/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
  
  MEDIA DRIVERS FOR HELENE
@@@ -12299,7 -12211,7 +12299,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 +F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml
  F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
@@@ -12449,7 -12361,7 +12449,7 @@@ MEDIATEK I2C CONTROLLER DRIVE
  M:    Qii Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
  F:    drivers/i2c/busses/i2c-mt65xx.c
  
  MEDIATEK IOMMU DRIVER
@@@ -12462,9 -12374,10 +12462,9 @@@ F:  drivers/iommu/mtk_iommu
  F:    include/dt-bindings/memory/mt*-port.h
  
  MEDIATEK JPEG DRIVER
 -M:    Rick Chang <[email protected]>
  M:    Bin Liu <[email protected]>
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 +F:    Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
  F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
@@@ -12480,7 -12393,7 +12480,7 @@@ MEDIATEK MEDIA DRIVE
  M:    Tiffany Lin <[email protected]>
  M:    Andrew-CT Chen <[email protected]>
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
 +F:    Documentation/devicetree/bindings/media/mediatek,vcodec*.yaml
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  F:    drivers/media/platform/mediatek/vcodec/
  F:    drivers/media/platform/mediatek/vpu/
@@@ -12567,17 -12480,6 +12567,17 @@@ S: Maintaine
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
 +MEDIATEK T7XX 5G WWAN MODEM DRIVER
 +M:    Chandrashekar Devegowda <[email protected]>
 +M:    Intel Corporation <[email protected]>
 +R:    Chiranjeevi Rapolu <[email protected]>
 +R:    Liu Haijun <[email protected]>
 +R:    M Chetan Kumar <[email protected]>
 +R:    Ricardo Martinez <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wwan/t7xx/
 +
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
  L:    [email protected]
@@@ -13007,13 -12909,6 +13007,13 @@@ F: drivers/net/dsa/microchip/
  F:    include/linux/platform_data/microchip-ksz.h
  F:    net/dsa/tag_ksz.c
  
 +MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
 +M:    Arun Ramadoss <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/microchip_t1.c
 +
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
  M:    [email protected]
@@@ -13375,7 -13270,7 +13375,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/module.h
 -F:    kernel/module.c
 +F:    kernel/module/
  
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <[email protected]>
@@@ -13639,21 -13534,12 +13639,21 @@@ M:        Samuel Mendoza-Jonas <sam@mendozajon
  S:    Maintained
  F:    net/ncsi/
  
 -NCT6775 HARDWARE MONITOR DRIVER
 +NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/nct6775.rst
 -F:    drivers/hwmon/nct6775.c
 +F:    drivers/hwmon/nct6775-core.c
 +F:    drivers/hwmon/nct6775-platform.c
 +F:    drivers/hwmon/nct6775.h
 +
 +NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER
 +M:    Zev Weiss <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
 +F:    drivers/hwmon/nct6775-i2c.c
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -13886,7 -13772,6 +13886,7 @@@ F:   include/net/mptcp.
  F:    include/trace/events/mptcp.h
  F:    include/uapi/linux/mptcp.h
  F:    net/mptcp/
 +F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
  
  NETWORKING [TCP]
@@@ -14314,7 -14199,7 +14314,7 @@@ R:   NXP Linux Team <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
 -F:    drivers/media/platform/imx-jpeg
 +F:    drivers/media/platform/nxp/imx-jpeg
  
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
  M:    Jonas Malaco <[email protected]>
@@@ -14339,7 -14224,7 +14339,7 @@@ F:   lib/objagg.
  F:    lib/test_objagg.c
  
  OBJTOOL
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
@@@ -14487,6 -14372,7 +14487,6 @@@ F:   arch/arm/*omap*/*pm
  F:    drivers/cpufreq/omap-cpufreq.c
  
  OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <[email protected]>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14512,7 -14398,6 +14512,7 @@@ F:   arch/arm/boot/dts/am335x-nano.dt
  
  OMAP1 SUPPORT
  M:    Aaro Koskinen <[email protected]>
 +M:    Janusz Krzysztofik <[email protected]>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14948,19 -14833,6 +14948,19 @@@ F: Documentation/core-api/padata.rs
  F:    include/linux/padata.h
  F:    kernel/padata.c
  
 +PAGE CACHE
 +M:    Matthew Wilcox (Oracle) <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.infradead.org/users/willy/pagecache.git
 +F:    Documentation/filesystems/locking.rst
 +F:    Documentation/filesystems/vfs.rst
 +F:    include/linux/pagemap.h
 +F:    mm/filemap.c
 +F:    mm/page-writeback.c
 +F:    mm/readahead.c
 +F:    mm/truncate.c
 +
  PAGE POOL
  M:    Jesper Dangaard Brouer <[email protected]>
  M:    Ilias Apalodimas <[email protected]>
@@@ -15493,7 -15365,7 +15493,7 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/uniphier-pcie*
 +F:    Documentation/devicetree/bindings/pci/socionext,uniphier-pcie*
  F:    drivers/pci/controller/dwc/pcie-uniphier*
  
  PCIE DRIVER FOR ST SPEAR13XX
@@@ -15603,8 -15475,7 +15603,8 @@@ F:   tools/perf
  PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
 -R:    Mathieu Poirier <[email protected]>
 +R:    James Clark <[email protected]>
 +R:    Mike Leach <[email protected]>
  R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -15993,9 -15864,7 +15993,9 @@@ F:   kernel/printk
  PRINTK INDEXING
  R:    Chris Down <[email protected]>
  S:    Maintained
 +F:    Documentation/core-api/printk-index.rst
  F:    kernel/printk/index.c
 +K:    printk_index
  
  PROC FILESYSTEM
  L:    [email protected]
@@@ -16099,6 -15968,7 +16099,6 @@@ F:   include/asm-generic/syscall.
  F:    include/linux/ptrace.h
  F:    include/linux/regset.h
  F:    include/uapi/linux/ptrace.h
 -F:    include/uapi/linux/ptrace.h
  F:    kernel/ptrace.c
  
  PULSE8-CEC DRIVER
@@@ -16109,12 -15979,6 +16109,12 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/pulse8-cec.rst
  F:    drivers/media/cec/usb/pulse8/
  
 +PURELIFI PLFXLC DRIVER
 +M:    Srinivasan Raju <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/purelifi/plfxlc/
 +
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <[email protected]>
  L:    [email protected]       (subscribers-only)
@@@ -16582,7 -16446,6 +16582,7 @@@ S:   Supporte
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  B:    https://gitlab.freedesktop.org/drm/amd/-/issues
  C:    irc://irc.oftc.net/radeon
 +F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
@@@ -16647,6 -16510,13 +16647,13 @@@ L: [email protected]
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/mt7621*
  
+ RALINK PINCTRL DRIVER
+ M:    Arınç ÜNAL <[email protected]>
+ M:    Sergio Paracuellos <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/pinctrl/ralink/
+ 
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
  M:    Helmut Schaa <[email protected]>
@@@ -17652,7 -17522,6 +17659,7 @@@ R:   Steven Rostedt <[email protected]
  R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
  R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
  R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
 +R:    Valentin Schneider <[email protected]> (TOPOLOGY)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -17796,7 -17665,7 +17803,7 @@@ K:   \bTIF_SECCOMP\
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
@@@ -18127,8 -17996,8 +18134,8 @@@ F:   drivers/platform/x86/touchscreen_dmi
  SILICON LABS WIRELESS DRIVERS (for WFxxx series)
  M:    Jérôme Pouiller <[email protected]>
  S:    Supported
 -F:    Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml
 -F:    drivers/staging/wfx/
 +F:    Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
 +F:    drivers/net/wireless/silabs/wfx/
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
@@@ -18241,7 -18110,6 +18248,7 @@@ M:   Joonsoo Kim <[email protected]
  M:    Andrew Morton <[email protected]>
  M:    Vlastimil Babka <[email protected]>
  R:    Roman Gushchin <[email protected]>
 +R:    Hyeonggon Yoo <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
@@@ -18931,7 -18799,7 +18938,7 @@@ F:   include/dt-bindings/reset/starfive-j
  
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <[email protected]>
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Jason Baron <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Ard Biesheuvel <[email protected]>
@@@ -19015,14 -18883,6 +19022,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUNPLUS ETHERNET DRIVER
 +M:    Wells Lu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://sunplus.atlassian.net/wiki/spaces/doc/overview
 +F:    Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
 +F:    drivers/net/ethernet/sunplus/
 +
  SUNPLUS OCOTP DRIVER
  M:    Vincent Shih <[email protected]>
  S:    Maintained
@@@ -19688,7 -19548,6 +19695,7 @@@ F:   drivers/thermal
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
  F:    include/uapi/linux/thermal.h
 +F:    tools/lib/thermal/
  F:    tools/thermal/
  
  THERMAL DRIVER FOR AMLOGIC SOCS
@@@ -19941,7 -19800,7 +19948,7 @@@ F:   drivers/net/wireless/ti
  F:    include/linux/wl12xx.h
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  M:    Thomas Gleixner <[email protected]>
  R:    Stephen Boyd <[email protected]>
  L:    [email protected]
@@@ -19988,7 -19847,6 +19995,7 @@@ F:   drivers/media/usb/tm6000
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/renesas_sdhi*
  F:    drivers/mmc/host/tmio_mmc*
@@@ -19998,7 -19856,6 +20005,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
@@@ -20682,6 -20539,7 +20689,6 @@@ F:   drivers/usb/host/uhci
  
  USB VIDEO CLASS
  M:    Laurent Pinchart <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
  W:    http://www.ideasonboard.org/uvc/
@@@ -21593,7 -21451,7 +21600,7 @@@ F:   arch/x86/kernel/apic/x2apic_uv_x.
  F:    arch/x86/platform/uv/
  
  X86 STACK UNWINDING
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    arch/x86/include/asm/unwind*.h
@@@ -21659,7 -21517,6 +21666,7 @@@ K:   (?:\b|_)xdp(?:\b|_
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <[email protected]>
  M:    Magnus Karlsson <[email protected]>
 +M:    Maciej Fijalkowski <[email protected]>
  R:    Jonathan Lemon <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -21793,7 -21650,7 +21800,7 @@@ M:   Appana Durga Kedareswara rao <appana
  R:    Naga Sureshkumar Relli <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/xilinx_can.txt
 +F:    Documentation/devicetree/bindings/net/can/xilinx,can.yaml
  F:    drivers/net/can/xilinx_can.c
  
  XILINX GPIO DRIVER
diff --combined drivers/gpio/gpiolib-of.c
index b7ac07f43b95e24f5430c7df5ab0910a2d616da9,d9b235c88b54e9e60406f3fe7e94748c2a1460a4..3d6c3ffd55766509bf210faddc011260f04e8f7e
--- 1/drivers/gpio/gpiolib-of.c
--- 2/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@@ -712,8 -712,9 +712,8 @@@ static void of_gpiochip_remove_hog(stru
                                   struct device_node *hog)
  {
        struct gpio_desc *desc;
 -      unsigned int i;
  
 -      for_each_gpio_desc_with_flag(i, chip, desc, FLAG_IS_HOGGED)
 +      for_each_gpio_desc_with_flag(chip, desc, FLAG_IS_HOGGED)
                if (desc->hog == hog)
                        gpiochip_free_own_desc(desc);
  }
@@@ -909,7 -910,7 +909,7 @@@ static void of_gpiochip_init_valid_mask
                                           i, &start);
                of_property_read_u32_index(np, "gpio-reserved-ranges",
                                           i + 1, &count);
 -              if (start >= chip->ngpio || start + count >= chip->ngpio)
 +              if (start >= chip->ngpio || start + count > chip->ngpio)
                        continue;
  
                bitmap_clear(chip->valid_mask, start, count);
@@@ -930,6 -931,11 +930,11 @@@ static int of_gpiochip_add_pin_range(st
        if (!np)
                return 0;
  
+       if (!of_property_read_bool(np, "gpio-ranges") &&
+           chip->of_gpio_ranges_fallback) {
+               return chip->of_gpio_ranges_fallback(chip, np);
+       }
+ 
        group_names = of_find_property(np, group_names_propname, NULL);
  
        for (;; index++) {
diff --combined drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
index 4828aa25e5c9b84aa3af3f5f43263b2d625fc42c,cc085ba2d7e4651a302fa5effe87c8917b1028d8..64d8a568b3dbd3ec4e056565f0c8b1c3a3829696
--- 1/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
--- 2/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
@@@ -105,12 -105,12 +105,12 @@@ static void npcm_gpio_set(struct gpio_c
        unsigned long flags;
        unsigned long val;
  
 -      spin_lock_irqsave(&gc->bgpio_lock, flags);
 +      raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
  
        val = ioread32(reg) | pinmask;
        iowrite32(val, reg);
  
 -      spin_unlock_irqrestore(&gc->bgpio_lock, flags);
 +      raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
  }
  
  static void npcm_gpio_clr(struct gpio_chip *gc, void __iomem *reg,
@@@ -119,12 -119,12 +119,12 @@@
        unsigned long flags;
        unsigned long val;
  
 -      spin_lock_irqsave(&gc->bgpio_lock, flags);
 +      raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
  
        val = ioread32(reg) & ~pinmask;
        iowrite32(val, reg);
  
 -      spin_unlock_irqrestore(&gc->bgpio_lock, flags);
 +      raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
  }
  
  static void npcmgpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
@@@ -1898,9 -1898,9 +1898,9 @@@ static int npcm7xx_gpio_of(struct npcm7
                }
  
                ret = irq_of_parse_and_map(np, 0);
-               if (ret < 0) {
+               if (!ret) {
                        dev_err(dev, "No IRQ for GPIO bank %u\n", id);
-                       return ret;
+                       return -EINVAL;
                }
                pctrl->gpio_bank[id].irq = ret;
                pctrl->gpio_bank[id].irq_chip = npcmgpio_irqchip;
diff --combined drivers/pinctrl/pinctrl-ocelot.c
index 6a956ee94494f50696fca8fb0b3d981b1b1dfb98,843704fa86253dd08f45d7a1d6b1c0697cc3261e..5f4a8c5c66508ac6bf96789403e7dd1f061a2cf3
--- 1/drivers/pinctrl/pinctrl-ocelot.c
--- 2/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@@ -19,6 -19,7 +19,7 @@@
  #include <linux/pinctrl/pinconf-generic.h>
  #include <linux/platform_device.h>
  #include <linux/regmap.h>
+ #include <linux/reset.h>
  #include <linux/slab.h>
  
  #include "core.h"
@@@ -60,6 -61,7 +61,7 @@@ enum 
        FUNC_CAN0_a,
        FUNC_CAN0_b,
        FUNC_CAN1,
+       FUNC_CLKMON,
        FUNC_NONE,
        FUNC_FC0_a,
        FUNC_FC0_b,
@@@ -129,7 -131,6 +131,7 @@@
        FUNC_PTP1,
        FUNC_PTP2,
        FUNC_PTP3,
 +      FUNC_PTPSYNC_0,
        FUNC_PTPSYNC_1,
        FUNC_PTPSYNC_2,
        FUNC_PTPSYNC_3,
@@@ -138,6 -139,8 +140,8 @@@
        FUNC_PTPSYNC_6,
        FUNC_PTPSYNC_7,
        FUNC_PWM,
+       FUNC_PWM_a,
+       FUNC_PWM_b,
        FUNC_QSPI1,
        FUNC_QSPI2,
        FUNC_R,
@@@ -184,6 -187,7 +188,7 @@@ static const char *const ocelot_functio
        [FUNC_CAN0_a]           = "can0_a",
        [FUNC_CAN0_b]           = "can0_b",
        [FUNC_CAN1]             = "can1",
+       [FUNC_CLKMON]           = "clkmon",
        [FUNC_NONE]             = "none",
        [FUNC_FC0_a]            = "fc0_a",
        [FUNC_FC0_b]            = "fc0_b",
@@@ -253,7 -257,6 +258,7 @@@
        [FUNC_PTP1]             = "ptp1",
        [FUNC_PTP2]             = "ptp2",
        [FUNC_PTP3]             = "ptp3",
 +      [FUNC_PTPSYNC_0]        = "ptpsync_0",
        [FUNC_PTPSYNC_1]        = "ptpsync_1",
        [FUNC_PTPSYNC_2]        = "ptpsync_2",
        [FUNC_PTPSYNC_3]        = "ptpsync_3",
@@@ -262,6 -265,8 +267,8 @@@
        [FUNC_PTPSYNC_6]        = "ptpsync_6",
        [FUNC_PTPSYNC_7]        = "ptpsync_7",
        [FUNC_PWM]              = "pwm",
+       [FUNC_PWM_a]            = "pwm_a",
+       [FUNC_PWM_b]            = "pwm_b",
        [FUNC_QSPI1]            = "qspi1",
        [FUNC_QSPI2]            = "qspi2",
        [FUNC_R]                = "reserved",
@@@ -977,15 -982,15 +984,15 @@@ LAN966X_P(23,   GPIO,    NONE,     NONE
  LAN966X_P(24,   GPIO,   FC0_b, IB_TRG_a,   USB_H_c, OB_TRG_a, IRQ_IN_c,   TACHO_a,        R);
  LAN966X_P(25,   GPIO,   FC0_b, IB_TRG_a,   USB_H_c, OB_TRG_a, IRQ_OUT_c,   SFP_SD,        R);
  LAN966X_P(26,   GPIO,   FC0_b, IB_TRG_a,   USB_S_c, OB_TRG_a,   CAN0_a,    SFP_SD,        R);
- LAN966X_P(27,   GPIO,    NONE,     NONE,      NONE, OB_TRG_a,   CAN0_a,      NONE,        R);
+ LAN966X_P(27,   GPIO,    NONE,     NONE,      NONE, OB_TRG_a,   CAN0_a,     PWM_a,        R);
  LAN966X_P(28,   GPIO,  MIIM_a,     NONE,      NONE, OB_TRG_a, IRQ_OUT_c,   SFP_SD,        R);
  LAN966X_P(29,   GPIO,  MIIM_a,     NONE,      NONE, OB_TRG_a,     NONE,      NONE,        R);
- LAN966X_P(30,   GPIO,   FC3_c,     CAN1,      NONE,   OB_TRG,   RECO_b,      NONE,        R);
- LAN966X_P(31,   GPIO,   FC3_c,     CAN1,      NONE,   OB_TRG,   RECO_b,      NONE,        R);
+ LAN966X_P(30,   GPIO,   FC3_c,     CAN1,    CLKMON,   OB_TRG,   RECO_b,      NONE,        R);
+ LAN966X_P(31,   GPIO,   FC3_c,     CAN1,    CLKMON,   OB_TRG,   RECO_b,      NONE,        R);
  LAN966X_P(32,   GPIO,   FC3_c,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,      NONE,        R);
  LAN966X_P(33,   GPIO,   FC1_b,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,    MIIM_b,        R);
  LAN966X_P(34,   GPIO,   FC1_b,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,    MIIM_b,        R);
 -LAN966X_P(35,   GPIO,   FC1_b,     NONE,   SGPIO_a,   CAN0_b,     NONE,      NONE,        R);
 +LAN966X_P(35,   GPIO,   FC1_b,  PTPSYNC_0, SGPIO_a,   CAN0_b,     NONE,      NONE,        R);
  LAN966X_P(36,   GPIO,    NONE,  PTPSYNC_1,    NONE,   CAN0_b,     NONE,      NONE,        R);
  LAN966X_P(37,   GPIO, FC_SHRD0, PTPSYNC_2, TWI_SLC_GATE_AD, NONE, NONE,      NONE,        R);
  LAN966X_P(38,   GPIO,    NONE,  PTPSYNC_3,    NONE,     NONE,     NONE,      NONE,        R);
@@@ -1001,7 -1006,7 +1008,7 @@@ LAN966X_P(47,   GPIO,   FC1_c,   OB_TRG
  LAN966X_P(48,   GPIO,   FC1_c,   OB_TRG_b, IB_TRG_b, IRQ_OUT_a, FC_SHRD6, IRQ_IN_a,       R);
  LAN966X_P(49,   GPIO, FC_SHRD7,  OB_TRG_b, IB_TRG_b, IRQ_OUT_a, TWI_SLC_GATE, IRQ_IN_a,   R);
  LAN966X_P(50,   GPIO, FC_SHRD16, OB_TRG_b, IB_TRG_b, IRQ_OUT_a, TWI_SLC_GATE, NONE,       R);
- LAN966X_P(51,   GPIO,   FC3_b,   OB_TRG_b, IB_TRG_c, IRQ_OUT_b,    NONE,  IRQ_IN_b,       R);
+ LAN966X_P(51,   GPIO,   FC3_b,   OB_TRG_b, IB_TRG_c, IRQ_OUT_b,   PWM_b,  IRQ_IN_b,       R);
  LAN966X_P(52,   GPIO,   FC3_b,   OB_TRG_b, IB_TRG_c, IRQ_OUT_b, TACHO_b,  IRQ_IN_b,       R);
  LAN966X_P(53,   GPIO,   FC3_b,   OB_TRG_b, IB_TRG_c, IRQ_OUT_b,    NONE,  IRQ_IN_b,       R);
  LAN966X_P(54,   GPIO, FC_SHRD8,  OB_TRG_b, IB_TRG_c, IRQ_OUT_b, TWI_SLC_GATE, IRQ_IN_b,   R);
@@@ -1908,6 -1913,7 +1915,7 @@@ static int ocelot_pinctrl_probe(struct 
  {
        struct device *dev = &pdev->dev;
        struct ocelot_pinctrl *info;
+       struct reset_control *reset;
        struct regmap *pincfg;
        void __iomem *base;
        int ret;
@@@ -1923,6 -1929,12 +1931,12 @@@
  
        info->desc = (struct pinctrl_desc *)device_get_match_data(dev);
  
+       reset = devm_reset_control_get_optional_shared(dev, "switch");
+       if (IS_ERR(reset))
+               return dev_err_probe(dev, PTR_ERR(reset),
+                                    "Failed to get reset\n");
+       reset_control_reset(reset);
+ 
        base = devm_ioremap_resource(dev,
                        platform_get_resource(pdev, IORESOURCE_MEM, 0));
        if (IS_ERR(base))
diff --combined include/linux/gpio/driver.h
index 09792529cff2c50a701bd2cb6d8e7f50049a1bb0,baf022068b239bf88c01f819415f7b477c76d845..654184cdb719c3085782854fc3e08ccd3b8c3f6f
--- 1/include/linux/gpio/driver.h
--- 2/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@@ -446,7 -446,7 +446,7 @@@ struct gpio_chip 
        void __iomem *reg_dir_in;
        bool bgpio_dir_unreadable;
        int bgpio_bits;
 -      spinlock_t bgpio_lock;
 +      raw_spinlock_t bgpio_lock;
        unsigned long bgpio_data;
        unsigned long bgpio_dir;
  #endif /* CONFIG_GPIO_GENERIC */
@@@ -502,6 -502,18 +502,18 @@@
         */
        int (*of_xlate)(struct gpio_chip *gc,
                        const struct of_phandle_args *gpiospec, u32 *flags);
+ 
+       /**
+        * @of_gpio_ranges_fallback:
+        *
+        * Optional hook for the case that no gpio-ranges property is defined
+        * within the device tree node "np" (usually DT before introduction
+        * of gpio-ranges). So this callback is helpful to provide the
+        * necessary backward compatibility for the pin ranges.
+        */
+       int (*of_gpio_ranges_fallback)(struct gpio_chip *gc,
+                                      struct device_node *np);
+ 
  #endif /* CONFIG_OF_GPIO */
  };
  
Empty description
This page took 0.208354 seconds and 4 git commands to generate.