gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

move hardware revision to core code

Browse Source 
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2015-12-07 16:50:45 +01:00
parent 2d6e905554
commit 42b808b06c
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76.h
+7
View File
@@ -101,6 +101,7 @@ struct mt76_dev {
const struct mt76_queue_ops *queue_ops;
u32 rev;
unsigned long state;
};
@@ -132,6 +133,12 @@ bool __mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs);
static inline u16 mt76_rev(struct mt76_dev *dev)
{
return dev->rev & 0xffff;
}
#define mt76xx_rev(dev) mt76_rev(&((dev)->mt76))
#define mt76_queue_alloc(dev, ...) (dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)
#define mt76_queue_add_buf(dev, ...) (dev)->mt76.queue_ops->add_buf(&((dev)->mt76), __VA_ARGS__)
mt7603.h
-1
View File
@@ -44,7 +44,6 @@ struct mt7603_mcu {
struct mt7603_dev {
struct mt76_dev mt76;
u32 rev;
u32 irqmask;
spinlock_t irq_lock;
mt7603_pci.c
+3 -3
View File
@@ -50,9 +50,9 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, dev);
dev->rev = (mt76_rr(dev, MT_HW_CHIPID) << 16) |
(mt76_rr(dev, MT_HW_REV) & 0xff);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %04x\n", dev->rev);
dev->mt76.rev = (mt76_rr(dev, MT_HW_CHIPID) << 16) |
(mt76_rr(dev, MT_HW_REV) & 0xff);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %04x\n", dev->mt76.rev);
ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt7603_irq_handler,
IRQF_SHARED, KBUILD_MODNAME, dev);
mt76x2.h
-5
View File
@@ -214,11 +214,6 @@ static inline bool is_mt7612(struct mt76x2_dev *dev)
return (dev->rev >> 16) == 0x7612;
}
static inline u16 mt76xx_rev(struct mt76x2_dev *dev)
{
return dev->rev & 0xffff;
}
void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set);
static inline void mt76x2_irq_enable(struct mt76x2_dev *dev, u32 mask)
mt76x2_pci.c
+2 -2
View File
@@ -51,8 +51,8 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, dev);
dev->rev = mt76_rr(dev, MT_ASIC_VERSION);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %08x\n", dev->rev);
dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
dev_printk(KERN_INFO, dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x2_irq_handler,
IRQF_SHARED, KBUILD_MODNAME, dev);