Ver Fonte

atusb: add handling for different chipnames

This patch supports handling for printout different chipnames between
atusb and rzusb. The rzusb contains an at86rf230 and atusb an at86rf231
transceiver.

Cc: 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 há 10 anos atrás
pai
commit
9def9afde7
1 ficheiros alterados com 11 adições e 2 exclusões
  1. 11 2
      drivers/net/ieee802154/atusb.c

+ 11 - 2
drivers/net/ieee802154/atusb.c

@@ -559,6 +559,7 @@ static int atusb_get_and_show_chip(struct atusb *atusb)
 {
 {
 	struct usb_device *usb_dev = atusb->usb_dev;
 	struct usb_device *usb_dev = atusb->usb_dev;
 	uint8_t man_id_0, man_id_1, part_num, version_num;
 	uint8_t man_id_0, man_id_1, part_num, version_num;
+	const char *chip;
 
 
 	man_id_0 = atusb_read_reg(atusb, RG_MAN_ID_0);
 	man_id_0 = atusb_read_reg(atusb, RG_MAN_ID_0);
 	man_id_1 = atusb_read_reg(atusb, RG_MAN_ID_1);
 	man_id_1 = atusb_read_reg(atusb, RG_MAN_ID_1);
@@ -574,14 +575,22 @@ static int atusb_get_and_show_chip(struct atusb *atusb)
 			man_id_1, man_id_0);
 			man_id_1, man_id_0);
 		goto fail;
 		goto fail;
 	}
 	}
-	if (part_num != 3 && part_num != 2) {
+
+	switch (part_num) {
+	case 2:
+		chip = "AT86RF230";
+		break;
+	case 3:
+		chip = "AT86RF231";
+		break;
+	default:
 		dev_err(&usb_dev->dev,
 		dev_err(&usb_dev->dev,
 			"unexpected transceiver, part 0x%02x version 0x%02x\n",
 			"unexpected transceiver, part 0x%02x version 0x%02x\n",
 			part_num, version_num);
 			part_num, version_num);
 		goto fail;
 		goto fail;
 	}
 	}
 
 
-	dev_info(&usb_dev->dev, "ATUSB: AT86RF231 version %d\n", version_num);
+	dev_info(&usb_dev->dev, "ATUSB: %s version %d\n", chip, version_num);
 
 
 	return 0;
 	return 0;