Commit c0dec1ec authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

The most notable changes are:
  - Conversion to the last SoC (A10, A20) to the new clock framework
  - HDMI and dual pipeline support for the A10, A20 and A31 DRM driver
  - Support for the various power supplies on a number of boards
  - Fix of DTC warnings on a number of SoCs, but most of them still need
    some work
  - New boards: A20-OLinuXino-MICRO-eMMC, TBS A711, Banana Pi M2 Berry,
    Banana Pi M2 Ultra
  - New R40 SoC support

* tag 'sunxi-dt-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (63 commits)
  ARM: sun8i: r40: enable USB host for Banana Pi M2 Ultra
  ARM: sun8i: v40: add 5V regulator for Banana Pi M2 Berry
  ARM: sun8i: r40: add 5V regulator for Banana Pi M2 Ultra
  ARM: sun8i: r40: add USB host port nodes for R40
  ARM: dts: sun4i: Enable HDMI support on some A10 devices
  ARM: dts: sun7i: Enable HDMI support on some A20 devices
  ARM: dts: sun7i: Add device nodes for display pipelines
  ARM: dts: sun4i: Add device nodes for display pipelines
  ARM: dts: sun8i: r40: add watchdog device node
  ARM: dts: sun5i: reference-design-tablet: Enable AXP209 AC and battery
  ARM: dts: sun9i: Change node names to remove underscores
  ARM: dts: sun9i: Change node names to remove underscores
  ARM: dts: sun4i: Remove underscores from nodes names
  ARM: dts: sun4i: Provide default muxing for relevant controllers
  ARM: dts: sun4i: Change pinctrl nodes to avoid warning
  ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices
  ARM: dts: sun6i: Add device node for HDMI controller
  ARM: dts: sun4i: Change LRADC node names to avoid warnings
  ARM: dts: sun4i: Remove skeleton and memory to avoid warnings
  ARM: dts: sun4i: Remove gpio-keys warnings
  ...
parents 09228319 1357bdb2

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ swir Sierra Wireless 
syna	Synaptics Inc.

synology	Synology, Inc.

tbs	TBS Technologies

tbs-biometrics	Touchless Biometric Systems AG

tcg	Trusted Computing Group

tcl	Toby Churchill Ltd.

technexion	TechNexion

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -895,6 +895,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-olinuxino-lime2.dtb \

	sun7i-a20-olinuxino-lime2-emmc.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-olinuxino-micro-emmc.dtb \

	sun7i-a20-orangepi.dtb \

	sun7i-a20-orangepi-mini.dtb \

	sun7i-a20-pcduino3.dtb \
@@ -920,6 +921,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-a83t-allwinner-h8homlet-v2.dtb \

	sun8i-a83t-bananapi-m3.dtb \

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-a83t-tbs-a711.dtb \

	sun8i-h2-plus-orangepi-zero.dtb \

	sun8i-h3-bananapi-m2-plus.dtb \

	sun8i-h3-beelink-x2.dtb \
@@ -936,8 +938,10 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-parrot.dtb \

	sun8i-r40-bananapi-m2-ultra.dtb \

	sun8i-v3s-licheepi-zero.dtb \

	sun8i-v3s-licheepi-zero-dock.dtb

	sun8i-v3s-licheepi-zero-dock.dtb \

	sun8i-v40-bananapi-m2-berry.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

arch/arm/boot/dts/axp209.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
		};

	};



	usb_power_supply: usb_power_supply {

	usb_power_supply: usb-power-supply {

		compatible = "x-powers,axp202-usb-power-supply";

		status = "disabled";

	};

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

+3 −25
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_a1000>;



		red {

			label = "a1000:red:usr";
@@ -79,8 +77,6 @@ 


	reg_emac_3v3: emac-3v3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&emac_power_pin_a1000>;

		regulator-name = "emac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -129,8 +125,6 @@ 
};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins_a>;

	phy = <&phy1>;

	status = "okay";

};
@@ -140,8 +134,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {
@@ -156,7 +148,7 @@ 


&ir0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ir0_rx_pins_a>;

	pinctrl-0 = <&ir0_rx_pins>;

	status = "okay";

};
@@ -170,8 +162,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
@@ -187,18 +177,6 @@ 
	status = "okay";

};



&pio {

	emac_power_pin_a1000: emac_power_pin@0 {

		pins = "PH15";

		function = "gpio_out";

	};



	led_pins_a1000: led_pins@0 {

		pins = "PH10", "PH20";

		function = "gpio_out";

	};

};



#include "axp209.dtsi"



&reg_dcdc2 {
@@ -236,13 +214,13 @@ 


&spdif {

	pinctrl-names = "default";

	pinctrl-0 = <&spdif_tx_pins_a>;

	pinctrl-0 = <&spdif_tx_pin>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};

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

+2 −14
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ 
};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_pins_a>;

	phy = <&phy1>;

	status = "okay";

};
@@ -79,8 +77,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

	status = "okay";



	axp209: pmic@34 {
@@ -95,7 +91,7 @@ 


&ir0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ir0_rx_pins_a>;

	pinctrl-0 = <&ir0_rx_pins>;

	status = "okay";

};
@@ -108,8 +104,6 @@ 
};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
@@ -125,12 +119,6 @@ 
	status = "okay";

};



&pio {

	usb2_vbus_pin_a: usb2_vbus_pin@0 {

		pins = "PH12";

	};

};



&reg_usb0_vbus {

	regulator-boot-on;

	status = "okay";
@@ -147,7 +135,7 @@ 


&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

	pinctrl-0 = <&uart0_pb_pins>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE