Commit ee261c7e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt64-for-4.21' of... 

Merge tag 'sunxi-dt64-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner arm64 DT changes for 4.21

Our usual set of arm64 DT changes, with the biggest additions being:
  - Support for the video decoding engine in the A64
  - Support for the audio codec in the A64
  - USB Support in the H6
  - HDMI Support in the H6
  - EMAC Support in the H6
  - New board: Orange Pi Lite2

* tag 'sunxi-dt64-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

: (27 commits)
  arm64: dts: allwinner: a64: Fix up RTC device node and clock references
  arm64: dts: allwinner: a64: Add Video Engine node
  arm64: dts: allwinner: a64: Add support for the SRAM C1 section
  arm64: dts: allwinner: a64: pinebook: enable power supplies
  arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
  arm64: dts: allwinner: axp803: add AC and battery power supplies
  arm64: dts: allwinner: a64: bananapi-m64: Enable audio codec
  arm64: dts: allwinner: a64: enable sound on Pinebook
  arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine
  arm64: dts: allwinner: a64: add nodes necessary for analog sound support
  arm64: dts: allwinner: h6: orangepi: Add device nodes for LEDs
  arm64: dts: allwinner: h6: orangepi: Enable USB 2.0 host and OTG ports
  arm64: dts: allwinner: h6: orangepi: Add board-wide 5V regulator
  arm64: dts: allwinner: h6: fix EMAC compatible string sequence
  arm64: dts: allwinner: a64: Add device node for Mali-400 GPU
  dt-bindings: gpu: mali-utgard: Add compatible for A64 Mali
  arm64: dts: allwinner: h6: enable USB2 on Pine H64
  arm64: dts: allwinner: h6: add USB Vbus regulator for Pine H64
  arm64: dts: allwinner: h6: add USB2-related device nodes
  arm64: dts: allwinner: h6: Enable HDMI output on Pine H64 board
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2c94db38 44ff3caf

Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
      + allwinner,sun4i-a10-mali

      + allwinner,sun7i-a20-mali

      + allwinner,sun8i-h3-mali

      + allwinner,sun50i-a64-mali

      + allwinner,sun50i-h5-mali

      + amlogic,meson-gxbb-mali

      + amlogic,meson-gxl-mali
@@ -73,6 +74,10 @@ to specify one more vendor-specific compatible, among: 
    Required properties:

      * resets: phandle to the reset line for the GPU



  - allwinner,sun50i-a64-mali

    Required properties:

      * resets: phandle to the reset line for the GPU



  - allwinner,sun50i-h5-mali

    Required properties:

      * resets: phandle to the reset line for the GPU

Documentation/devicetree/bindings/net/dwmac-sun8i.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
		"allwinner,sun8i-r40-gmac"

		"allwinner,sun8i-v3s-emac"

		"allwinner,sun50i-a64-emac"

		"allwinner,sun50i-h6-emac", "allwinner-sun50i-a64-emac"

- reg: address and length of the register for the device.

- interrupts: interrupt for the device

- interrupt-names: must be "macirq"

arch/arm64/boot/dts/allwinner/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb

arch/arm64/boot/dts/allwinner/axp803.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -49,6 +49,39 @@ 
	interrupt-controller;

	#interrupt-cells = <1>;



	ac_power_supply: ac-power-supply {

		compatible = "x-powers,axp803-ac-power-supply",

			     "x-powers,axp813-ac-power-supply";

		status = "disabled";

	};



	axp_adc: adc {

		compatible = "x-powers,axp803-adc", "x-powers,axp813-adc";

		#io-channel-cells = <1>;

	};



	axp_gpio: gpio {

		compatible = "x-powers,axp803-gpio", "x-powers,axp813-gpio";

		gpio-controller;

		#gpio-cells = <2>;



		gpio0_ldo: gpio0-ldo {

			pins = "GPIO0";

			function = "ldo";

		};



		gpio1_ldo: gpio1-ldo {

			pins = "GPIO1";

			function = "ldo";

		};

	};



	battery_power_supply: battery-power-supply {

		compatible = "x-powers,axp803-battery-power-supply",

			     "x-powers,axp813-battery-power-supply";

		status = "disabled";

	};



	regulators {

		/* Default work frequency for buck regulators */

		x-powers,dcdc-freq = <3000>;

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+29 −0
Original line number Diff line number Diff line
@@ -97,6 +97,19 @@ 
	};

};



&codec {

	status = "okay";

};



&codec_analog {

	hpvcc-supply = <&reg_eldo1>;

	status = "okay";

};



&dai {

	status = "okay";

};



&de {

	status = "okay";

};
@@ -326,6 +339,22 @@ 
	vcc-hdmi-supply = <&reg_dldo1>;

};



&sound {

	status = "okay";

	simple-audio-card,widgets = "Headphone", "Headphone Jack",

				    "Microphone", "Microphone Jack",

				    "Microphone", "Onboard Microphone";

	simple-audio-card,routing =

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"Headphone Jack", "HP",

			"MIC2", "Microphone Jack",

			"Onboard Microphone", "MBIAS",

			"MIC1", "Onboard Microphone";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pb_pins>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE