[src/trunk]: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner Fix...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a346331a6bcb
branches:  trunk
changeset: 324312:a346331a6bcb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jun 27 16:44:38 2018 +0000

description:
Fix merge problem.

diffstat:

 sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi |  50 ----------
 1 files changed, 0 insertions(+), 50 deletions(-)

diffs (59 lines):

diff -r be94098b8d5d -r a346331a6bcb sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
--- a/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi   Wed Jun 27 16:38:40 2018 +0000
+++ b/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi   Wed Jun 27 16:44:38 2018 +0000
@@ -459,55 +459,5 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
-
-               r_ccu: clock@7010000 {
-                       compatible = "allwinner,sun50i-h6-r-ccu";
-                       reg = <0x07010000 0x400>;
-                       clocks = <&osc24M>, <&osc32k>, <&iosc>,
-                                <&ccu CLK_PLL_PERIPH0>;
-                       clock-names = "hosc", "losc", "iosc", "pll-periph";
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-               };
-
-               r_intc: interrupt-controller@7021000 {
-                       compatible = "allwinner,sun50i-h6-r-intc",
-                                    "allwinner,sun6i-a31-r-intc";
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       reg = <0x07021000 0x400>;
-                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               r_pio: pinctrl@7022000 {
-                       compatible = "allwinner,sun50i-h6-r-pinctrl";
-                       reg = <0x07022000 0x400>;
-                       interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&r_ccu 2>, <&osc24M>, <&osc32k>;
-                       clock-names = "apb", "hosc", "losc";
-                       gpio-controller;
-                       #gpio-cells = <3>;
-                       interrupt-controller;
-                       #interrupt-cells = <3>;
-
-                       r_i2c_pins: r-i2c {
-                               pins = "PL0", "PL1";
-                               function = "s_i2c";
-                       };
-               };
-
-               r_i2c: i2c@7081400 {
-                       compatible = "allwinner,sun6i-a31-i2c";
-                       reg = <0x07081400 0x400>;
-                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&r_ccu 8>;
-                       resets = <&r_ccu 4>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&r_i2c_pins>;
-                       status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-               };
        };
 };