From owner-svn-src-all@freebsd.org Wed Dec 12 21:10:36 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E150A1325F34; Wed, 12 Dec 2018 21:10:35 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8138981468; Wed, 12 Dec 2018 21:10:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 657AEDA86; Wed, 12 Dec 2018 21:10:35 +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 wBCLAZdj078521; Wed, 12 Dec 2018 21:10:35 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBCLAZrX078519; Wed, 12 Dec 2018 21:10:35 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201812122110.wBCLAZrX078519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 12 Dec 2018 21:10:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r342006 - head/sys/dts/arm64/overlays X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/dts/arm64/overlays X-SVN-Commit-Revision: 342006 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8138981468 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-1.64 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.83)[-0.828,0]; NEURAL_HAM_SHORT(-0.81)[-0.812,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2018 21:10:36 -0000 Author: manu Date: Wed Dec 12 21:10:34 2018 New Revision: 342006 URL: https://svnweb.freebsd.org/changeset/base/342006 Log: arm64: allwinner: Fix pwm dtso Double patched files ended up in the tree Reported by: kevans Modified: head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso Modified: head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso ============================================================================== --- head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso Wed Dec 12 21:02:22 2018 (r342005) +++ head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso Wed Dec 12 21:10:34 2018 (r342006) @@ -24,29 +24,3 @@ function = "pwm"; }; }; -/dts-v1/; -/plugin/; - -/ { - compatible = "allwinner,sun50i-a64"; -}; - -&{/soc} { - pwm: pwm@1c21400 { - compatible = "allwinner,sun50i-a64-pwm", - "allwinner,sun5i-a13-pwm"; - reg = <0x01c21400 0x400>; - clocks = <&osc24M>; - pinctrl-names = "default"; - pinctrl-0 = <&pwm_pin>; - #pwm-cells = <3>; - status = "disabled"; - }; -}; - -&{/soc/pinctrl@1c20800} { - pwm_pin: pwm_pin { - pins = "PD22"; - function = "pwm"; - }; -}; Modified: head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso ============================================================================== --- head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso Wed Dec 12 21:02:22 2018 (r342005) +++ head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso Wed Dec 12 21:10:34 2018 (r342006) @@ -24,29 +24,3 @@ function = "s_pwm"; }; }; -/dts-v1/; -/plugin/; - -/ { - compatible = "allwinner,sun50i-a64"; -}; - -&{/soc} { - r_pwm: pwm@1f03800 { - compatible = "allwinner,sun50i-a64-pwm", - "allwinner,sun5i-a13-pwm"; - reg = <0x01f03800 0x400>; - clocks = <&osc24M>; - pinctrl-names = "default"; - pinctrl-0 = <&r_pwm_pin>; - #pwm-cells = <3>; - status = "okay"; - }; -}; - -&{/soc/pinctrl@1f02c00} { - r_pwm_pin: pwm { - pins = "PL10"; - function = "s_pwm"; - }; -};