lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 033/108] ARM: dts: ux500: Fix some compatible strings
    Date
    From: Linus Walleij <linus.walleij@linaro.org>

    [ 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 <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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(-)

    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 @@ mmc@80118000 {
    #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 @@ uart@80120000 {
    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 @@ mmc@80118000 {
    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 @@ uart@80120000 {
    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 @@ mmc@80118000 {
    #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 @@ uart@80120000 {

    /* 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>;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 21:39    [W:2.335 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site