Przeglądaj źródła

mrf24j40: remove spi settings overwrite

This patch removes spi settings while mrf24j40 probing. These settings
cannot be overwrite while device probing where spi controller should be
already configured. These settings need to be setup by device tree or
platform data.

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Alexander Aring 10 lat temu
rodzic
commit
78aedb6bfa
1 zmienionych plików z 5 dodań i 3 usunięć
  1. 5 3
      drivers/net/ieee802154/mrf24j40.c

+ 5 - 3
drivers/net/ieee802154/mrf24j40.c

@@ -746,9 +746,11 @@ static int mrf24j40_probe(struct spi_device *spi)
 	if (!devrec->buf)
 	if (!devrec->buf)
 		goto err_register_device;
 		goto err_register_device;
 
 
-	spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
-	if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
-		spi->max_speed_hz = MAX_SPI_SPEED_HZ;
+	if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) {
+		dev_warn(&spi->dev, "spi clock above possible maximum: %d",
+			 MAX_SPI_SPEED_HZ);
+		return -EINVAL;
+	}
 
 
 	mutex_init(&devrec->buffer_mutex);
 	mutex_init(&devrec->buffer_mutex);
 	init_completion(&devrec->tx_complete);
 	init_completion(&devrec->tx_complete);