Commit 1d67c8d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are the patches for this week that came as the fallout of the
  merge window:

   - Two fixes for the NVidia memory controller driver

   - multiple defconfig files get patched to turn CONFIG_FB back on
     after that is no longer selected by CONFIG_DRM

   - ffa and scmpi firmware drivers fixes, mostly addressing compiler
     and documentation warnings

   - Platform specific fixes for device tree files on ASpeed, Renesas
     and NVidia SoC, mostly for recent regressions.

   - A workaround for a regression on the USB PHY with devlink when the
     usb-nop-xceiv driver is not available until the rootfs is mounted.

   - Device tree compiler warnings in Arm Versatile-AB"

* tag 'soc-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (35 commits)
  ARM: dts: versatile: Fix up interrupt controller node names
  ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in
  ARM: configs: Update u8500_defconfig
  ARM: configs: Update Vexpress defconfig
  ARM: configs: Update Versatile defconfig
  ARM: configs: Update RealView defconfig
  ARM: configs: Update Integrator defconfig
  arm: Typo s/PCI_IXP4XX_LEGACY/IXP4XX_PCI_LEGACY/
  firmware: arm_scmi: Fix range check for the maximum number of pending messages
  firmware: arm_scmi: Avoid padding in sensor message structure
  firmware: arm_scmi: Fix kernel doc warnings about return values
  firmware: arm_scpi: Fix kernel doc warnings
  firmware: arm_scmi: Fix kernel doc warnings
  ARM: shmobile: defconfig: Restore graphical consoles
  firmware: arm_ffa: Fix a possible ffa_linux_errmap buffer overflow
  firmware: arm_ffa: Fix the comment style
  firmware: arm_ffa: Simplify probe function
  firmware: arm_ffa: Ensure drivers provide a probe function
  firmware: arm_scmi: Fix possible scmi_linux_errmap buffer overflow
  firmware: arm_scmi: Ensure drivers provide a probe function
  ...
parents ae14c63a 82a1c675

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+2 −4
Original line number Diff line number Diff line
@@ -52,16 +52,14 @@ properties: 
        items:

          - const: marvell,ap806-smmu-500

          - const: arm,mmu-500

      - description: NVIDIA SoCs that program two ARM MMU-500s identically

        items:

      - description: NVIDIA SoCs that require memory controller interaction

          and may program multiple ARM MMU-500s identically with the memory

          controller interleaving translations between multiple instances

          for improved performance.

        items:

          - enum:

              - const: nvidia,tegra194-smmu

              - const: nvidia,tegra186-smmu

              - nvidia,tegra194-smmu

              - nvidia,tegra186-smmu

          - const: nvidia,smmu-500

      - items:

          - const: arm,mmu-500

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ config ARCH_IXP4XX 
	select IXP4XX_IRQ

	select IXP4XX_TIMER

	# With the new PCI driver this is not needed

	select NEED_MACH_IO_H if PCI_IXP4XX_LEGACY

	select NEED_MACH_IO_H if IXP4XX_PCI_LEGACY

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_EHCI_BIG_ENDIAN_MMIO

	help

arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "aspeed-g5.dtsi"

#include <dt-bindings/gpio/aspeed-gpio.h>

#include <dt-bindings/i2c/i2c.h>

#include <dt-bindings/interrupt-controller/irq.h>



/{

	model = "ASRock E3C246D4I BMC";
@@ -73,7 +74,8 @@ 


&vuart {

	status = "okay";

	aspeed,sirq-active-high;

	aspeed,lpc-io-reg = <0x2f8>;

	aspeed,lpc-interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

};



&mac0 {

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

+5 −4
Original line number Diff line number Diff line
@@ -406,14 +406,14 @@ 
		reg = <0x69>;

	};



	power-supply@6a {

	power-supply@6b {

		compatible = "ibm,cffps";

		reg = <0x6a>;

		reg = <0x6b>;

	};



	power-supply@6b {

	power-supply@6d {

		compatible = "ibm,cffps";

		reg = <0x6b>;

		reg = <0x6d>;

	};

};
@@ -2832,6 +2832,7 @@ 


&emmc {

	status = "okay";

	clk-phase-mmc-hs200 = <180>, <180>;

};



&fsim0 {

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts

+1 −4
Original line number Diff line number Diff line
@@ -280,10 +280,7 @@ 
	/*W0-W7*/	"","","","","","","","",

	/*X0-X7*/	"","","","","","","","",

	/*Y0-Y7*/	"","","","","","","","",

	/*Z0-Z7*/	"","","","","","","","",

	/*AA0-AA7*/	"","","","","","","","",

	/*AB0-AB7*/	"","","","","","","","",

	/*AC0-AC7*/	"","","","","","","","";

	/*Z0-Z7*/	"","","","","","","","";



	pin_mclr_vpp {

		gpio-hog;