Commit bbab2531 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are a number of updates for devicetree files for Qualcomm,
  Rockchips, and NXP i.MX platforms, addressing mistakes in the DT
  contents:

   - Wrong GPIO polarity on some boards

   - Lower SD card interface speed for better stability

   - Incorrect power supply, clock, pmic, cache properties

   - Disable broken hbr3 on sc7280-herobrine

   - Devicetree warning fixes

  The only other changes are:

   - A regression fix for the Amlogic performance monitoring unit
     driver, along with two related DT changes.

   - imx_v6_v7_defconfig enables PCI support again.

   - Trivial fixes for tee, optee and psci firmware drivers, addressing
     compiler warning and error output"

* tag 'arm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits)
  firmware/psci: demote suspend-mode warning to info level
  arm64: dts: qcom: sc7280: remove hbr3 support on herobrine boards
  ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI
  arm64: dts: rockchip: correct panel supplies on some rk3326 boards
  arm64: dts: rockchip: use just "port" in panel on RockPro64
  arm64: dts: rockchip: use just "port" in panel on Pinebook Pro
  ARM: dts: imx6ull-colibri: Remove unnecessary #address-cells/#size-cells
  ARM: dts: imx7d-remarkable2: Remove unnecessary #address-cells/#size-cells
  arm64: dts: imx8mp-verdin: correct off-on-delay
  arm64: dts: imx8mm-verdin: correct off-on-delay
  arm64: dts: imx8mm-evk: correct pmic clock source
  arm64: dts: qcom: sc8280xp-pmics: fix pon compatible and registers
  arm64: dts: rockchip: Remove non-existing pwm-delay-us property
  arm64: dts: rockchip: Add clk_rtc_32k to Anbernic xx3 Devices
  tee: Pass a pointer to virt_to_page()
  perf/amlogic: adjust register offsets
  arm64: dts: meson-g12-common: resolve conflict between canvas & pmu
  arm64: dts: meson-g12-common: specify full DMC range
  arm64: dts: imx8mp: fix address length for LCDIF2
  riscv: dts: canaan: drop invalid spi-max-frequency
  ...
parents 6a8f57ae d75eecc3

arch/arm/boot/dts/imx6ull-colibri.dtsi

+3 −9
Original line number Diff line number Diff line
@@ -33,18 +33,12 @@ 
		self-powered;

		type = "micro";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

		port {

			usb_dr_connector: endpoint {

				remote-endpoint = <&usb1_drd_sw>;

			};

		};

	};

	};



	gpio-keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/imx7d-remarkable2.dts

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ 
		reg = <0x62>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_epdpmic>;

		#address-cells = <1>;

		#size-cells = <0>;

		#thermal-sensor-cells = <0>;

		epd-pwr-good-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/rk3288.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ 
		status = "disabled";

	};



	spdif: sound@ff88b0000 {

	spdif: sound@ff8b0000 {

		compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";

		reg = <0x0 0xff8b0000 0x0 0x10000>;

		#sound-dai-cells = <0>;

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y 
CONFIG_RFKILL_INPUT=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_IMX6=y

CONFIG_PCI_IMX6_HOST=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+7 −8
Original line number Diff line number Diff line
@@ -1571,15 +1571,20 @@ 


			dmc: bus@38000 {

				compatible = "simple-bus";

				reg = <0x0 0x38000 0x0 0x400>;

				#address-cells = <2>;

				#size-cells = <2>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x2000>;



				canvas: video-lut@48 {

					compatible = "amlogic,canvas";

					reg = <0x0 0x48 0x0 0x14>;

				};



				pmu: pmu@80 {

					reg = <0x0 0x80 0x0 0x40>,

					      <0x0 0xc00 0x0 0x40>;

					interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;

				};

			};



			usb2_phy1: phy@3a000 {
@@ -1705,12 +1710,6 @@ 
			};

		};



		pmu: pmu@ff638000 {

			reg = <0x0 0xff638000 0x0 0x100>,

			      <0x0 0xff638c00 0x0 0x100>;

			interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;

		};



		aobus: bus@ff800000 {

			compatible = "simple-bus";

			reg = <0x0 0xff800000 0x0 0x100000>;