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

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

Merge tag 'sunxi-dt-for-4.10-bis' of... 

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

Pull "Allwinner DT additions for 4.10, bis" from Maxime Ripard:

The usual bunch of DT additions, but most notably:
  - A31 DRM driver
  - A31 audio codec
  - WiFi for the A80-Based boards and the CHIP
  - Support for the NextThing Co CHIP Pro (the first board with NAND
    enabled)
  - New board: NanoPi M1

* tag 'sunxi-dt-for-4.10-bis' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (41 commits)
  ARM: dts: sun6i: hummingbird-a31: Enable display output through VGA bridge
  ARM: dts: sun5i: Add touchscreen node to reference-design-tablet.dtsi
  ARM: sunxi: Add the missing clocks to the pinctrl nodes
  ARM: dts: sun7i: bananapi-m1-plus: Enable USB OTG
  ARM: dts: sun7i: bananapi-m1-plus: Add PMIC regulators
  ARM: dts: sun7i: bananapi-m1-plus: Enable USB PHY for USB host support
  ARM: sun8i: sina33: Enable USB gadget
  ARM: dts: sun8i: reference-design-tablet: ldo_io1 is vcc-touchscreen
  ARM: dts: sun8i: replace enable-sdio-wakeup with wakeup-source for BananaPi M1+
  ARM: gr8: evb: Add i2s codec
  ARM: dts: sun6i: sina31s: Enable internal audio codec
  ARM: dts: sun6i: hummingbird: Enable internal audio codec
  ARM: dts: sun6i: Add audio codec device node
  ARM: gr8: evb: Enable SPDIF
  ARM: dts: sun8i: Add SPI controller node in H3
  ARM: dts: sun8i: Add SPI pinctrl node in H3
  ARM: dts: sun8i: Add dts file for NanoPi M1 SBC
  ARM: dts: sun8i: Use the common file in NanoPi NEO SBC
  ARM: dts: sun8i: Add common dtsi file for NanoPi SBCs
  ARM: dts: sun9i: cubieboard4: Enable AP6330 WiFi
  ...
parents 6c302698 0fa1c17c

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
	sun4i-a10-pcduino2.dtb \

	sun4i-a10-pov-protab2-ips9.dtb

dtb-$(CONFIG_MACH_SUN5I) += \

	ntc-gr8-evb.dtb \

	sun5i-a10s-auxtek-t003.dtb \

	sun5i-a10s-auxtek-t004.dtb \

	sun5i-a10s-mk802.dtb \
@@ -776,6 +775,8 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-q8-tablet.dtb \

	sun5i-a13-utoo-p66.dtb \

	sun5i-gr8-chip-pro.dtb \

	sun5i-gr8-evb.dtb \

	sun5i-r8-chip.dtb

dtb-$(CONFIG_MACH_SUN6I) += \

	sun6i-a31-app4-evb1.dtb \

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

+2 −1
Original line number Diff line number Diff line
@@ -967,7 +967,8 @@ 
			compatible = "allwinner,sun4i-a10-pinctrl";

			reg = <0x01c20800 0x400>;

			interrupts = <28>;

			clocks = <&apb0_gates 5>;

			clocks = <&apb0_gates 5>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

			gpio-controller;

			interrupt-controller;

			#interrupt-cells = <3>;

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

+2 −2
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ 


&spi2 {

	pinctrl-names = "default";

	pinctrl-0 = <&spi2_pins_a>,

		    <&spi2_cs0_pins_a>;

	pinctrl-0 = <&spi2_pins_b>,

		    <&spi2_cs0_pins_b>;

	status = "okay";

};

arch/arm/boot/dts/sun5i-a10s.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -243,14 +243,14 @@ 
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	spi2_pins_a: spi2@0 {

	spi2_pins_b: spi2@1 {

		allwinner,pins = "PB12", "PB13", "PB14";

		allwinner,function = "spi2";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	spi2_cs0_pins_a: spi2_cs0@0 {

	spi2_cs0_pins_b: spi2_cs0@1 {

		allwinner,pins = "PB11";

		allwinner,function = "spi2";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

arch/arm/boot/dts/sun5i-a13-olinuxino.dts

+54 −0
Original line number Diff line number Diff line
@@ -72,6 +72,47 @@ 
			default-state = "on";

		};

	};



	bridge {

		compatible = "dumb-vga-dac";

		#address-cells = <1>;

		#size-cells = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				vga_bridge_in: endpoint {

					remote-endpoint = <&tcon0_out_vga>;

				};

			};



			port@1 {

				reg = <1>;



				vga_bridge_out: endpoint {

					remote-endpoint = <&vga_con_in>;

				};

			};

		};

	};



	vga {

		compatible = "vga-connector";



		port {

			vga_con_in: endpoint {

				remote-endpoint = <&vga_bridge_out>;

			};

		};

	};

};



&be0 {

	status = "okay";

};



&ehci0 {
@@ -211,6 +252,19 @@ 
	status = "okay";

};



&tcon0 {

	pinctrl-names = "default";

	pinctrl-0 = <&lcd_rgb666_pins>;

	status = "okay";

};



&tcon0_out {

	tcon0_out_vga: endpoint@0 {

		reg = <0>;

		remote-endpoint = <&vga_bridge_in>;

	};

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins_b>;