Commit bfe62a45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull SoC fixes from Arnd Bergmann:
 "The largest part here are devicetree fixes for Qualcomm, and NXP i.MX,
  addressing a few regressions and incorrect settings in board and SoC
  pecific dts files.

  The largest single commits are a revert of a cleanup patch for i.MX
  that caused regressions for the NAND flash controller and a fixup for
  an incomplete cleanup of the PCIe controller on Qualcomm platforms
  that broke because the state was left incompatible with both the old
  and new behavior.

  On the Rockchips, Hisilicon, Renesas, Allwinner and AT91 platforms,
  only a single simple dts bugfix each was added since the last round of
  fixes.

  On the SoC specific device drivers, everything is relatively harmless:
  three reset controller driver fixes, a compatibility for fix ASpeed
  soc ID, and error handling fixes for Qualcomm and Microchip. One
  regression fix on Qualcomm addresses a problem with a previous fix for
  DisplayPort alt mode"

* tag 'soc-fixes-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits)
  arm64: dts: qcom: hamoa: Fix incomplete Root Port property migration
  dt-bindings: display/msm: qcm2290-mdss: Fix missing ranges in example
  firmware: microchip: fail auto-update probe if no flash found
  arm64: dts: renesas: sparrow-hawk: Reserve first 128 MiB of DRAM
  arm64: dts: qcom: agatti: Fix IOMMU DT properties
  dt-bindings: media: venus: Fix iommus property
  dt-bindings: display: msm: qcm2290-mdss: Fix iommus property
  arm64: dts: allwinner: sun55i: Fix r-spi DMA
  reset: spacemit: k3: Decouple composite reset lines
  reset: gpio: fix double free in reset_add_gpio_aux_device() error path
  ARM: dts: microchip: sam9x7: fix gpio-lines count for pioB
  arm64: dts: hisilicon: hi3798cv200: Add missing dma-ranges
  arm64: dts: hisilicon: poplar: Correct PCIe reset GPIO polarity
  reset: rzg2l-usbphy-ctrl: Fix malformed MODULE_AUTHOR string
  soc: microchip: mpfs-mss-top-sysreg: Fix resource leak on driver unbind
  soc: microchip: mpfs-control-scb: Fix resource leak on driver unbind
  soc: qcom: pmic_glink_altmode: Fix TBT->SAFE->!TBT transition
  arm64: dts: qcom: monaco: Reserve full Gunyah metadata region
  arm64: dts: imx8mq-librem5: Bump BUCK1 suspend voltage up to 0.85V
  Revert "arm64: dts: imx8mq-librem5: Set the DVS voltages lower"
  ...
parents 591cd656 eaad992e
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ properties:
      - const: core

  iommus:
    maxItems: 2
    maxItems: 1

  interconnects:
    items:
@@ -107,8 +107,7 @@ examples:
        interconnect-names = "mdp0-mem",
                             "cpu-cfg";

        iommus = <&apps_smmu 0x420 0x2>,
                 <&apps_smmu 0x421 0x0>;
        iommus = <&apps_smmu 0x420 0x2>;
        ranges;

        display-controller@5e01000 {
+2 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ properties:
      - const: vcodec0_bus

  iommus:
    maxItems: 5
    maxItems: 2

  interconnects:
    maxItems: 2
@@ -102,10 +102,7 @@ examples:
        memory-region = <&pil_video_mem>;

        iommus = <&apps_smmu 0x860 0x0>,
                 <&apps_smmu 0x880 0x0>,
                 <&apps_smmu 0x861 0x04>,
                 <&apps_smmu 0x863 0x0>,
                 <&apps_smmu 0x804 0xe0>;
                 <&apps_smmu 0x880 0x0>;

        interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
                         &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ pioB: gpio@fffff600 {
				interrupt-controller;
				#gpio-cells = <2>;
				gpio-controller;
				#gpio-lines = <26>;
				#gpio-lines = <27>;
				clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
			};

+1 −5
Original line number Diff line number Diff line
@@ -36,12 +36,8 @@ &clks {
&gpmi {
	pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_gpmi_nand>;
	status = "okay";

	nand@0 {
		reg = <0>;
	nand-on-flash-bbt;
	};
	status = "okay";
};

&i2c3 {
+1 −5
Original line number Diff line number Diff line
@@ -172,12 +172,8 @@ eth_phy: ethernet-phy@0 {
&gpmi {
	pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_gpmi_nand>;
	status = "okay";

	nand@0 {
		reg = <0>;
	nand-on-flash-bbt;
	};
	status = "okay";
};

&i2c1 {
Loading