Commit 7adc4b39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "A few smaller fixes for v5.7-rc3: The majority are fixes for bugs I
  found after restarting my randconfig build testing that had been
  dormant for a while.

  On the Nokia N950/N9 phone, a DT fix is required to address a boot
  regression.

  For the bcm283x (Raspberry Pi), two DT fixes address minor issues"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  soc: imx8: select SOC_BUS
  soc: tegra: fix tegra_pmc_get_suspend_mode definition
  soc: fsl: dpio: avoid stack usage warning
  soc: fsl: dpio: fix incorrect pointer conversions
  ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
  ARM: dts: bcm283x: Disable dsi0 node
  firmware: xilinx: make firmware_debugfs_root static
  drivers: soc: xilinx: fix firmware driver Kconfig dependency
  ARM: dts: bcm283x: Add cells encoding format to firmware bus
  ARM: dts: OMAP3: disable RNG on N950/N9
parents 1ddd8739 f42ae4cd

arch/arm/boot/dts/bcm2835-rpi.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
	soc {

		firmware: firmware {

			compatible = "raspberrypi,bcm2835-firmware", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;



			mboxes = <&mailbox>;

			dma-ranges;

		};

arch/arm/boot/dts/bcm283x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
					     "dsi0_ddr2",

					     "dsi0_ddr";



			status = "disabled";

		};



		aux: aux@7e215000 {

arch/arm/boot/dts/omap3-n950-n9.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -341,6 +341,11 @@ 
	status = "disabled";

};



/* RNG not directly accessible on N950/N9. */

&rng_target {

	status = "disabled";

};



&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

arch/arm/mach-imx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -91,8 +91,10 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o

obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o

endif

ifeq ($(CONFIG_ARM_CPU_SUSPEND),y)

AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a

obj-$(CONFIG_SOC_IMX6) += resume-imx6.o

endif

obj-$(CONFIG_SOC_IMX6) += pm-imx6.o



obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

drivers/firmware/xilinx/zynqmp-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct pm_api_info pm_api_list[] = { 
	PM_API(PM_QUERY_DATA),

};



struct dentry *firmware_debugfs_root;

static struct dentry *firmware_debugfs_root;



/**

 * zynqmp_pm_argument_value() - Extract argument value from a PM-API request

CRA Git | Maintained and supported by SUSTech CRA and CCSE