From owner-svn-src-all@freebsd.org Thu Nov 28 17:34:50 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C4E831B067B; Thu, 28 Nov 2019 17:34:50 +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 47P4XB4p8bz3LK7; Thu, 28 Nov 2019 17:34:50 +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 850DB1378; Thu, 28 Nov 2019 17:34:50 +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 xASHYotB061904; Thu, 28 Nov 2019 17:34:50 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xASHYnvZ061901; Thu, 28 Nov 2019 17:34:49 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201911281734.xASHYnvZ061901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 28 Nov 2019 17:34:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r355175 - in stable/12/sys: dev/iicbus/twsi dts/arm/overlays modules/dtb/allwinner X-SVN-Group: stable-12 X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in stable/12/sys: dev/iicbus/twsi dts/arm/overlays modules/dtb/allwinner X-SVN-Commit-Revision: 355175 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Thu, 28 Nov 2019 17:34:50 -0000 Author: manu Date: Thu Nov 28 17:34:49 2019 New Revision: 355175 URL: https://svnweb.freebsd.org/changeset/base/355175 Log: MFC r350180, r351100 r350180: dtso: allwinner: Add an overlay for H3 i2c0 Most of the H3 boards don't enable i2c as it is unused. Add an overlay so it's easier for user to use i2c device. r351100: twsi: Fix build when DEBUG is used on 32bits arch. Added: stable/12/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso - copied unchanged from r350180, head/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso Modified: stable/12/sys/dev/iicbus/twsi/twsi.c stable/12/sys/modules/dtb/allwinner/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/iicbus/twsi/twsi.c ============================================================================== --- stable/12/sys/dev/iicbus/twsi/twsi.c Thu Nov 28 17:30:16 2019 (r355174) +++ stable/12/sys/dev/iicbus/twsi/twsi.c Thu Nov 28 17:34:49 2019 (r355175) @@ -261,7 +261,7 @@ twsi_calc_baud_rate(struct twsi_softc *sc, const u_int if (clk_get_freq(sc->clk_core, &clk) < 0) return (-1); - debugf(sc->dev, "Bus clock is at %lu\n", clk); + debugf(sc->dev, "Bus clock is at %ju\n", clk); for (n = 0; n < 8; n++) { for (m = 0; m < 16; m++) { Copied: stable/12/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso (from r350180, head/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso Thu Nov 28 17:34:49 2019 (r355175, copy of r350180, head/sys/dts/arm/overlays/sun8i-h3-i2c0.dtso) @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/i2c@1c2ac00} { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; +}; Modified: stable/12/sys/modules/dtb/allwinner/Makefile ============================================================================== --- stable/12/sys/modules/dtb/allwinner/Makefile Thu Nov 28 17:30:16 2019 (r355174) +++ stable/12/sys/modules/dtb/allwinner/Makefile Thu Nov 28 17:34:49 2019 (r355175) @@ -24,6 +24,7 @@ DTS= \ sun8i-h3-orangepi-plus2e.dts DTSO= sun8i-a83t-sid.dtso \ + sun8i-h3-i2c0.dtso \ sun8i-h3-sid.dtso \ sun8i-h3-ths.dtso