Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b7bee1a authored Mar 27, 2018 by Arnd Bergmann

Merge tag 'sunxi-dt-for-4.17' of...

Merge tag 'sunxi-dt-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Pull "Allwinner DT changes for 4.17" from Maxime Ripard:

There is a bunch of significant additions for this release cycle:
  - The A83t now has HDMI support
  - The A80 finally has SMP support (without PSCI, unfortunately)
  - The A80 has preliminary display support

And also:
  - a number of boards based on old (A10, A20) SoCs now have the HDMI
    support enabled.
  - The display frontend is enabled on the A33, allowing to use it for
    hardware display scaling
  - New boards: Olimex A20-SOM204 variants

* tag 'sunxi-dt-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (39 commits)
  ARM: dts: sun9i: cubieboard4: Enable VGA display output
  ARM: dts: sun9i: Add pinmux settings for LCD0 RGB888 output.
  ARM: dts: sun9i: Add device nodes for documented display pipelines for A80
  ARM: dts: sun8i: reference tablet design: Enable PMIC power supplies
  ARM: dts: sun8i: a33: Enable A33 internal audio codec on A33-OLinuXino
  ARM: dts: sun8i: a33: Enable PMIC power supplies on A33-OLinuXino
  ARM: dts: sun8i: a33: Drop sunxi-common-regulators.dtsi for A33-OLinuXino
  ARM: dts: sun8i: a33: Drop GPIO pinmux settings for A33-OLinuXino
  ARM: dts: sun9i: Add enable-method for SMP support for the A80 SoC
  ARM: dts: sun8i: h3: Add eMMC for NanoPi M1 Plus
  ARM: dts: sun8i: a711: set regulator for each cluster of CPUs
  ARM: dts: sun8i: a83t: add stable OPP tables and CPUfreq
  ARM: dts: sun8i: a83t: add cpu0 and cpu100 labels
  ARM: dtsi: axp81x: remove IP name from DT node name
  ARM: dtsi: sun8i: a711: enable battery power supply subnode
  ARM: dtsi: axp81x: add battery power supply subnode
  ARM: dtsi: axp81x: add node for ADC
  ARM: dtsi: axp22x: add node for ADC
  ARM: dtsi: axp209: add node for ADC
  ARM: dts: sun7i: Enable HDMI support on the Orange Pi mini
  ...

parents 692989c3 dbb6d864

arch/arm/boot/dts/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -959,6 +959,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
		sun7i-a20-m3.dtb \
		sun7i-a20-mk808c.dtb \
		sun7i-a20-olimex-som-evb.dtb \
		sun7i-a20-olimex-som204-evb.dtb \
		sun7i-a20-olimex-som204-evb-emmc.dtb \
		sun7i-a20-olinuxino-lime.dtb \
		sun7i-a20-olinuxino-lime2.dtb \
		sun7i-a20-olinuxino-lime2-emmc.dtb \

arch/arm/boot/dts/axp209.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,11 @@
		status = "disabled";
		};

		axp_adc: adc {
		compatible = "x-powers,axp209-adc";
		#io-channel-cells = <1>;
		};

		axp_gpio: gpio {
		compatible = "x-powers,axp209-gpio";
		gpio-controller;

arch/arm/boot/dts/axp22x.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,11 @@
		status = "disabled";
		};

		axp_adc: adc {
		compatible = "x-powers,axp221-adc";
		#io-channel-cells = <1>;
		};

		battery_power_supply: battery-power-supply {
		compatible = "x-powers,axp221-battery-power-supply";
		status = "disabled";

arch/arm/boot/dts/axp81x.dtsi

+11 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,12 @@
		interrupt-controller;
		#interrupt-cells = <1>;

		axp_gpio: axp-gpio {
		axp_adc: adc {
		compatible = "x-powers,axp813-adc";
		#io-channel-cells = <1>;
		};

		axp_gpio: gpio {
		compatible = "x-powers,axp813-gpio";
		gpio-controller;
		#gpio-cells = <2>;
		@@ -64,6 +69,11 @@
		};
		};

		battery_power_supply: battery-power-supply {
		compatible = "x-powers,axp813-battery-power-supply";
		status = "disabled";
		};

		regulators {
		/* Default work frequency for buck regulators */
		x-powers,dcdc-freq = <3000>;

arch/arm/boot/dts/sun4i-a10-mk802.dts

+25 −0

Original line number	Diff line number	Diff line
		@@ -56,12 +56,27 @@
		chosen {
		stdout-path = "serial0:115200n8";
		};

		hdmi-connector {
		compatible = "hdmi-connector";
		type = "a";

		port {
		hdmi_con_in: endpoint {
		remote-endpoint = <&hdmi_out_con>;
		};
		};
		};
		};

		&codec {
		status = "okay";
		};

		&de {
		status = "okay";
		};

		&ehci0 {
		status = "okay";
		};
		@@ -70,6 +85,16 @@
		status = "okay";
		};

		&hdmi {
		status = "okay";
		};

		&hdmi_out {
		hdmi_out_con: endpoint {
		remote-endpoint = <&hdmi_con_in>;
		};
		};

		&mmc0 {
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;