Commit 5c33696f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC/dt fixes from Arnd Bergmann:
 "This round of fixes is almost exclusively device tree changes, with
  trivial defconfig fixes and one compiler warning fix added in.

  A number of patches are to fix dtc warnings, in particular on Amlogic,
  i.MX and Rockchips.

  Other notable changes include:

  Renesas:
   - Fix a wrong clock configuration on R-Mobile A1
   - Fix IOMMU support on R-Car V3H

  Allwinner
   - Multiple audio fixes

  Qualcomm
   - Use a safe CPU voltage on MSM8996
   - Fixes to match a late audio driver change

  Rockchip:
   - Some fixes for the newly added Pinebook Pro

  NXP i.MX:
   - Fix I2C1 pinctrl configuration for i.MX27 phytec-phycard board
   - Fix imx6dl-yapp4-ursa board Ethernet connection

  OMAP:
   - A regression fix for non-existing can device on am534x-idk
   - Fix flakey wlan on droid4 where some devices would not connect at
     all because of internal pull being used with an external pull
   - Fix occasional missed wake-up events on droid4 modem uart"

* tag 'arm-soc-fixes-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (51 commits)
  ARM: dts: iwg20d-q7-dbcm-ca: Remove unneeded properties in hdmi@39
  ARM: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
  arm64: dts: renesas: Make hdmi encoder nodes compliant with DT bindings
  arm64: defconfig: add MEDIA_PLATFORM_SUPPORT
  arm64: defconfig: ARCH_R8A7795: follow changed config symbol name
  arm64: defconfig: add DRM_DISPLAY_CONNECTOR
  arm64: defconfig: DRM_DUMB_VGA_DAC: follow changed config symbol name
  ARM: oxnas: make ox820_boot_secondary static
  ARM: dts: r8a7740: Add missing extal2 to CPG node
  ARM: dts: omap4-droid4: Fix occasional lost wakeirq for uart1
  ARM: dts: omap4-droid4: Fix flakey wlan by disabling internal pull for gpio
  arm64: dts: allwinner: a64: Remove unused SPDIF sound card
  arm64: dts: allwinner: a64: pinetab: Fix cpvdd supply name
  arm64: dts: meson-g12: remove spurious blank line
  arm64: dts: meson-g12b-khadas-vim3: add missing frddr_a status property
  arm64: dts: meson-g12-common: fix dwc2 clock names
  arm64: dts: meson-g12b-ugoos-am6: fix usb vbus-supply
  arm64: dts: freescale: imx8mp: update input_val for AUDIOMIX_BIT_STREAM
  ARM: dts: r7s9210: Remove bogus clock-names from OSTM nodes
  ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi
  ...
parents 3d1c1e59 d5fef88c

Documentation/devicetree/bindings/dma/fsl-edma.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ Required properties: 
- compatible :

	- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp

	- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the

	  LS1028A SoC.

- reg : Specifies base physical address(s) and size of the eDMA registers.

	The 1st region is eDMA control register's address and size.

	The 2nd and the 3rd regions are programmable channel multiplexing

arch/arm/boot/dts/am574x-idk.dts

+4 −0
Original line number Diff line number Diff line
@@ -40,3 +40,7 @@ 
	status = "okay";

	dual_emac;

};



&m_can0 {

	status = "disabled";

};

arch/arm/boot/dts/dra7.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
			#address-cells = <1>;

			ranges = <0x51000000 0x51000000 0x3000

				  0x0	     0x20000000 0x10000000>;

			dma-ranges;

			/**

			 * To enable PCI endpoint mode, disable the pcie1_rc

			 * node and enable pcie1_ep mode.
@@ -185,7 +186,6 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -230,6 +230,7 @@ 
			#address-cells = <1>;

			ranges = <0x51800000 0x51800000 0x3000

				  0x0	     0x30000000 0x10000000>;

			dma-ranges;

			status = "disabled";

			pcie2_rc: pcie@51800000 {

				reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
@@ -240,7 +241,6 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
	imx27-phycard-s-rdk {

		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX27_PAD_I2C2_SDA__I2C2_SDA 0x0

				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0

				MX27_PAD_I2C_DATA__I2C_DATA 0x0

				MX27_PAD_I2C_CLK__I2C_CLK 0x0

			>;

		};

arch/arm/boot/dts/imx6dl-yapp4-ursa.dts

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
};



&switch_ports {

	/delete-node/ port@2;

	/delete-node/ port@3;

};



&touchscreen {

CRA Git | Maintained and supported by SUSTech CRA and CCSE