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/include/dt-bindings/soc Merge con...
details: https://anonhg.NetBSD.org/src/rev/380e43d2ea86
branches: trunk
changeset: 1024855:380e43d2ea86
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Sun Nov 07 16:57:37 2021 +0000
description:
Merge conflicts.
diffstat:
sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizboxmini.dts | 171 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6-evb.dts | 78 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6.dtsi | 800 --
sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas7-evb.dts | 127 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas7.dtsi | 1955 -----
sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi | 14 +
sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 4 +-
sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +-
sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi | 30 +-
sys/external/gpl2/dts/dist/arch/arm/boot/dts/efm32gg-dk3750.dts | 88 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/efm32gg.dtsi | 177 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 475 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt8135-pinfunc.h | 1296 ---
sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 240 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 356 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 78 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 84 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/prima2-evb.dts | 37 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/prima2.dtsi | 838 --
sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-href-ab8505.dtsi | 234 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 285 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-u300.dts | 464 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 306 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 953 --
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157c.dtsi | 1535 ----
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi | 90 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi | 62 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi | 78 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi | 62 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-common.dtsi | 184 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-smp8758.dtsi | 57 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/tango4-vantage-1172.dts | 42 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/zx296702-ad1.dts | 48 -
sys/external/gpl2/dts/dist/arch/arm/boot/dts/zx296702.dtsi | 142 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/Makefile | 2 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/alpine-v2-evp.dts | 53 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/al/alpine-v2.dtsi | 236 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 55 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 110 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 242 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/Makefile | 18 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 +
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 100 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 86 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 105 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 375 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi | 278 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h | 1122 ---
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 55 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 89 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 109 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 92 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 90 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi | 30 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 268 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 653 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 91 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts | 16 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 37 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 157 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 319 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts | 16 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 50 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 157 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 206 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7795.dtsi | 3339 ----------
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts | 16 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 38 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 83 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 83 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2972 --------
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts | 16 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts | 33 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 75 +-
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 709 --
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi | 213 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/Makefile | 3 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718-evb.dts | 144 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718-pcbox.dts | 143 -
sys/external/gpl2/dts/dist/arch/arm64/boot/dts/zte/zx296718.dtsi | 627 -
sys/external/gpl2/dts/dist/include/dt-bindings/clk/ti-dra7-atl.h | 42 -
sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h | 5 +-
sys/external/gpl2/dts/dist/include/dt-bindings/clock/zx296702-clock.h | 182 -
sys/external/gpl2/dts/dist/include/dt-bindings/clock/zx296718-clock.h | 166 -
sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h | 15 +-
sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h | 5 +-
sys/external/gpl2/dts/dist/include/dt-bindings/soc/zte,pm_domains.h | 26 -
87 files changed, 871 insertions(+), 24710 deletions(-)
diffs (truncated from 26823 to 300 lines):
diff -r 9475affa6c5f -r 380e43d2ea86 sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizboxmini.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizboxmini.dts Sun Nov 07 16:49:56 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board
- *
- * Copyright (C) 2014 Gaël PORTAY <g.portay%overkiz.com@localhost>
- */
-/dts-v1/;
-#include "at91sam9g25.dtsi"
-#include <dt-bindings/pwm/pwm.h>
-
-/ {
- model = "Overkiz Kizbox mini";
- compatible = "overkiz,kizboxmini", "atmel,at91sam9g25", "atmel,at91sam9x5", "atmel,at91sam9";
-
- chosen {
- bootargs = "ubi.mtd=ubi";
- stdout-path = &dbgu;
- };
-
- memory {
- reg = <0x20000000 0x8000000>;
- };
-
- clocks {
- slow_xtal {
- clock-frequency = <32768>;
- };
-
- main_xtal {
- clock-frequency = <12000000>;
- };
- };
-
- ahb {
- nand0: nand@40000000 {
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- atmel,has-pmecc;
- atmel,pmecc-cap = <4>;
- atmel,pmecc-sector-size = <512>;
- nand-on-flash-bbt;
- status = "okay";
- };
- };
-
- gpio_keys {
- compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
-
- prog {
- label = "PB_PROG";
- gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
- linux,code = <0x102>;
- wakeup-source;
- };
-
- reset {
- label = "PB_RST";
- gpios = <&pioC 16 GPIO_ACTIVE_LOW>;
- linux,code = <0x100>;
- wakeup-source;
- };
- };
-
- pwm_leds {
- compatible = "pwm-leds";
-
- green {
- label = "pwm:green:user";
- pwms = <&pwm0 0 10000000 0>;
- max-brightness = <255>;
- linux,default-trigger = "default-on";
- };
-
- red {
- label = "pwm:red:user";
- pwms = <&pwm0 1 10000000 0>;
- max-brightness = <255>;
- linux,default-trigger = "default-on";
- };
- };
-};
-
-&dbgu {
- status = "okay";
-};
-
-&ebi {
- pinctrl-0 = <&pinctrl_ebi_addr_nand
- &pinctrl_ebi_data_0_7>;
- pinctrl-names = "default";
- status = "okay";
-
- nand-controller {
- pinctrl-0 = <&pinctrl_nand_oe_we
- &pinctrl_nand_cs
- &pinctrl_nand_rb>;
- pinctrl-names = "default";
- status = "okay";
-
- nand@3 {
- reg = <0x3 0x0 0x800000>;
- rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
- cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- nand-ecc-strength = <4>;
- nand-ecc-step-size = <512>;
- nand-on-flash-bbt;
- label = "atmel_nand";
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- bootstrap@0 {
- label = "bootstrap";
- reg = <0x0 0x20000>;
- };
-
- ubi@20000 {
- label = "ubi";
- reg = <0x20000 0x7fe0000>;
- };
- };
- };
- };
-};
-
-&macb0 {
- phy-mode = "rmii";
- status = "okay";
-};
-
-&pwm0 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm0_pwm0_1
- &pinctrl_pwm0_pwm1_1>;
- status = "okay";
-};
-
-&tcb0 {
- timer@0 {
- compatible = "atmel,tcb-timer";
- reg = <0>;
- };
-
- timer@1 {
- compatible = "atmel,tcb-timer";
- reg = <1>;
- };
-};
-
-&usart0 {
- status = "okay";
-};
-
-&usb0 {
- num-ports = <1>;
- status = "okay";
-};
-
-&usb1 {
- status = "okay";
-};
-
-&watchdog {
- status = "okay";
-};
diff -r 9475affa6c5f -r 380e43d2ea86 sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6-evb.dts
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6-evb.dts Sun Nov 07 16:49:56 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * DTS file for CSR SiRFatlas6 Evaluation Board
- *
- * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company.
- */
-
-/dts-v1/;
-
-/include/ "atlas6.dtsi"
-
-/ {
- model = "CSR SiRFatlas6 Evaluation Board";
- compatible = "sirf,atlas6-cb", "sirf,atlas6";
-
- memory {
- device_type = "memory";
- reg = <0x00000000 0x20000000>;
- };
-
- axi {
- peri-iobg {
- uart@b0060000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_a>;
- };
- spi@b00d0000 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins_a>;
- spi@0 {
- compatible = "spidev";
- reg = <0>;
- spi-max-frequency = <1000000>;
- };
- };
- spi@b0170000 {
- pinctrl-names = "default";
- pinctrl-0 = <&spi1_pins_a>;
- };
- i2c0: i2c@b00e0000 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- lcd@40 {
- compatible = "sirf,lcd";
- reg = <0x40>;
- };
- };
-
- };
- disp-iobg {
- lcd@90010000 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_24pins_a>;
- };
- };
- };
- display: display@0 {
- panels {
- panel0: panel@0 {
- panel-name = "Innolux TFT";
- hactive = <800>;
- vactive = <480>;
- left_margin = <20>;
- right_margin = <234>;
- upper_margin = <3>;
- lower_margin = <41>;
- hsync_len = <3>;
- vsync_len = <2>;
- pixclock = <33264000>;
- sync = <3>;
- timing = <0x88>;
- };
- };
- };
-};
diff -r 9475affa6c5f -r 380e43d2ea86 sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm/boot/dts/atlas6.dtsi Sun Nov 07 16:49:56 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,800 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * DTS file for CSR SiRFatlas6 SoC
- *
- * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company.
- */
-
-/ {
- compatible = "sirf,atlas6";
- #address-cells = <1>;
- #size-cells = <1>;
- interrupt-parent = <&intc>;
-
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu@0 {
- reg = <0x0>;
- d-cache-line-size = <32>;
- i-cache-line-size = <32>;
- d-cache-size = <32768>;
- i-cache-size = <32768>;
- /* from bootloader */
- timebase-frequency = <0>;
- bus-frequency = <0>;
- clock-frequency = <0>;
- clocks = <&clks 12>;
- operating-points = <
- /* kHz uV */
- 200000 1025000
- 400000 1025000
- 600000 1050000
- 800000 1100000
- >;
- clock-latency = <150000>;
- };
- };
-
Home |
Main Index |
Thread Index |
Old Index