svn commit: r355175 - in stable/12/sys: dev/iicbus/twsi dts/arm/overlays modules/dtb/allwinner

[Emmanuel Vadot]

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 at 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