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/arch Merge conflicts.



details:   https://anonhg.NetBSD.org/src/rev/d0e7a677d1f2
branches:  trunk
changeset: 362836:d0e7a677d1f2
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jun 27 16:32:14 2018 +0000

description:
Merge conflicts.

diffstat:

 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi                   |    6 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi                       |    1 +
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-sd5v1.dts               |   42 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts            |   81 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi    |   20 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi        |   21 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi                    |  355 ----
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi           |  196 --
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540.dts                    |   94 -
 sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu9540.dts                    |   79 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts |   10 +
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi         |   50 +
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi        |  766 +++++----
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts        |   66 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts        |   66 -
 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct.dtsi           |  351 ----
 16 files changed, 449 insertions(+), 1755 deletions(-)

diffs (truncated from 2339 to 300 lines):

diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi     Wed Jun 27 16:27:06 2018 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi     Wed Jun 27 16:32:14 2018 +0000
@@ -83,12 +83,6 @@
        bus-width = <4>;
 };
 
-&pwm {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
-       status = "okay";
-};
-
 &usb {
        power-domains = <&power RPI_POWER_DOMAIN_USB>;
 };
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi Wed Jun 27 16:27:06 2018 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi Wed Jun 27 16:32:14 2018 +0000
@@ -136,6 +136,7 @@
                rng@7e104000 {
                        compatible = "brcm,bcm2835-rng";
                        reg = <0x7e104000 0x10>;
+                       interrupts = <2 29>;
                };
 
                mailbox: mailbox@7e00b880 {
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-sd5v1.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-sd5v1.dts Wed Jun 27 16:27:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SAMSUNG SD5v1 board device tree source
- *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- */
-
-/dts-v1/;
-#include "exynos5440.dtsi"
-
-/ {
-       model = "SAMSUNG SD5v1 board based on EXYNOS5440";
-       compatible = "samsung,sd5v1", "samsung,exynos5440", "samsung,exynos5";
-
-       chosen {
-               bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
-       };
-
-       /* FIXME: set reg property with correct start address and size */
-       memory@0 {
-               device_type = "memory";
-               reg = <0 0>;
-       };
-
-       fixed-rate-clocks {
-               xtal {
-                       compatible = "samsung,clock-xtal";
-                       clock-frequency = <50000000>;
-               };
-       };
-
-       spi {
-               status = "disabled";
-       };
-
-};
-
-&gmac {
-       fixed_phy;
-       phy_addr = <1>;
-};
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts      Wed Jun 27 16:27:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SAMSUNG SSDK5440 board device tree source
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- */
-
-/dts-v1/;
-#include "exynos5440.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-       model = "SAMSUNG SSDK5440 board based on EXYNOS5440";
-       compatible = "samsung,ssdk5440", "samsung,exynos5440", "samsung,exynos5";
-
-       chosen {
-               bootargs = "root=/dev/sda2 rw rootwait ignore_loglevel earlyprintk no_console_suspend mem=2048M@0x80000000 mem=6144M@0x100000000 console=ttySAC0,115200";
-       };
-
-       /* FIXME: set reg property with correct start address and size */
-       memory@0 {
-               device_type = "memory";
-               reg = <0 0>;
-       };
-
-       fixed-rate-clocks {
-               xtal {
-                       compatible = "samsung,clock-xtal";
-                       clock-frequency = <50000000>;
-               };
-       };
-};
-
-&pcie_0 {
-       reset-gpio = <&pin_ctrl 5 GPIO_ACTIVE_HIGH>;
-       status = "okay";
-};
-
-&pcie_1 {
-       reset-gpio = <&pin_ctrl 22 GPIO_ACTIVE_HIGH>;
-       status = "okay";
-};
-
-&spi_0 {
-       flash: w25q128@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "winbond,w25q128";
-               spi-max-frequency = <15625000>;
-               reg = <0>;
-               controller-data {
-                       samsung,spi-feedback-delay = <0>;
-               };
-
-               partition@0 {
-                       label = "BootLoader";
-                       reg = <0x60000 0x80000>;
-                       read-only;
-               };
-
-               partition@e0000 {
-                       label = "Recovery-Kernel";
-                       reg = <0xe0000 0x300000>;
-                       read-only;
-               };
-
-               partition@3e0000 {
-                       label = "CRAM-FS";
-                       reg = <0x3e0000 0x700000>;
-                       read-only;
-               };
-
-               partition@ae0000 {
-                       label = "User-Data";
-                       reg = <0xae0000 0x520000>;
-               };
-
-       };
-
-};
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi      Wed Jun 27 16:27:06 2018 +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 Exynos5440 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 = <5>;
-samsung,tmu_reference_voltage = <16>;
-samsung,tmu_noise_cancel_mode = <4>;
-samsung,tmu_efuse_value = <0x5d2d>;
-samsung,tmu_min_efuse_value = <16>;
-samsung,tmu_max_efuse_value = <76>;
-samsung,tmu_first_point_trim = <25>;
-samsung,tmu_second_point_trim = <70>;
-samsung,tmu_default_temp_offset = <25>;
-samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi  Wed Jun 27 16:27:06 2018 +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 default Exynos5440 thermal zone definition
- *
- * Copyright (c) 2014 Lukasz Majewski <l.majewski%samsung.com@localhost>
- */
-
-polling-delay-passive = <0>;
-polling-delay = <0>;
-trips {
-       cpu-alert-0 {
-               temperature = <100000>; /* millicelsius */
-               hysteresis = <0>; /* millicelsius */
-               type = "active";
-       };
-       cpu-crit-0 {
-               temperature = <105000>; /* millicelsius */
-               hysteresis = <0>; /* millicelsius */
-               type = "critical";
-       };
-};
diff -r 9cfc2d8dc185 -r d0e7a677d1f2 sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi      Wed Jun 27 16:27:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SAMSUNG EXYNOS5440 SoC device tree source
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- */
-
-#include <dt-bindings/clock/exynos5440.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-       compatible = "samsung,exynos5440", "samsung,exynos5";
-
-       interrupt-parent = <&gic>;
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       aliases {
-               serial0 = &serial_0;
-               serial1 = &serial_1;
-               spi0 = &spi_0;
-               tmuctrl0 = &tmuctrl_0;
-               tmuctrl1 = &tmuctrl_1;
-               tmuctrl2 = &tmuctrl_2;
-       };
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu@0 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a15";
-                       reg = <0>;
-               };
-               cpu@1 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a15";
-                       reg = <1>;
-               };
-               cpu@2 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a15";
-                       reg = <2>;
-               };
-               cpu@3 {
-                       device_type = "cpu";
-                       compatible = "arm,cortex-a15";
-                       reg = <3>;
-               };
-       };
-
-       soc: soc {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-
-               clock: clock-controller@160000 {
-                       compatible = "samsung,exynos5440-clock";
-                       reg = <0x160000 0x1000>;
-                       #clock-cells = <1>;
-               };
-
-               gic: interrupt-controller@2e0000 {
-                       compatible = "arm,cortex-a15-gic";
-                       #interrupt-cells = <3>;
-                       interrupt-controller;
-                       reg =   <0x2E1000 0x1000>,
-                               <0x2E2000 0x2000>,
-                               <0x2E4000 0x2000>,
-                               <0x2E6000 0x2000>;
-                       interrupts = <GIC_PPI 9
-                                       (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-               };
-
-
-               arm-pmu {
-                       compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
-                       interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               timer {
-                       compatible = "arm,cortex-a15-timer",



Home | Main Index | Thread Index | Old Index