From owner-svn-src-stable@freebsd.org Wed Mar 15 21:01:04 2017 Return-Path: Delivered-To: svn-src-stable@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 E5CF6D0D6A2; Wed, 15 Mar 2017 21:01:04 +0000 (UTC) (envelope-from mizhka@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 98827FB6; Wed, 15 Mar 2017 21:01:04 +0000 (UTC) (envelope-from mizhka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2FL13Vi045016; Wed, 15 Mar 2017 21:01:03 GMT (envelope-from mizhka@FreeBSD.org) Received: (from mizhka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2FL13QS045014; Wed, 15 Mar 2017 21:01:03 GMT (envelope-from mizhka@FreeBSD.org) Message-Id: <201703152101.v2FL13QS045014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mizhka set sender to mizhka@FreeBSD.org using -f From: Michael Zhilin Date: Wed, 15 Mar 2017 21:01:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315329 - in stable/11/sys/dev: gpio spibus X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2017 21:01:05 -0000 Author: mizhka Date: Wed Mar 15 21:01:03 2017 New Revision: 315329 URL: https://svnweb.freebsd.org/changeset/base/315329 Log: MFC r310017-r310018 r310017: [spi] reformat message and ar5315_spi minor fix This commit corrects print of nomatch (newline was too early) and fix unit number for new child in ar5315_spi (was 0, now is -1 to calculate it according to actual system state) Submitted by: Hiroki Mori Reviewed by: ray, loos, mizhka MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D8749 r310018: [gpiospi] add clock delay to avoid smashing of bits Submitted by: Hiroki Mori Reviewed by: loos, ray, mizhka MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D8749 Modified: stable/11/sys/dev/gpio/gpiospi.c stable/11/sys/dev/spibus/spibus.c Modified: stable/11/sys/dev/gpio/gpiospi.c ============================================================================== --- stable/11/sys/dev/gpio/gpiospi.c Wed Mar 15 19:50:58 2017 (r315328) +++ stable/11/sys/dev/gpio/gpiospi.c Wed Mar 15 21:01:03 2017 (r315329) @@ -293,6 +293,7 @@ gpio_spi_txrx(struct gpio_spi_softc *sc, gpio_delay(sc); GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, sc->sc_sclk, 1); + gpio_delay(sc); } else { /* If mode 0 or 3 */ @@ -312,6 +313,7 @@ gpio_spi_txrx(struct gpio_spi_softc *sc, gpio_delay(sc); GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, sc->sc_sclk, 0); + gpio_delay(sc); } } Modified: stable/11/sys/dev/spibus/spibus.c ============================================================================== --- stable/11/sys/dev/spibus/spibus.c Wed Mar 15 19:50:58 2017 (r315328) +++ stable/11/sys/dev/spibus/spibus.c Wed Mar 15 21:01:03 2017 (r315329) @@ -116,9 +116,8 @@ spibus_probe_nomatch(device_t bus, devic { struct spibus_ivar *devi = SPIBUS_IVAR(child); - device_printf(bus, ""); - printf(" at cs %d\n", devi->cs); - printf(" mode %d", devi->mode); + device_printf(bus, " at cs %d mode %d\n", devi->cs, + devi->mode); return; }