比较文本

查找两个文本文件之间的差异

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 10年前差异永不过期

74 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

294 行

4 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

224 行

* Hans de Goede <hdegoede@redhat.com>

* 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 "sun7i-a20.dtsi"

#include "sunxi-common-regulators.dtsi"

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

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {

model = "LeMaker Banana Pi";

compatible = "lemaker,bananapi", "allwinner,sun7i-a20";

aliases {

serial0 = &uart0;

serial1 = &uart3;

serial2 = &uart7;

};

chosen {

stdout-path = "serial0:115200n8";

};

leds {

compatible = "gpio-leds";

pinctrl-names = "default";

pinctrl-0 = <&led_pins_bananapi>;

green {

label = "bananapi:green:usr";

gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;

};

reg_gmac_3v3: gmac-3v3 {

compatible = "regulator-fixed";

pinctrl-names = "default";

pinctrl-0 = <&gmac_power_pin_bananapi>;

regulator-name = "gmac-3v3";

regulator-min-microvolt = <3300000>;

regulator-max-microvolt = <3300000>;

startup-delay-us = <100000>;

enable-active-high;

gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;

};

&ahci {

status = "okay";

};

&codec {

status = "okay";

};

&cpu0 {

cpu-supply = <&reg_dcdc2>;

operating-points = <

/* kHz uV */

960000 1400000

912000 1400000

864000 1350000

720000 1250000

528000 1150000

312000 1100000

144000 1050000

};

&ehci0 {

status = "okay";

};

&ehci1 {

status = "okay";

};

&gmac {

pinctrl-names = "default";

pinctrl-0 = <&gmac_pins_rgmii_a>;

phy = <&phy1>;

phy-mode = "rgmii";

phy-supply = <&reg_gmac_3v3>;

status = "okay";

phy1: ethernet-phy@1 {

reg = <1>;

};

&i2c0 {

pinctrl-names = "default";

pinctrl-0 = <&i2c0_pins_a>;

status = "okay";

axp209: pmic@34 {

compatible = "x-powers,axp209";

reg = <0x34>;

interrupt-parent = <&nmi_intc>;

interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;

#interrupt-cells = <1>;

};

&i2c2 {

pinctrl-names = "default";

pinctrl-0 = <&i2c2_pins_a>;

status = "okay";

};

&ir0 {

pinctrl-names = "default";

pinctrl-0 = <&ir0_rx_pins_a>;

status = "okay";

};

&mmc0 {

pinctrl-names = "default";

pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;

vmmc-supply = <&reg_vcc3v3>;

bus-width = <4>;

cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */

cd-inverted;

status = "okay";

};

&ohci0 {

status = "okay";

};

&ohci1 {

status = "okay";

};

&otg_sram {

status = "okay";

};

&pio {

usb0_id_detect_pin: usb0_id_detect_pin@0 {

allwinner,pins = "PH4";

allwinner,function = "gpio_in";

allwinner,drive = <SUN4I_PINCTRL_10_MA>;

allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

};

mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {

allwinner,pins = "PH10";

allwinner,function = "gpio_in";

allwinner,drive = <SUN4I_PINCTRL_10_MA>;

allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

};

gmac_power_pin_bananapi: gmac_power_pin@0 {

allwinner,pins = "PH23";

allwinner,function = "gpio_out";

allwinner,drive = <SUN4I_PINCTRL_10_MA>;

allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

};

led_pins_bananapi: led_pins@0 {

allwinner,pins = "PH24";

allwinner,function = "gpio_out";

allwinner,drive = <SUN4I_PINCTRL_10_MA>;

allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

};

#include "axp209.dtsi"

&reg_dcdc2 {

regulator-always-on;

regulator-min-microvolt = <1000000>;

regulator-max-microvolt = <1400000>;

regulator-name = "vdd-cpu";

};

&reg_dcdc3 {

regulator-always-on;

regulator-min-microvolt = <1000000>;

regulator-max-microvolt = <1400000>;

regulator-name = "vdd-int-dll";

};

&reg_ldo1 {

regulator-name = "vdd-rtc";

};

&reg_ldo2 {

regulator-always-on;

regulator-min-microvolt = <3000000>;

regulator-max-microvolt = <3000000>;

regulator-name = "avcc";

};

&reg_usb0_vbus {

status = "okay";

};

&reg_usb1_vbus {

status = "okay";

};

&reg_usb2_vbus {

status = "okay";

};

&spi0 {

pinctrl-names = "default";

pinctrl-0 = <&spi0_pins_a>,

<&spi0_cs0_pins_a>,

<&spi0_cs1_pins_a>;

status = "okay";

};

&uart0 {

pinctrl-names = "default";

pinctrl-0 = <&uart0_pins_a>;

status = "okay";

};

&uart3 {

pinctrl-names = "default";

pinctrl-0 = <&uart3_pins_b>;

status = "okay";

};

&uart7 {

pinctrl-names = "default";

pinctrl-0 = <&uart7_pins_a>;

status = "okay";

};

&usb_otg {

dr_mode = "otg";

status = "okay";

};

&usb_power_supply {

status = "okay";

};

&usbphy {

pinctrl-names = "default";

pinctrl-0 = <&usb0_id_detect_pin>;

usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

usb0_vbus_power-supply = <&usb_power_supply>;

usb0_vbus-supply = <&reg_usb0_vbus>;

usb1_vbus-supply = <&reg_usb1_vbus>;

usb2_vbus-supply = <&reg_usb2_vbus>;

status = "okay";

};

已保存差异

原始文本

打开文件

/*
 * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
 *
 * Hans de Goede <hdegoede@redhat.com>
 *
 * 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 "sun7i-a20.dtsi"
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
	model = "LeMaker Banana Pi";
	compatible = "lemaker,bananapi", "allwinner,sun7i-a20";

aliases {
		serial0 = &uart0;
		serial1 = &uart3;
		serial2 = &uart7;
	};

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

leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins_bananapi>;

green {
			label = "bananapi:green:usr";
			gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
		};
	};

reg_gmac_3v3: gmac-3v3 {
		compatible = "regulator-fixed";
		pinctrl-names = "default";
		pinctrl-0 = <&gmac_power_pin_bananapi>;
		regulator-name = "gmac-3v3";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		startup-delay-us = <100000>;
		enable-active-high;
		gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
	};
};

&ahci {
	status = "okay";
};

&codec {
	status = "okay";
};

&cpu0 {
	cpu-supply = <&reg_dcdc2>;
	operating-points = <
		/* kHz	  uV */
		960000	1400000
		912000	1400000
		864000	1350000
		720000	1250000
		528000	1150000
		312000	1100000
		144000	1050000
		>;
};

&ehci0 {
	status = "okay";
};

&ehci1 {
	status = "okay";
};

&gmac {
	pinctrl-names = "default";
	pinctrl-0 = <&gmac_pins_rgmii_a>;
	phy = <&phy1>;
	phy-mode = "rgmii";
	phy-supply = <&reg_gmac_3v3>;
	status = "okay";

phy1: ethernet-phy@1 {
		reg = <1>;
	};
};

&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins_a>;
	status = "okay";

axp209: pmic@34 {
		reg = <0x34>;
		interrupt-parent = <&nmi_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
	};
};

&i2c2 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c2_pins_a>;
	status = "okay";
};

&ir0 {
	pinctrl-names = "default";
	pinctrl-0 = <&ir0_rx_pins_a>;
	status = "okay";
};

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
	cd-inverted;
	status = "okay";
};

&ohci0 {
	status = "okay";
};

&ohci1 {
	status = "okay";
};

&otg_sram {
	status = "okay";
};

&pio {
	usb0_id_detect_pin: usb0_id_detect_pin@0 {
		allwinner,pins = "PH4";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
		allwinner,pins = "PH10";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

gmac_power_pin_bananapi: gmac_power_pin@0 {
		allwinner,pins = "PH23";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};

led_pins_bananapi: led_pins@0 {
		allwinner,pins = "PH24";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};
};

#include "axp209.dtsi"

&reg_dcdc2 {
	regulator-always-on;
	regulator-min-microvolt = <1000000>;
	regulator-max-microvolt = <1400000>;
	regulator-name = "vdd-cpu";
};

&reg_dcdc3 {
	regulator-always-on;
	regulator-min-microvolt = <1000000>;
	regulator-max-microvolt = <1400000>;
	regulator-name = "vdd-int-dll";
};

&reg_ldo1 {
	regulator-name = "vdd-rtc";
};

&reg_ldo2 {
	regulator-always-on;
	regulator-min-microvolt = <3000000>;
	regulator-max-microvolt = <3000000>;
	regulator-name = "avcc";
};

&reg_usb0_vbus {
	status = "okay";
};

&reg_usb1_vbus {
	status = "okay";
};

&reg_usb2_vbus {
	status = "okay";
};

&spi0 {
	pinctrl-names = "default";
	pinctrl-0 = <&spi0_pins_a>,
		    <&spi0_cs0_pins_a>,
		    <&spi0_cs1_pins_a>;
	status = "okay";
};

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

&uart3 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart3_pins_b>;
	status = "okay";
};

&uart7 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart7_pins_a>;
	status = "okay";
};

&usb_otg {
	dr_mode = "otg";
	status = "okay";
};

&usb_power_supply {
	status = "okay";
};

&usbphy {
	pinctrl-names = "default";
	pinctrl-0 = <&usb0_id_detect_pin>;
	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
	usb0_vbus_power-supply = <&usb_power_supply>;
	usb0_vbus-supply = <&reg_usb0_vbus>;
	usb1_vbus-supply = <&reg_usb1_vbus>;
	usb2_vbus-supply = <&reg_usb2_vbus>;
	status = "okay";
};

更改后文本

打开文件

/dts-v1/;
#include "sun7i-a20.dtsi"
#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>

/ {
	model = "LeMaker Banana Pi";
	compatible = "lemaker,bananapi", "allwinner,sun7i-a20";

aliases {
		serial0 = &uart0;
		serial1 = &uart3;
		serial2 = &uart7;
	};

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

leds {
		compatible = "gpio-leds";
		pinctrl-names = "default";
		pinctrl-0 = <&led_pins_bananapi>;

green {
			label = "bananapi:green:usr";
			gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
		};
	};

&ahci {
	status = "okay";
};

&ehci0 {
	status = "okay";
};

&ehci1 {
	status = "okay";
};

&gmac {
	pinctrl-names = "default";
	pinctrl-0 = <&gmac_pins_rgmii_a>;
	phy = <&phy1>;
	phy-mode = "rgmii";
	phy-supply = <&reg_gmac_3v3>;
	status = "okay";

phy1: ethernet-phy@1 {
		reg = <1>;
	};
};

&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins_a>;
	status = "okay";

axp209: pmic@34 {
		compatible = "x-powers,axp209";
		reg = <0x34>;
		interrupt-parent = <&nmi_intc>;
		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

interrupt-controller;
		#interrupt-cells = <1>;
	};
};

&i2c2 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c2_pins_a>;
	status = "okay";
};

&ir0 {
	pinctrl-names = "default";
	pinctrl-0 = <&ir0_rx_pins_a>;
	status = "okay";
};

&ohci0 {
	status = "okay";
};

&ohci1 {
	status = "okay";
};

&pio {
	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
		allwinner,pins = "PH10";
		allwinner,function = "gpio_in";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	};

gmac_power_pin_bananapi: gmac_power_pin@0 {
		allwinner,pins = "PH23";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};

led_pins_bananapi: led_pins@0 {
		allwinner,pins = "PH24";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
	};
};

&reg_usb1_vbus {
	status = "okay";
};

&reg_usb2_vbus {
	status = "okay";
};

&spi0 {
	pinctrl-names = "default";
	pinctrl-0 = <&spi0_pins_a>,
		    <&spi0_cs0_pins_a>,
		    <&spi0_cs1_pins_a>;
	status = "okay";
};

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

&uart3 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart3_pins_b>;
	status = "okay";
};

&uart7 {
	pinctrl-names = "default";
	pinctrl-0 = <&uart7_pins_a>;
	status = "okay";
};

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