Commit 55b4083b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "Here is a third set of fixes for the soc tree, well within the
  expected set of changes.

  Maintainer list changes:
   - Krzysztof Kozlowski and Jisheng Zhang both have new email addresses
   - Broadcom iProc has a new git tree

  Regressions:
   - Robert Foss sends a revert for a Mediatek DPI bridge patch that
     caused an inadvertent break in the DT binding
   - mstar timers need to be included in Kconfig

  Devicetree fixes for:
   - Aspeed ast2600 spi pinmux
   - Tegra eDP panels on Nyan FHD
   - Tegra display IOMMU
   - Qualcomm sm8350 UFS clocks
   - minor DT changes for Marvell Armada, Qualcomm sdx65, Qualcomm
     sm8450, and Broadcom BCM2711"

* tag 'soc-fixes-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0
  MAINTAINERS: Update Jisheng's email address
  Revert "arm64: dts: mt8183: jacuzzi: Fix bus properties in anx's DSI endpoint"
  dt-bindings: drm/bridge: anx7625: Revert DPI support
  ARM: dts: aspeed: Fix AST2600 quad spi group
  MAINTAINERS: update Krzysztof Kozlowski's email
  MAINTAINERS: Update git tree for Broadcom iProc SoCs
  ARM: tegra: Move Nyan FHD panels to AUX bus
  arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias
  ARM: mstar: Select HAVE_ARM_ARCH_TIMER
  soc: mediatek: mt8192-mmsys: Fix dither to dsi0 path's input sel
  arm64: dts: mt8183: jacuzzi: Fix bus properties in anx's DSI endpoint
  ARM: boot: dts: bcm2711: Fix HVS register range
  arm64: dts: qcom: c630: disable crypto due to serror
  arm64: dts: qcom: sm8450: fix apps_smmu interrupts
  arm64: dts: qcom: sm8450: enable GCC_USB3_0_CLKREF_EN for usb
  arm64: dts: qcom: sm8350: Correct UFS symbol clocks
  arm64: tegra: Disable ISO SMMU for Tegra194
  Revert "dt-bindings: arm: qcom: Document SDX65 platform and boards"
parents fe673d3f 7e606eda

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com> 
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>

Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>

Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>

Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@@ -216,6 +218,7 @@ Koushik <raghavendra.koushik@neterion.com> 
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Documentation/devicetree/bindings/arm/qcom.yaml

+0 −6
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ description: | 
        sdx65

        sm7225

        sm8150

        sdx65

        sm8250

        sm8350

        sm8450
@@ -228,11 +227,6 @@ properties: 
              - qcom,sdx65-mtp

          - const: qcom,sdx65



      - items:

          - enum:

              - qcom,sdx65-mtp

          - const: qcom,sdx65



      - items:

          - enum:

              - qcom,ipq6018-cp01

Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml

+1 −18
Original line number Diff line number Diff line
@@ -91,22 +91,7 @@ properties: 
        $ref: /schemas/graph.yaml#/$defs/port-base

        unevaluatedProperties: false

        description:

          MIPI DSI/DPI input.



        properties:

          endpoint:

            $ref: /schemas/media/video-interfaces.yaml#

            type: object

            additionalProperties: false



            properties:

              remote-endpoint: true



              bus-type:

                enum: [1, 5]

                default: 1



              data-lanes: true

          Video port for MIPI DSI input.



      port@1:

        $ref: /schemas/graph.yaml#/properties/port
@@ -155,8 +140,6 @@ examples: 
                    reg = <0>;

                    anx7625_in: endpoint {

                        remote-endpoint = <&mipi_dsi>;

                        bus-type = <5>;

                        data-lanes = <0 1 2 3>;

                    };

                };

MAINTAINERS

+18 −18
Original line number Diff line number Diff line
@@ -2572,7 +2572,7 @@ F: sound/soc/rockchip/ 
N:	rockchip









ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org








@@ -2739,7 +2739,7 @@ N:	stm32







N:	stm

















ARM/Synaptics SoC support









M:	Jisheng Zhang <Jisheng.Zhang@synaptics.com>









M:	Jisheng Zhang <jszhang@kernel.org>









M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained








@@ -3905,7 +3905,7 @@ M:	Scott Branden <sbranden@broadcom.com>







M:	bcm-kernel-feedback-list@broadcom.com









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://github.com/broadcom/cygnus-linux.git









T:	git git://github.com/broadcom/stblinux.git









F:	arch/arm64/boot/dts/broadcom/northstar2/*









F:	arch/arm64/boot/dts/broadcom/stingray/*









F:	drivers/clk/bcm/clk-ns*








@@ -11675,7 +11675,7 @@ F:	drivers/iio/proximity/mb1232.c















MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS









R:	Iskren Chernev <iskren.chernev@gmail.com>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









R:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Marek Szyprowski <m.szyprowski@samsung.com>









R:	Matheus Castello <matheus@castello.eng.br>









L:	linux-pm@vger.kernel.org








@@ -11685,7 +11685,7 @@ F:	drivers/power/supply/max17040_battery.c















MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS









R:	Hans de Goede <hdegoede@redhat.com>









R:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









R:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Marek Szyprowski <m.szyprowski@samsung.com>









R:	Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>









R:	Purism Kernel Team <kernel@puri.sm>








@@ -11730,7 +11730,7 @@ F:	Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml







F:	drivers/power/supply/max77976_charger.c

















MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-pm@vger.kernel.org









S:	Supported








@@ -11739,7 +11739,7 @@ F:	drivers/power/supply/max77693_charger.c















MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS









M:	Chanwoo Choi <cw00.choi@samsung.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









S:	Supported








@@ -12428,7 +12428,7 @@ F:	include/linux/memblock.h







F:	mm/memblock.c

















MEMORY CONTROLLER DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git








@@ -13565,7 +13565,7 @@ F:	include/uapi/linux/nexthop.h







F:	net/ipv4/nexthop.c

















NFC SUBSYSTEM









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-nfc@lists.01.org (subscribers-only)









L:	netdev@vger.kernel.org









S:	Maintained








@@ -13879,7 +13879,7 @@ F:	Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml







F:	drivers/regulator/pf8x00-regulator.c

















NXP PTN5150A CC LOGIC AND EXTCON DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml








@@ -15305,7 +15305,7 @@ F:	drivers/pinctrl/renesas/















PIN CONTROLLER - SAMSUNG









M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -16947,7 +16947,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/







F:	drivers/s390/scsi/zfcp_*

















S3C ADC BATTERY DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-samsung-soc@vger.kernel.org









S:	Odd Fixes









F:	drivers/power/supply/s3c_adc_battery.c








@@ -16992,7 +16992,7 @@ F:	Documentation/admin-guide/LSM/SafeSetID.rst







F:	security/safesetid/

















SAMSUNG AUDIO (ASoC) DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Supported








@@ -17000,7 +17000,7 @@ F:	Documentation/devicetree/bindings/sound/samsung*







F:	sound/soc/samsung/

















SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-crypto@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained








@@ -17035,7 +17035,7 @@ S:	Maintained







F:	drivers/platform/x86/samsung-laptop.c

















SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org








@@ -17061,7 +17061,7 @@ F:	drivers/media/platform/s3c-camif/







F:	include/media/drv-intf/s3c_camif.h

















SAMSUNG S3FWRN5 NFC DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Opasiak <k.opasiak@samsung.com>









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Maintained








@@ -17083,7 +17083,7 @@ S:	Supported







F:	drivers/media/i2c/s5k5baf.c

















SAMSUNG S5P Security SubSystem (SSS) DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Vladimir Zapolskiy <vz@mleia.com>









L:	linux-crypto@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org








@@ -17118,7 +17118,7 @@ F:	include/linux/clk/samsung.h







F:	include/linux/platform_data/clk-s3c2410.h

















SAMSUNG SPI DRIVERS









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Andi Shyti <andi@etezian.org>









L:	linux-spi@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org
































arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -118,7 +118,7 @@







	};



















	pinctrl_fwqspid_default: fwqspid_default {









		function = "FWQSPID";









		function = "FWSPID";









		groups = "FWQSPID";









	};