diff options
| author | Stefan Schmidt <stefan@osg.samsung.com> | 2018-02-12 14:44:07 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@osg.samsung.com> | 2018-02-15 14:47:45 +0100 |
| commit | b2cbd38f5e3b084206f2923e42f864fe8809e160 (patch) | |
| tree | 7c7fc94069b76e20621cfc5a1d3401ca7ab821bc | |
| parent | 6f6ba6eacae65ec2599c6bfd709bfff07344fb2b (diff) | |
| download | linux-mcp2210-b2cbd38f5e3b084206f2923e42f864fe8809e160.tar.gz | |
WIP
| -rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 10 | ||||
| -rw-r--r-- | drivers/spi/mcp2210.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index cf4788d840bf1f..f2dbb2672aa5d1 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -1071,6 +1071,7 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec) { u32 irq_type; int ret; + printk("%s 1\n", __func__); /* Initialize the device. From datasheet section 3.2: Initialization. */ @@ -1134,6 +1135,7 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec) if (ret) goto err_ret; + printk("%s 2\n", __func__); udelay(192); /* Set RX Mode. RXMCR<1:0>: 0x0 normal, 0x1 promisc, 0x2 error */ @@ -1141,6 +1143,7 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec) if (ret) goto err_ret; + printk("%s 3\n", __func__); if (spi_get_device_id(devrec->spi)->driver_data == MRF24J40MC) { /* Enable external amplifier. * From MRF24J40MC datasheet section 1.3: Operation. @@ -1334,25 +1337,30 @@ static int mrf24j40_probe(struct spi_device *spi) goto err_register_device; } + dev_info(&spi->dev, "probe() 1\n"); ret = mrf24j40_hw_init(devrec); if (ret) goto err_register_device; + dev_info(&spi->dev, "probe() 2\n"); mrf24j40_phy_setup(devrec); + dev_info(&spi->dev, "probe() 3\n"); /* request IRQF_TRIGGER_LOW as fallback default */ irq_type = irq_get_trigger_type(spi->irq); if (!irq_type) irq_type = IRQF_TRIGGER_LOW; + dev_info(&spi->dev, "probe() 4\n"); ret = devm_request_irq(&spi->dev, spi->irq, mrf24j40_isr, irq_type, dev_name(&spi->dev), devrec); if (ret) { dev_err(printdev(devrec), "Unable to get IRQ"); goto err_register_device; } + dev_info(&spi->dev, "probe() 5\n"); - dev_dbg(printdev(devrec), "registered mrf24j40\n"); + dev_info(printdev(devrec), "registered mrf24j40\n"); ret = ieee802154_register_hw(devrec->hw); if (ret) goto err_register_device; diff --git a/drivers/spi/mcp2210.c b/drivers/spi/mcp2210.c index 2424f0ccfefc96..4152f8510f32d2 100644 --- a/drivers/spi/mcp2210.c +++ b/drivers/spi/mcp2210.c @@ -88,8 +88,8 @@ static int mcp2210_probe(struct usb_interface *intf, static struct spi_board_info board_info = { .modalias = "mrf24j40", .bus_num = 0, - .chip_select = 0, - .max_speed_hz = MCP2210_MAX_SPEED, + .chip_select = 1, + .max_speed_hz = 8000000, /* 8MHz */ .mode = SPI_MODE_3, }; |