Merge tag 'sunxi-dt-for-4.14-3' of... (1595de0e) · Commits · 戴 / test

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -912,6 +912,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
		sun8i-a33-q8-tablet.dtb \
		sun8i-a33-sinlinx-sina33.dtb \
		sun8i-a83t-allwinner-h8homlet-v2.dtb \
		sun8i-a83t-bananapi-m3.dtb \
		sun8i-a83t-cubietruck-plus.dtb \
		sun8i-h2-plus-orangepi-zero.dtb \
		sun8i-h3-bananapi-m2-plus.dtb \

arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts

0 → 100644

+148 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 Chen-Yu Tsai
		*
		* Chen-Yu Tsai <wens@csie.org>
		*
		* This file is dual-licensed: you can use it either under the terms
		* of the GPL or the X11 license, at your option. Note that this dual
		* licensing only applies to this file, and not this project as a
		* whole.
		*
		* a) This file is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License as
		* published by the Free Software Foundation; either version 2 of the
		* License, or (at your option) any later version.
		*
		* This file is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* Or, alternatively,
		*
		* b) Permission is hereby granted, free of charge, to any person
		* obtaining a copy of this software and associated documentation
		* files (the "Software"), to deal in the Software without
		* restriction, including without limitation the rights to use,
		* copy, modify, merge, publish, distribute, sublicense, and/or
		* sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following
		* conditions:
		*
		* The above copyright notice and this permission notice shall be
		* included in all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*/

		/dts-v1/;
		#include "sun8i-a83t.dtsi"
		#include "sunxi-common-regulators.dtsi"

		#include <dt-bindings/gpio/gpio.h>

		/ {
		model = "Banana Pi BPI-M3";
		compatible = "sinovoip,bpi-m3", "allwinner,sun8i-a83t";

		aliases {
		serial0 = &uart0;
		};

		chosen {
		stdout-path = "serial0:115200n8";
		};
		};

		&ehci0 {
		/* Terminus Tech FE 1.1s 4-port USB 2.0 hub here */
		status = "okay";

		/* TODO GL830 USB-to-SATA bridge downstream w/ GPIO power controls */
		};

		&mmc0 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc0_pins>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;
		cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
		cd-inverted;
		status = "okay";
		};

		&mmc2 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc2_8bit_emmc_pins>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <8>;
		non-removable;
		cap-mmc-hw-reset;
		status = "okay";
		};

		&r_rsb {
		status = "okay";

		axp81x: pmic@3a3 {
		compatible = "x-powers,axp813";
		reg = <0x3a3>;
		interrupt-parent = <&r_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
		};

		ac100: codec@e89 {
		compatible = "x-powers,ac100";
		reg = <0xe89>;

		ac100_codec: codec {
		compatible = "x-powers,ac100-codec";
		interrupt-parent = <&r_pio>;
		interrupts = <0 11 IRQ_TYPE_LEVEL_LOW>; /* PL11 */
		#clock-cells = <0>;
		clock-output-names = "4M_adda";
		};

		ac100_rtc: rtc {
		compatible = "x-powers,ac100-rtc";
		interrupt-parent = <&r_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
		clocks = <&ac100_codec>;
		#clock-cells = <1>;
		clock-output-names = "cko1_rtc",
		"cko2_rtc",
		"cko3_rtc";
		};
		};
		};

		&reg_usb1_vbus {
		gpio = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
		status = "okay";
		};

		&reg_vcc3v0 {
		status = "disabled";
		};

		&reg_vcc5v0 {
		status = "disabled";
		};

		&uart0 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_pb_pins>;
		status = "okay";
		};

		&usbphy {
		usb1_vbus-supply = <&reg_usb1_vbus>;
		status = "okay";
		};

arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

+1 −8

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

		aliases {
		serial0 = &uart0;
		ethernet0 = &emac;
		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
		ethernet1 = &sdiowifi;
		};

		@@ -108,13 +108,6 @@
		status = "okay";
		};

		&emac {
		phy-handle = <&int_mii_phy>;
		phy-mode = "mii";
		allwinner,leds-active-low;
		status = "okay";
		};

		&ir {
		pinctrl-names = "default";
		pinctrl-0 = <&ir_pins_a>;

Admin message