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

Commit bcab84fb authored Jun 18, 2017 by Olof Johansson

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

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

Allwinner DT changes for 4.13

The usual chunk of patches. The most notable improvements are the power
supplies improvements (battery and AC-IN), crypto support for the sun5i
family, HDMI support for the A10s, plus a lot of new things for the V3S and
the A83T.

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

: (47 commits)
  ARM: sun6i: a31s: primo81: Enable battery power supply
  ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode
  ARM: sun8i: a83t: Add dt node for the syscon control module
  ARM: sun8i: a83t: Add device node for R_PIO
  ARM: sun8i: v3s: add device nodes for DE2 display pipeline
  ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes
  ARM: sun5i: add a cryptographic engine node
  ARM: sun8i: a83t: Add device node for PRCM
  ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support
  ARM: dts: orange-pi-zero: add node for SPI NOR
  ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY
  ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply
  ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering
  ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output
  ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes
  ARM: sun8i: a83t: Add device node for SPDIF transmitter
  ARM: sun8i: a83t: Add device node for DMA controller
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ada0cc63 d5e9edfd

arch/arm/boot/dts/Makefile

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -901,6 +901,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
	sun8i-h3-bananapi-m2-plus.dtb \		sun8i-h3-bananapi-m2-plus.dtb \
	sun8i-h3-beelink-x2.dtb \		sun8i-h3-beelink-x2.dtb \
	sun8i-h3-nanopi-m1.dtb \		sun8i-h3-nanopi-m1.dtb \
			sun8i-h3-nanopi-m1-plus.dtb \
	sun8i-h3-nanopi-neo.dtb \		sun8i-h3-nanopi-neo.dtb \
	sun8i-h3-nanopi-neo-air.dtb \		sun8i-h3-nanopi-neo-air.dtb \
	sun8i-h3-orangepi-2.dtb \		sun8i-h3-orangepi-2.dtb \
	@@ -911,7 +912,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \
	sun8i-h3-orangepi-plus.dtb \		sun8i-h3-orangepi-plus.dtb \
	sun8i-h3-orangepi-plus2e.dtb \		sun8i-h3-orangepi-plus2e.dtb \
	sun8i-r16-parrot.dtb \		sun8i-r16-parrot.dtb \
	sun8i-v3s-licheepi-zero.dtb		sun8i-v3s-licheepi-zero.dtb \
			sun8i-v3s-licheepi-zero-dock.dtb
	dtb-$(CONFIG_MACH_SUN9I) += \		dtb-$(CONFIG_MACH_SUN9I) += \
	sun9i-a80-optimus.dtb \		sun9i-a80-optimus.dtb \
	sun9i-a80-cubieboard4.dtb		sun9i-a80-cubieboard4.dtb

arch/arm/boot/dts/axp209.dtsi

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,11 @@
	#gpio-cells = <2>;		#gpio-cells = <2>;
	};		};

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

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

arch/arm/boot/dts/axp22x.dtsi

+5 −0

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

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

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

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

+1 −1

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

	&mmc0 {		&mmc0 {
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;		pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;		vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;		bus-width = <4>;
	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */		cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+1 −1

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

	&mmc0 {		&mmc0 {
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;		pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;		vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;		bus-width = <4>;
	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */		cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */