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

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

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

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

Pull "Allwinner dts changes for 4.14" from Chen-Yu Tsai:

The usual improvement patches:

  - R_INTC interrupt controller compatible string update and device node
    addition

  - Battery charger enabled on the Cubietruck

  - New board: Bananapi M2 Magic

  - Ethernet and USB OTG enabled on the Beelink X2

  - MMC enabled for A83T boards

* tag 'sunxi-dt-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: a83t: h8homlet: Enable micro-SD card and onboard eMMC
  ARM: dts: sun8i: a83t: cubietruck-plus: Enable micro-SD card and eMMC
  ARM: dts: sun8i: a83t: Add pingroup for 8-bit eMMC on mmc2
  ARM: dts: sun8i: a83t: Add MMC controller device nodes
  ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2
  ARM: dts: sun8i: h3: Enable USB OTG on the Beelink X2
  ARM: dts: sun8i: Add BananaPI M2-Magic DTS
  ARM: dts: sun7i: enable battery power supply subnode on cubietruck
  ARM: dts: sun8i: a83t: Add device node for R_INTC interrupt controller
  ARM: dts: sun8i: a23/a33: Use new sun6i-a31-r-intc compatible for NMI/R_INTC
  ARM: dts: sun6i: a31: Use new sun6i-a31-r-intc compatible for NMI/R_INTC
parents fc244e3a 581ae76e

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -918,6 +918,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-h3-orangepi-pc-plus.dtb \

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-parrot.dtb \

	sun8i-v3s-licheepi-zero.dtb \

	sun8i-v3s-licheepi-zero-dock.dtb

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

+3 −3
Original line number Diff line number Diff line
@@ -1155,11 +1155,11 @@ 
				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

		};



		nmi_intc: interrupt-controller@01f00c0c {

			compatible = "allwinner,sun6i-a31-sc-nmi";

		nmi_intc: interrupt-controller@1f00c00 {

			compatible = "allwinner,sun6i-a31-r-intc";

			interrupt-controller;

			#interrupt-cells = <2>;

			reg = <0x01f00c0c 0x38>;

			reg = <0x01f00c00 0x400>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		};

arch/arm/boot/dts/sun7i-a20-cubietruck.dts

+4 −0
Original line number Diff line number Diff line
@@ -271,6 +271,10 @@ 
	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -519,11 +519,11 @@ 
			#clock-cells = <1>;

		};



		nmi_intc: interrupt-controller@01f00c0c {

			compatible = "allwinner,sun6i-a31-sc-nmi";

		nmi_intc: interrupt-controller@1f00c00 {

			compatible = "allwinner,sun6i-a31-r-intc";

			interrupt-controller;

			#interrupt-cells = <2>;

			reg = <0x01f00c0c 0x38>;

			reg = <0x01f00c00 0x400>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		};

arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts

+21 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


/dts-v1/;

#include "sun8i-a83t.dtsi"

#include "sunxi-common-regulators.dtsi"



/ {

	model = "Allwinner A83T H8Homlet Proto Dev Board v2.0";
@@ -57,6 +58,26 @@ 
	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v0>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */

	bus-width = <4>;

	cd-inverted;

	status = "okay";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_8bit_emmc_pins>;

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <8>;

	non-removable;

	cap-mmc-hw-reset;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pb_pins>;