From patchwork Thu Jul 22 16:30:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 483918 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp529086jao; Thu, 22 Jul 2021 09:46:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1kfsyL7gWJcjIWdlee8IRq/PSwaqjbmehzlPhBhQXCm41PpBgG8G7Y7XPzvDW8SAfCbe2 X-Received: by 2002:a05:6638:1383:: with SMTP id w3mr427398jad.32.1626972405418; Thu, 22 Jul 2021 09:46:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972405; cv=none; d=google.com; s=arc-20160816; b=yS706Hk+v+i0tPdTk3XWlO3tfpB5QkoeREdAke5OIoy3TzjO+ZrZ7l3XsNv/phbw8l jhyZT4JU8QyrhIPO4KEHEGfDtbLZQtaxbANjM9pPo/KDnbdBLxZHIdA+DKmbuDW3kpec qUhy8+mbTf3oVKb8qT/DtV1OJOKPAwO96mJRJNAmMfGytONEfXo1dwAzzkUp6Tix7sG3 DJR67skEw7UsYi1d9xCFOGIzMkDbn6r0ZOjyX5gdG5hqx09xJQTl+MNlJm/0C+usJnUr KQrEZNQtMulvIgyX/BWG6hOzHg15s0zXvGKvyyZhuk4XyZP8gjCyL3oNYQO1XnNmTP6R jr3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pHAzKm4QEPmKySSUjNfPWs9vpb6uJiyfwj2E8todiE8=; b=uo/3huKDRX0611i0T/NtHWECFAPA8qFKCBAtE/LR1oWrCbmbNUgHMoCtYNjV9O/XwU ymzED/r5WcYgco5cifqw87LmSpvn04Hv+BOwYdoND8KIy5P9JcSH/AjHdQ3zP9fMiEHP oiUUmLHtwZ0Qus2IW+62uEEXRFWeeDspiPJoFRNtwrqr29YPgA8r76fk9SVDslbmGDwS WAYv3Bgbkl5Dk20FaW1YV4Alfz7XceHQ25wIqgFn9QAgBZFKwi0BW7sED5+QRbq5Rk6H /Ou1PsJexXdUUv1pc2LLz/waTLrN3xiWiI+ZXf8vtWVzVHINcoheVINUZQFrBvFsmx2o 4fKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DTIDK8bY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i16si18190809jam.109.2021.07.22.09.46.45; Thu, 22 Jul 2021 09:46:45 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DTIDK8bY; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233541AbhGVQEC (ORCPT + 12 others); Thu, 22 Jul 2021 12:04:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:39778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233882AbhGVQDK (ORCPT ); Thu, 22 Jul 2021 12:03:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF1F961949; Thu, 22 Jul 2021 16:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972224; bh=0X5IJGP0GNDxqqdex+rJkuRy55+bI/TK04lUuNMUfcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTIDK8bY/xjHzf8w/+eKLxRSEQDe2hvXLjOa14kvvSdTLH2PjOYtzvudYkeEW5MsA 0QMhxoCmP8U/KcH10/cPtS2ornVVP7gFkw1vUGxmr5MrtG1mW15+lAg5gbVHkFBGYR uAiMjES0EpmC7W48vNaah6C0uqOYQ3VUvhHkB3b0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 5.13 031/156] ARM: dts: ux500: Fix some compatible strings Date: Thu, 22 Jul 2021 18:30:06 +0200 Message-Id: <20210722155629.417258396@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 59ba546d1662c4beb738725965041f350afe24b4 ] The Golden and Skomer phones have BCM4334 WLAN+BT chips, so make the compatible strings reflect the new available bindings for these. Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 3 ++- arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 4 ++-- arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts index 0d43ee6583cf..40df7c61bf69 100644 --- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts +++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts @@ -121,7 +121,7 @@ #size-cells = <0>; wifi@1 { - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 (WLAN_HOST_WAKE) */ @@ -162,6 +162,7 @@ pinctrl-1 = <&u0_a_1_sleep>; bluetooth { + /* BCM4334B0 actually */ compatible = "brcm,bcm4330-bt"; /* GPIO222 (BT_VREG_ON) */ shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts index f24369873ce2..eaf8039d10ad 100644 --- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts +++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts @@ -401,8 +401,7 @@ status = "okay"; wifi@1 { - /* Actually BRCM4330 */ - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 WL_HOST_WAKE */ interrupt-parent = <&gpio6>; @@ -436,6 +435,7 @@ status = "okay"; bluetooth { + /* BCM4330B1 actually */ compatible = "brcm,bcm4330-bt"; /* GPIO222 rail BT_VREG_EN to BT_REG_ON */ shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts index d28a00757d0b..94afd7a0fe1f 100644 --- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts +++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts @@ -211,7 +211,7 @@ #size-cells = <0>; wifi@1 { - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 WL_HOST_WAKE */ interrupt-parent = <&gpio6>; @@ -247,6 +247,7 @@ /* FIXME: not quite working yet, probably needs regulators */ bluetooth { + /* BCM4334B0 actually */ compatible = "brcm,bcm4330-bt"; shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;