svn commit: r315329 - in stable/11/sys/dev: gpio spibus

[Michael Zhilin]

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 <yamori813 at yahoo.co.jp>
  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 <yamori83 at yahoo.co.jp>
  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, "<unknown card>");
-	printf(" at cs %d\n", devi->cs);
-	printf(" mode %d", devi->mode);
+	device_printf(bus, "<unknown card> at cs %d mode %d\n", devi->cs,
+	    devi->mode);
 	return;
 }