Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/gpl2/dts/dist Merge conflicts.



details:   https://anonhg.NetBSD.org/src/rev/6db49ca19e98
branches:  trunk
changeset: 838561:6db49ca19e98
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jan 22 15:13:22 2019 +0000

description:
Merge conflicts.

diffstat:

 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi                                 |    6 +
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi              |   20 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi              |   21 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb-nand.dts                         |   73 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb.dtsi                             |   86 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts              |  112 --
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-colibri-512.dtsi                     |  540 ----------
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-iris-512.dts                         |  106 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts           |  180 ++-
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                   |   32 +-
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi |   20 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi     |   19 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi        |   21 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi               |  137 --
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts                    |  154 --
 sys/external/gpl2/dts/dist/include/dt-bindings/clock/exynos5440.h                         |   46 -
 sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h                  |   19 +-
 17 files changed, 199 insertions(+), 1393 deletions(-)

diffs (truncated from 1748 to 300 lines):

diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi Tue Jan 22 15:02:33 2019 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi Tue Jan 22 15:13:22 2019 +0000
@@ -66,6 +66,12 @@
                        clock-frequency = <1000000>;
                };
 
+               txp@7e004000 {
+                       compatible = "brcm,bcm2835-txp";
+                       reg = <0x7e004000 0x20>;
+                       interrupts = <1 11>;
+               };
+
                dma: dma@7e007000 {
                        compatible = "brcm,bcm2835-dma";
                        reg = <0x7e007000 0xf00>;
diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi      Tue Jan 22 15:02:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device tree sources for Exynos4412 TMU sensor configuration
- *
- * Copyright (c) 2014 Lukasz Majewski <l.majewski%samsung.com@localhost>
- */
-
-#include <dt-bindings/thermal/thermal_exynos.h>
-
-#thermal-sensor-cells = <0>;
-samsung,tmu_gain = <8>;
-samsung,tmu_reference_voltage = <16>;
-samsung,tmu_noise_cancel_mode = <4>;
-samsung,tmu_efuse_value = <55>;
-samsung,tmu_min_efuse_value = <40>;
-samsung,tmu_max_efuse_value = <100>;
-samsung,tmu_first_point_trim = <25>;
-samsung,tmu_second_point_trim = <85>;
-samsung,tmu_default_temp_offset = <50>;
-samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;
diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi      Tue Jan 22 15:02:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device tree sources for Exynos5420 TMU sensor configuration
- *
- * Copyright (c) 2014 Lukasz Majewski <l.majewski%samsung.com@localhost>
- * Copyright (c) 2017 Krzysztof Kozlowski <krzk%kernel.org@localhost>
- */
-
-#include <dt-bindings/thermal/thermal_exynos.h>
-
-#thermal-sensor-cells = <0>;
-samsung,tmu_gain = <8>;
-samsung,tmu_reference_voltage = <16>;
-samsung,tmu_noise_cancel_mode = <4>;
-samsung,tmu_efuse_value = <55>;
-samsung,tmu_min_efuse_value = <0>;
-samsung,tmu_max_efuse_value = <100>;
-samsung,tmu_first_point_trim = <25>;
-samsung,tmu_second_point_trim = <85>;
-samsung,tmu_default_temp_offset = <50>;
-samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;
diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb-nand.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb-nand.dts Tue Jan 22 15:02:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2017 MediaTek Inc.
- * Author: John Crispin <john%phrozen.org@localhost>
- *
- */
-
-/dts-v1/;
-#include "mt7623n-rfb.dtsi"
-
-/ {
-       model = "MediaTek MT7623N NAND reference board";
-       compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";
-};
-
-&bch {
-       status = "okay";
-};
-
-&nandc {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&nand_pins_default>;
-
-       nand@0 {
-               reg = <0>;
-               spare_per_sector = <64>;
-               nand-ecc-mode = "hw";
-               nand-ecc-strength = <12>;
-               nand-ecc-step-size = <1024>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "preloader";
-                               reg = <0x0 0x40000>;
-                       };
-
-                       partition@40000 {
-                               label = "uboot";
-                               reg = <0x40000 0x80000>;
-                       };
-
-                       partition@c0000 {
-                               label = "uboot-env";
-                               reg = <0xC0000 0x40000>;
-                       };
-
-                       partition@140000 {
-                               label = "bootimg";
-                               reg = <0x140000 0x2000000>;
-                       };
-
-                       partition@2140000 {
-                               label = "recovery";
-                               reg = <0x2140000 0x2000000>;
-                       };
-
-                       partition@4140000 {
-                               label = "rootfs";
-                               reg = <0x4140000 0x1000000>;
-                       };
-
-                       partition@5140000 {
-                               label = "usrdata";
-                               reg = <0x5140000 0x1000000>;
-                       };
-               };
-       };
-};
diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb.dtsi     Tue Jan 22 15:02:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2017 MediaTek Inc.
- * Author: John Crispin <john%phrozen.org@localhost>
- *        Sean Wang <sean.wang%mediatek.com@localhost>
- *
- */
-
-/dts-v1/;
-#include "mt7623.dtsi"
-#include "mt6323.dtsi"
-
-/ {
-       aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-               serial2 = &uart2;
-       };
-
-       chosen {
-               stdout-path = "serial2:115200n8";
-       };
-
-       cpus {
-               cpu0 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu1 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu2 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu3 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               reg = <0 0x80000000 0 0x40000000>;
-       };
-
-       usb_p1_vbus: regulator-5v {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&pio 135 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&mmc0 {
-       vmmc-supply = <&mt6323_vemc3v3_reg>;
-       vqmmc-supply = <&mt6323_vio18_reg>;
-};
-
-&mmc1 {
-       vmmc-supply = <&mt6323_vmch_reg>;
-       vqmmc-supply = <&mt6323_vmc_reg>;
-};
-
-&uart0 {
-       status = "okay";
-};
-
-&uart1 {
-       status = "okay";
-};
-
-&uart2 {
-       status = "okay";
-};
-
-&usb1 {
-       vbus-supply = <&usb_p1_vbus>;
-       status = "okay";
-};
-
-&u3phy1 {
-       status = "okay";
-};
diff -r dfaff47acdca -r 6db49ca19e98 sys/external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts      Tue Jan 22 15:02:33 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright Altera Corporation (C) 2015. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "socfpga_cyclone5.dtsi"
-
-/ {
-       model = "Terasic DE-0(Atlas)";
-       compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";
-
-       chosen {
-               bootargs = "earlyprintk";
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               name = "memory";
-               device_type = "memory";
-               reg = <0x0 0x40000000>; /* 1GB */
-       };
-
-       aliases {
-               ethernet0 = &gmac1;
-       };
-
-       regulator_3_3v: 3-3-v-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               hps0 {
-                       label = "hps_led0";
-                       gpios = <&portb 24 0>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-};
-
-&gmac1 {
-       status = "okay";
-       phy-mode = "rgmii";
-
-       txd0-skew-ps = <0>; /* -420ps */
-       txd1-skew-ps = <0>; /* -420ps */
-       txd2-skew-ps = <0>; /* -420ps */
-       txd3-skew-ps = <0>; /* -420ps */
-       rxd0-skew-ps = <420>; /* 0ps */
-       rxd1-skew-ps = <420>; /* 0ps */



Home | Main Index | Thread Index | Old Index