From patchwork Thu Jan 30 18:39:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232334 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16011C2D0DB for ; Thu, 30 Jan 2020 18:50:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3EF2205F4 for ; Thu, 30 Jan 2020 18:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410244; bh=yi3SPWfrdUc2hmBaEB9c9QudFRVizN2qqqi3ustrzIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ALxgxTjD2gK6Isa1e/SyNYsnlb/Gu+trTB95qlflB50cH+FN1FetZcrwfnGRYRi6V pKjXHVi13Pga1lcuq9uyakL9r7P2jtsmQxlNfrY8b2PinmSNUPzuqt2V8Yds6CoN39 7CVNDzDJfAuFIflbzPbNouB73KauslghP+7qsnTw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727675AbgA3Sun (ORCPT ); Thu, 30 Jan 2020 13:50:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:56560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731195AbgA3Sqb (ORCPT ); Thu, 30 Jan 2020 13:46:31 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75487205F4; Thu, 30 Jan 2020 18:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409990; bh=yi3SPWfrdUc2hmBaEB9c9QudFRVizN2qqqi3ustrzIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ABEW0aSmWe5nUFZHXvKpsxsaTyGHvR3w4iiFY5Os2Rtp9FboOLBZMitg2hJN1A4FX 89KNRqQIeHVb1QILXTPXtjtnKe1dhnjzhUsOc87ouW6WsoWUis1u5s+SHbNHnCCIGk p7p473AeuaJdIYjjNYCYGSBWK31CY8dEUI+A77Wg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andre Heider , Marcel Holtmann , Sasha Levin Subject: [PATCH 5.4 098/110] Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk Date: Thu, 30 Jan 2020 19:39:14 +0100 Message-Id: <20200130183625.427607453@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andre Heider [ Upstream commit a4f95f31a9f38d9bb1fd313fcc2d0c0d48116ee3 ] Some devices ship with the controller default address, like the Orange Pi 3 (BCM4345C5). Allow the bootloader to set a valid address through the device tree. Signed-off-by: Andre Heider Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/btbcm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 2d2e6d8620681..f02a4bdc0ca75 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -440,6 +440,12 @@ int btbcm_finalize(struct hci_dev *hdev) set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); + /* Some devices ship with the controller default address. + * Allow the bootloader to set a valid address through the + * device tree. + */ + set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); + return 0; } EXPORT_SYMBOL_GPL(btbcm_finalize);