Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/bluetooth/btcentauri.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ static int cen_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int ret;

if (!(of_machine_is_compatible("apple,j813") || of_machine_is_compatible("apple,j815") ||
of_machine_is_compatible("apple,j873g")) ||
of_machine_is_compatible("apple,j873g") || of_machine_is_compatible("apple,j804")) ||
PCI_FUNC(pdev->devfn) != 2)
return -ENODEV;
bt = devm_kzalloc(&pdev->dev, sizeof(*bt), GFP_KERNEL);
Expand Down
6 changes: 6 additions & 0 deletions drivers/net/wireless/apple/centauri/centauri.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ struct centauri {
* J873 (Mac mini M6): board 0x24, chip 0x8152 from its ADT, the composition taken from the J813
* word; port 0 config 0x388028000, lane 0x38f010000 and PERST# gpio0 pin 3 (0x31a000000 + 4 * 3)
* from its ADT; config +0x130 is 0x208 as in the m1n1 T8152 bring-up that links the port.
* J804 (MacBook Pro 14" M6): board 0x22, chip 0x8152 from its ADT /chosen; port 0 config,
* PHY lane and PERST# (pci-bridge0 function-perst = gpio0 pin 3) are J873's, and so are the
* port tweaks, the 27.x link TLV and the scan TLVs.
* keep_port_tables: the J813 sequence zeroes the 16 words at port+0x3000 and the 256 words at
* port+0x3800. On the J873 those are the RID2SID and MSIMAP tables that pcie-apple programmed
* (PORT_T602X_RID2SID, PORT_T602X_MSIMAP); the cycle then drops function 0's stream entry and
Expand Down Expand Up @@ -83,6 +86,9 @@ static inline const struct centauri_board *centauri_board(void)
{ "apple,j873g", "apple/centauri/j873-ftab.bin", 0x00248152,
0x388028000ULL, 0x38f010000ULL, 0x31a00000cULL, 0x208, 0, true,
386, true },
{ "apple,j804", "apple/centauri/j804-ftab.bin", 0x00228152,
0x388028000ULL, 0x38f010000ULL, 0x31a00000cULL, 0x208, 0, true,
386, true },
};
int i;

Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/apple/centauri/centauri_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,3 +310,4 @@ MODULE_DESCRIPTION("Apple N1 Centauri native PCI and ACIPC bring-up backend");
MODULE_FIRMWARE("apple/centauri/j813-ftab.bin");
MODULE_FIRMWARE("apple/centauri/j815-ftab.bin");
MODULE_FIRMWARE("apple/centauri/j873-ftab.bin");
MODULE_FIRMWARE("apple/centauri/j804-ftab.bin");
Loading