Commit cd89db60 authored Nov 24, 2022 by Linus Torvalds

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are a bunch of late fixes that just came in, in particular a
  longer series for Rockchips devicetree files, but most of those just
  address cosmetic errors that were found during the binding validation.

  There are a couple of code changes:

   - A regression fix to the IXP42x PCI bus

   - A fix for a memory leak on optee, and another one for mach-mxs

   - Two fixes for the sunxi rsb bus driver, to address problems with
     the shutdown logic

  The rest are small but important devicetree fixes for a number of
  individual boards, addressing issues across all platforms:

   - arm global timer on older rockchip SoCs is unstable and needs to be
     disabled in favor of a more reliable clocksource

   - Corrections to fix bluetooth, mmc, and networking on a few Rockchip
     boards

   - at91/sam9g20ek UDC needs a pin controller config change

   - an omap board runs into mmc probe errors because of regulator nodes
     in the wrong place

   - imx8mp-evk has a minor inaccuracy with its pin config, but without
     user visible impact

   - The Allwinner H6 Hantro G2 video decoder needs an IOMMU reference
     to prevent the driver from crashing"

* tag 'soc-fixes-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits)
  bus: ixp4xx: Don't touch bit 7 on IXP42x
  ARM: dts: imx6q-prti6q: Fix ref/tcxo-clock-frequency properties
  arm64: dts: imx8mp-evk: correct pcie pad settings
  ARM: mxs: fix memory leak in mxs_machine_init()
  ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl
  tee: optee: fix possible memory leak in optee_register_device()
  arm64: dts: allwinner: h6: Add IOMMU reference to Hantro G2
  media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property
  bus: sunxi-rsb: Support atomic transfers
  bus: sunxi-rsb: Remove the shutdown callback
  ARM: dts: rockchip: disable arm_global_timer on rk3066 and rk3188
  arm64: dts: rockchip: Fix Pine64 Quartz4-B PMIC interrupt
  ARM: dts: am335x-pcm-953: Define fixed regulators in root node
  ARM: dts: rockchip: rk3188: fix lcdc1-rgb24 node name
  arm64: dts: rockchip: fix ir-receiver node names
  ARM: dts: rockchip: fix ir-receiver node names
  arm64: dts: rockchip: fix adc-keys sub node names
  ARM: dts: rockchip: fix adc-keys sub node names
  arm: dts: rockchip: remove clock-frequency from rtc
  arm: dts: rockchip: fix node name for hym8563 rtc
  ...

parents b11266ac b10dbd6f

Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@ properties:
		resets:
		maxItems: 1

		iommus:
		maxItems: 1

		required:
		- compatible
		- reg
		@@ -43,6 +46,7 @@ required:
		- clocks
		- clock-names
		- resets
		- iommus

		additionalProperties: false

		@@ -59,6 +63,7 @@ examples:
		clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>;
		clock-names = "bus", "mod";
		resets = <&ccu RST_BUS_VP9>;
		iommus = <&iommu 5>;
		};

		...

arch/arm/boot/dts/am335x-pcm-953.dtsi

+13 −15

Original line number	Diff line number	Diff line
		@@ -12,8 +12,7 @@
		compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";

		/* Power */
		regulators {
		vcc3v3: fixedregulator@1 {
		vcc3v3: fixedregulator1 {
		compatible = "regulator-fixed";
		regulator-name = "vcc3v3";
		regulator-min-microvolt = <3300000>;
		@@ -21,14 +20,13 @@
		regulator-boot-on;
		};

		vcc1v8: fixedregulator@2 {
		vcc1v8: fixedregulator2 {
		compatible = "regulator-fixed";
		regulator-name = "vcc1v8";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-boot-on;
		};
		};

		/* User IO */
		user_leds: user_leds {

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,13 @@

		};

		usb1 {
		pinctrl_usb1_vbus_gpio: usb1_vbus_gpio {
		atmel,pins =
		<AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PC5 GPIO */
		};
		};

		mmc0_slot1 {
		pinctrl_board_mmc0_slot1: mmc0_slot1-board {
		atmel,pins =
		@@ -84,6 +91,8 @@
		};

		usb1: gadget@fffa4000 {
		pinctrl-0 = <&pinctrl_usb1_vbus_gpio>;
		pinctrl-names = "default";
		atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};

arch/arm/boot/dts/imx6q-prti6q.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -364,8 +364,8 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_wifi>;
		interrupts-extended = <&gpio1 30 IRQ_TYPE_LEVEL_HIGH>;
		ref-clock-frequency = "38400000";
		tcxo-clock-frequency = "19200000";
		ref-clock-frequency = <38400000>;
		tcxo-clock-frequency = <19200000>;
		};
		};

arch/arm/boot/dts/rk3036-evb.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,11 +35,10 @@
		&i2c1 {
		status = "okay";

		hym8563: hym8563@51 {
		hym8563: rtc@51 {
		compatible = "haoyu,hym8563";
		reg = <0x51>;
		#clock-cells = <0>;
		clock-frequency = <32768>;
		clock-output-names = "xin32k";
		};
		};