Commit a7403eb2 authored Jan 30, 2019 by Arnd Bergmann

Merge tag 'sunxi-fixes-for-5.0' of...

Merge tag 'sunxi-fixes-for-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Allwinner Fixes for 5.0

A couple of device tree fixes for the 5.0 cycle:

  - Add missing clock-output-names for the osc24M clock on sun6i/A31

    The Linux clock driver uses the device node as the clock name if
    the property is missing. The node name was changed in 5.0-rc1,
    breaking a subtle dependency in the sunxi-ng clock driver, and
    renders Linux unable to completely boot up.

  - Add alias for Ethernet controller on Beelink X2

    This allows the bootloader to assign a deterministically generated
    MAC address to it.

  - Add property to enable USB VBUS regulator on OrangePi Win

    The board had defined the constraints for the regulator, but was
    missing the property to actually enable it.

* tag 'sunxi-fixes-for-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: dts: allwinner: a64: Fix USB OTG regulator
  ARM: dts: sun8i: h3: Add ethernet0 alias to Beelink X2
  ARM: dts: sun6i: Add clock-output-names to osc24M clock
  arm64: dts: allwinner: a64: Fix the video engine compatible

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 83d36515 b1360dcf

arch/arm/boot/dts/sun6i-a31.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@
		#clock-cells = <0>;
		compatible = "fixed-clock";
		clock-frequency = <24000000>;
		clock-output-names = "osc24M";
		};

		osc32k: clk-32k {

arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@

		aliases {
		serial0 = &uart0;
		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
		ethernet0 = &emac;
		ethernet1 = &sdiowifi;
		};

arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,7 @@
		reg = <0x3a3>;
		interrupt-parent = <&r_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
		x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
		};
		};

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,7 @@
		};

		video-codec@1c0e000 {
		compatible = "allwinner,sun50i-h5-video-engine";
		compatible = "allwinner,sun50i-a64-video-engine";
		reg = <0x01c0e000 0x1000>;
		clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
		<&ccu CLK_DRAM_VE>;