From:   Ganapathi Bhat <gbhat@marvell.com>
To:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
CC:     Cathy Luo <cluo@marvell.com>, Zhiyuan Yang <yangzy@marvell.com>,
        James Cao <jcao@marvell.com>,
        Rakesh Parmar <rakeshp@marvell.com>,
        Rahul Tank <rahult@marvell.com>
Subject: [PATCH] bluetooth: btmrvl_sdio: add support for sd8977 chipset
Thread-Topic: [PATCH] bluetooth: btmrvl_sdio: add support for sd8977 chipset
Thread-Index: AdSoLIisF52s4F6bS8yE2vNp34CzNA==
Date:   Wed, 9 Jan 2019 15:03:57 +0000
Message-ID: <CY4PR18MB1237FAFE56DFCADE0DB09FC1A08B0@CY4PR18MB1237.namprd18.prod.outlook.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: marvell.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: f2cf3ceb-b579-4c5f-5165-08d67643ae08
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2019 15:03:57.3233
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR18MB1061
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-09_07:,,
 signatures=0
X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501
 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0
 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0
 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.0.1-1810050000 definitions=main-1901090125
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

From 6591fb4e6bbac53a9b3b852a2a4160c8de315d97 Mon Sep 17 00:00:00 2001
From: Hemantkumar Suthar <shemant@marvell.com>

This patch adds support for 8977 chipset to mwifiex with SDIO
interface. Register offsets and supported feature flags are
updated. Firmware image used will be mrvl/sd8977_uapsta.bin.

Signed-off-by: Hemantkumar Suthar <shemant@marvell.com>
Signed-off-by: Rakesh Parmar <rakeshp@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
---
 drivers/bluetooth/Kconfig       |  4 ++--
 drivers/bluetooth/btmrvl_sdio.c | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 845b031..7b2e76e 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -336,7 +336,7 @@ config BT_MRVL
 	  The core driver to support Marvell Bluetooth devices.
=20
 	  This driver is required if you want to support
-	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8997.
+	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8977/8997.
=20
 	  Say Y here to compile Marvell Bluetooth driver
 	  into the kernel or say M to compile it as module.
@@ -350,7 +350,7 @@ config BT_MRVL_SDIO
 	  The driver for Marvell Bluetooth chipsets with SDIO interface.
=20
 	  This driver is required if you want to use Marvell Bluetooth
-	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD88=
97/SD8997
+	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD88=
97/SD8977/SD8997
 	  chipsets are supported.
=20
 	  Say Y here to compile support for Marvell BT-over-SDIO driver
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdi=
o.c
index fb3d039..b2712a5 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -211,6 +211,29 @@ static int btmrvl_sdio_probe_of(struct device *dev,
 	.fw_dump_end =3D 0xea,
 };
=20
+static const struct btmrvl_sdio_card_reg btmrvl_reg_8977 =3D {
+	.cfg =3D 0x00,
+	.host_int_mask =3D 0x08,
+	.host_intstatus =3D 0x0c,
+	.card_status =3D 0x5c,
+	.sq_read_base_addr_a0 =3D 0xf8,
+	.sq_read_base_addr_a1 =3D 0xf9,
+	.card_revision =3D 0xc8,
+	.card_fw_status0 =3D 0xe8,
+	.card_fw_status1 =3D 0xe9,
+	.card_rx_len =3D 0xea,
+	.card_rx_unit =3D 0xeb,
+	.io_port_0 =3D 0xe4,
+	.io_port_1 =3D 0xe5,
+	.io_port_2 =3D 0xe6,
+	.int_read_to_clear =3D true,
+	.host_int_rsr =3D 0x04,
+	.card_misc_cfg =3D 0xD8,
+	.fw_dump_ctrl =3D 0xf0,
+	.fw_dump_start =3D 0xf1,
+	.fw_dump_end =3D 0xf8,
+};
+
 static const struct btmrvl_sdio_card_reg btmrvl_reg_8997 =3D {
 	.cfg =3D 0x00,
 	.host_int_mask =3D 0x08,
@@ -279,6 +302,15 @@ static int btmrvl_sdio_probe_of(struct device *dev,
 	.supports_fw_dump =3D true,
 };
=20
+static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 =3D {
+	.helper         =3D NULL,
+	.firmware       =3D "mrvl/sd8977_uapsta.bin",
+	.reg            =3D &btmrvl_reg_8977,
+	.support_pscan_win_report =3D true,
+	.sd_blksz_fw_dl =3D 256,
+	.supports_fw_dump =3D true,
+};
+
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 =3D {
 	.helper         =3D NULL,
 	.firmware       =3D "mrvl/sd8997_uapsta.bin",
@@ -307,6 +339,9 @@ static int btmrvl_sdio_probe_of(struct device *dev,
 	/* Marvell SD8897 Bluetooth device */
 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),
 			.driver_data =3D (unsigned long)&btmrvl_sdio_sd8897 },
+	/* Marvell SD8977 Bluetooth device */
+	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),
+			.driver_data =3D (unsigned long)&btmrvl_sdio_sd8977 },
 	/* Marvell SD8997 Bluetooth device */
 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),
 			.driver_data =3D (unsigned long)&btmrvl_sdio_sd8997 },
@@ -1760,4 +1795,5 @@ static void __exit btmrvl_sdio_exit_module(void)
 MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");
+MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin");
 MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin");
--=20
1.9.1