Date: | 2011-07-06 21:50:36 (12 years 8 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | 7a7da98f755be058951bea165fcf6c83a5b2537e |
Message: | Revert "ieee802154/at86rf230: Be more verbose and disable irq
handling for now" This reverts commit 88bf9af396b0ad297328394c29d6ab5ea04e5aac. We now support interrupts. Revert the driver to its formers self. |
Files: |
drivers/ieee802154/at86rf230.c (5 diffs) |
Change Details
drivers/ieee802154/at86rf230.c | ||
---|---|---|
74 | 74 | |
75 | 75 | buf[0] = (addr & CMD_REG_MASK) | CMD_REG | CMD_WRITE; |
76 | 76 | buf[1] = data; |
77 | dev_info(&lp->spi->dev, "write buf[0] = %02x\n", buf[0]); | |
78 | dev_info(&lp->spi->dev, "write buf[1] = %02x\n", buf[1]); | |
77 | dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]); | |
78 | dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]); | |
79 | 79 | spi_message_init(&msg); |
80 | 80 | spi_message_add_tail(&xfer, &msg); |
81 | 81 | |
82 | 82 | status = spi_sync(lp->spi, &msg); |
83 | dev_info(&lp->spi->dev, "write status = %d\n", status); | |
83 | dev_vdbg(&lp->spi->dev, "status = %d\n", status); | |
84 | 84 | if (msg.status) |
85 | 85 | status = msg.status; |
86 | dev_info(&lp->spi->dev, "write status = %d\n", status); | |
87 | dev_info(&lp->spi->dev, "write buf[0] = %02x\n", buf[0]); | |
88 | dev_info(&lp->spi->dev, "write buf[1] = %02x\n", buf[1]); | |
86 | dev_vdbg(&lp->spi->dev, "status = %d\n", status); | |
87 | dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]); | |
88 | dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]); | |
89 | 89 | |
90 | 90 | return status; |
91 | 91 | } |
... | ... | |
105 | 105 | |
106 | 106 | buf[0] = (addr & CMD_REG_MASK) | CMD_REG; |
107 | 107 | buf[1] = 0xff; |
108 | dev_info(&lp->spi->dev, "buf[0] = 0x%02x\n", buf[0]); | |
108 | dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]); | |
109 | 109 | spi_message_init(&msg); |
110 | 110 | spi_message_add_tail(&xfer, &msg); |
111 | 111 | |
112 | 112 | status = spi_sync(lp->spi, &msg); |
113 | dev_info(&lp->spi->dev, "status = %d\n", status); | |
113 | dev_vdbg(&lp->spi->dev, "status = %d\n", status); | |
114 | 114 | if (msg.status) |
115 | 115 | status = msg.status; |
116 | dev_info(&lp->spi->dev, "status = %d\n", status); | |
117 | dev_info(&lp->spi->dev, "buf[0] = 0x%02x\n", buf[0]); | |
118 | dev_info(&lp->spi->dev, "buf[1] = 0x%02x\n", buf[1]); | |
116 | dev_vdbg(&lp->spi->dev, "status = %d\n", status); | |
117 | dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]); | |
118 | dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]); | |
119 | 119 | |
120 | 120 | if (status == 0) |
121 | 121 | *data = buf[1]; |
... | ... | |
784 | 784 | rc = at86rf230_hw_init(lp); |
785 | 785 | if (rc) |
786 | 786 | goto err_gpio_dir; |
787 | #if 0 | |
787 | ||
788 | 788 | rc = request_irq(spi->irq, at86rf230_isr, IRQF_SHARED, |
789 | 789 | dev_name(&spi->dev), lp); |
790 | 790 | if (rc) |
791 | 791 | goto err_gpio_dir; |
792 | #endif | |
792 | ||
793 | 793 | dev_dbg(&spi->dev, "registered at86rf230\n"); |
794 | 794 | |
795 | 795 | rc = ieee802154_register_device(lp->dev); |
... | ... | |
799 | 799 | return rc; |
800 | 800 | |
801 | 801 | err_irq: |
802 | // disable_irq(spi->irq); | |
803 | // flush_work(&lp->irqwork); | |
804 | // free_irq(spi->irq, lp); | |
802 | disable_irq(spi->irq); | |
803 | flush_work(&lp->irqwork); | |
804 | free_irq(spi->irq, lp); | |
805 | 805 | err_gpio_dir: |
806 | 806 | if (gpio_is_valid(lp->slp_tr)) |
807 | 807 | gpio_free(lp->slp_tr); |
... | ... | |
825 | 825 | * disable_irq ? -- wa |
826 | 826 | */ |
827 | 827 | ieee802154_unregister_device(lp->dev); |
828 | #if 0 | |
828 | ||
829 | 829 | disable_irq(spi->irq); |
830 | 830 | flush_work(&lp->irqwork); |
831 | 831 | free_irq(spi->irq, lp); |
832 | #endif | |
832 | ||
833 | 833 | if (gpio_is_valid(lp->slp_tr)) |
834 | 834 | gpio_free(lp->slp_tr); |
835 | 835 | if (gpio_is_valid(lp->rstn)) |
836 | 836 | gpio_free(lp->rstn); |
837 | 837 | |
838 | //if (spi) | |
839 | 838 | spi_set_drvdata(spi, NULL); |
840 | 839 | mutex_destroy(&lp->bmux); |
841 | 840 | ieee802154_free_device(lp->dev); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9