From 42b808b06c1ee21305dcde4bbd5c2025a2c0a605 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 7 Dec 2015 16:50:45 +0100
Subject: [PATCH] move hardware revision to core code

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 mt76.h       | 7 +++++++
 mt7603.h     | 1 -
 mt7603_pci.c | 6 +++---
 mt76x2.h     | 5 -----
 mt76x2_pci.c | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mt76.h b/mt76.h
index 8f7fb2b8..99b0cf08 100644
--- a/mt76.h
+++ b/mt76.h
@@ -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__)
diff --git a/mt7603.h b/mt7603.h
index f2f384de..7c4beb90 100644
--- a/mt7603.h
+++ b/mt7603.h
@@ -44,7 +44,6 @@ struct mt7603_mcu {
 
 struct mt7603_dev {
 	struct mt76_dev mt76;
-	u32 rev;
 
 	u32 irqmask;
 	spinlock_t irq_lock;
diff --git a/mt7603_pci.c b/mt7603_pci.c
index a6813479..dc8a718b 100644
--- a/mt7603_pci.c
+++ b/mt7603_pci.c
@@ -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);
diff --git a/mt76x2.h b/mt76x2.h
index 72f6d297..69cec127 100644
--- a/mt76x2.h
+++ b/mt76x2.h
@@ -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)
diff --git a/mt76x2_pci.c b/mt76x2_pci.c
index ba8effa4..ab19e726 100644
--- a/mt76x2_pci.c
+++ b/mt76x2_pci.c
@@ -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);