Unverified Commit f6bdc610 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'asahi-soc-fixes-5.16' of https://github.com/AsahiLinux/linux into arm/fixes 

Asahi SoC DT/binding fixes for 5.16.

Just some minor DT fixups we found after things got merged.

* tag 'asahi-soc-fixes-5.16' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: add #interrupt-cells property to pinctrl nodes
  dt-bindings: i2c: apple,i2c: allow multiple compatibles
  arm64: dts: apple: change ethernet0 device type to ethernet

Link: https://lore.kernel.org/r/cc9a1a67-3b2d-ae9f-5733-859111eb78c1@marcan.st


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ddae25ed 0668639e

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+4 −4
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ allOf: 


properties:

  compatible:

    enum:

      - apple,t8103-i2c

      - apple,i2c

    items:

      - const: apple,t8103-i2c

      - const: apple,i2c



  reg:

    maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false 
examples:

  - |

    i2c@35010000 {

      compatible = "apple,t8103-i2c";

      compatible = "apple,t8103-i2c", "apple,i2c";

      reg = <0x35010000 0x4000>;

      interrupt-parent = <&aic>;

      interrupts = <0 627 4>;

arch/arm64/boot/dts/apple/t8103-j274.dts

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 


&port02 {

	bus-range = <3 3>;

	ethernet0: pci@0,0 {

	ethernet0: ethernet@0,0 {

		reg = <0x30000 0x0 0x0 0x0 0x0>;

		/* To be filled by the loader */

		local-mac-address = [00 10 18 00 00 00];

arch/arm64/boot/dts/apple/t8103.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ 
			apple,npins = <212>;



			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 190 IRQ_TYPE_LEVEL_HIGH>,

				     <AIC_IRQ 191 IRQ_TYPE_LEVEL_HIGH>,
@@ -169,6 +170,7 @@ 
			apple,npins = <42>;



			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,

				     <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
@@ -189,6 +191,7 @@ 
			apple,npins = <23>;



			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 330 IRQ_TYPE_LEVEL_HIGH>,

				     <AIC_IRQ 331 IRQ_TYPE_LEVEL_HIGH>,
@@ -209,6 +212,7 @@ 
			apple,npins = <16>;



			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&aic>;

			interrupts = <AIC_IRQ 391 IRQ_TYPE_LEVEL_HIGH>,

				     <AIC_IRQ 392 IRQ_TYPE_LEVEL_HIGH>,