From owner-svn-src-head@freebsd.org Tue Mar 7 13:59:31 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97284D0182F; Tue, 7 Mar 2017 13:59:31 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 50CCB189A; Tue, 7 Mar 2017 13:59:31 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v27DxUHH078432; Tue, 7 Mar 2017 13:59:30 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27DxUHO078430; Tue, 7 Mar 2017 13:59:30 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201703071359.v27DxUHO078430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 7 Mar 2017 13:59:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314855 - head/sys/boot/fdt/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 13:59:31 -0000 Author: manu Date: Tue Mar 7 13:59:30 2017 New Revision: 314855 URL: https://svnweb.freebsd.org/changeset/base/314855 Log: Update our Allwinner DTS to latest DTS changes in Linux 4.10 Modified: head/sys/boot/fdt/dts/arm/h3.dtsi head/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts Modified: head/sys/boot/fdt/dts/arm/h3.dtsi ============================================================================== --- head/sys/boot/fdt/dts/arm/h3.dtsi Tue Mar 7 13:56:49 2017 (r314854) +++ head/sys/boot/fdt/dts/arm/h3.dtsi Tue Mar 7 13:59:30 2017 (r314855) @@ -26,91 +26,29 @@ * $FreeBSD$ */ -#include - / { cpus { cpu0: cpu@0 { - clocks = <&cpu>; + clocks = <&ccu CLK_CPUX>; clock-latency = <2000000>; }; }; - clocks { - pll2: clk@01c20008 { - #clock-cells = <1>; - compatible = "allwinner,sun8i-h3-pll2-clk"; - reg = <0x01c20008 0x4>; - clocks = <&osc24M>; - clock-output-names = "pll2-1x", "pll2-2x", - "pll2-4x", "pll2-8x"; - }; - - ths_clk: clk@1c20074 { - #clock-cells = <0>; - compatible = "allwinner,sun8i-h3-ths-clk"; - reg = <0x01c20074 0x4>; - clocks = <&osc24M>; - clock-output-names = "ths"; - }; - - codec_clk: clk@01c20140 { - #clock-cells = <0>; - compatible = "allwinner,sun4i-a10-codec-clk"; - reg = <0x01c20140 0x4>; - clocks = <&pll2 SUN4I_A10_PLL2_1X>; - clock-output-names = "codec"; - }; - }; - soc { emac: ethernet@1c30000 { compatible = "allwinner,sun8i-h3-emac"; reg = <0x01c30000 0x104>, <0x01c00030 0x4>; reg-names = "emac", "syscon"; interrupts = ; - resets = <&ahb_rst 17>, <&ahb_rst 66>; + resets = <&ccu RST_BUS_EMAC>, <&ccu RST_BUS_EPHY>; reset-names = "ahb", "ephy"; - clocks = <&bus_gates 17>, <&bus_gates 128>; + clocks = <&ccu CLK_BUS_EMAC>, <&ccu CLK_BUS_EPHY>; clock-names = "ahb", "ephy"; #address-cells = <1>; #size-cells = <0>; status = "disabled"; }; - i2c0: i2c@1c2ac00 { - compatible = "allwinner,sun6i-a31-i2c"; - reg = <0x01c2ac00 0x400>; - interrupts = ; - clocks = <&bus_gates 96>; - resets = <&apb2_rst 0>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - }; - - i2c1: i2c@1c2b000 { - compatible = "allwinner,sun6i-a31-i2c"; - reg = <0x01c2b000 0x400>; - interrupts = ; - clocks = <&bus_gates 97>; - resets = <&apb2_rst 1>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - }; - - i2c2: i2c@1c2b400 { - compatible = "allwinner,sun6i-a31-i2c"; - reg = <0x01c2b400 0x400>; - interrupts = ; - clocks = <&bus_gates 98>; - resets = <&apb2_rst 2>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - }; - r_i2c: i2c@1f02400 { compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01f02400 0x400>; @@ -129,44 +67,29 @@ compatible = "allwinner,sun8i-h3-ts"; reg = <0x01c25000 0x400>; interrupts = ; - clocks = <&bus_gates 72>, <&ths_clk>; + clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>; clock-names = "ahb", "ths"; - resets = <&apb1_rst 8>; + resets = <&ccu RST_BUS_THS 8>; #thermal-sensor-cells = <0>; }; - dma: dma-controller@01c02000 { - compatible = "allwinner,sun8i-h3-dma"; - reg = <0x01c02000 0x1000>; - interrupts = ; - clocks = <&bus_gates 6>; - clock-names = "ahb"; - resets = <&ahb_rst 6>; - reset-names = "ahb"; - #dma-cells = <1>; - }; - - codec: codec@01c22c00 { - compatible = "allwinner,sun8i-h3-codec"; - reg = <0x01c22c00 0x100>, <0x01f015c0 0x4>; - reg-names = "codec", "pr"; - interrupts = ; - clocks = <&bus_gates 64>, <&codec_clk>; - clock-names = "ahb", "codec"; - resets = <&ahb_rst 128>; - reset-names = "ahb"; - dmas = <&dma 15>, <&dma 15>; - dma-names = "rx", "tx"; - status = "disabled"; - }; + /* codec: codec@01c22c00 { */ + /* compatible = "allwinner,sun8i-h3-codec"; */ + /* reg = <0x01c22c00 0x100>, <0x01f015c0 0x4>; */ + /* reg-names = "codec", "pr"; */ + /* interrupts = ; */ + /* clocks = <&ccu CLK_BUS_CODEC>, <&codec_clk>; */ + /* clock-names = "ahb", "codec"; */ + /* resets = <&ahb_rst 128>; */ + /* reset-names = "ahb"; */ + /* dmas = <&dma 15>, <&dma 15>; */ + /* dma-names = "rx", "tx"; */ + /* status = "disabled"; */ + /* }; */ }; }; -&pll1 { - compatible = "allwinner,sun8i-h3-pll1-clk"; -}; - &pio { emac_pins_rgmii_a: emac_rgmii@0 { allwinner,pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", @@ -176,4 +99,11 @@ allwinner,drive = ; allwinner,pull = ; }; + + emac_phy_reset_pin: emac_phy_reset_pin@0 { + allwinner,pins = "PD6"; + allwinner,function = "gpio_out"; + allwinner,drive = ; + allwinner,pull = ; + }; }; Modified: head/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts ============================================================================== --- head/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts Tue Mar 7 13:56:49 2017 (r314854) +++ head/sys/boot/fdt/dts/arm/orangepi-plus-2e.dts Tue Mar 7 13:59:30 2017 (r314855) @@ -101,12 +101,12 @@ }; }; -&codec { - pinctrl-names = "default"; - pinctrl-0 = <&codec_pa_pin>; - allwinner,pa-gpios = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */ - status = "okay"; -}; +/* &codec { */ +/* pinctrl-names = "default"; */ +/* pinctrl-0 = <&codec_pa_pin>; */ +/* allwinner,pa-gpios = <&pio 0 16 GPIO_ACTIVE_HIGH>; /\* PA16 *\/ */ +/* status = "okay"; */ +/* }; */ &cpu0 { cpu-supply = <&vdd_cpu>;