Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1455727 > unrolled thread

[PATCH v2 4/7] MIPS: BMIPS: Add BCM3368 support

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 4/7] MIPS: BMIPS: Add BCM3368 support Álvaro Fernández Rojas   <noltari@gmail.com> - 2016-08-03 12:20 +0200
    Re: [PATCH v2 4/7] MIPS: BMIPS: Add BCM3368 support Rob Herring <robh@kernel.org> - 2016-08-04 19:50 +0200

#1455727 — [PATCH v2 4/7] MIPS: BMIPS: Add BCM3368 support

BCM3368 has a shared TLB which conflicts with current SMP support, so it must
be disabled for now.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
 arch/mips/bmips/setup.c                             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index 4a7e030..65bc572 100644
--- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -2,7 +2,7 @@
 
 Required properties:
 
-- compatible: "brcm,bcm3384", "brcm,bcm33843"
+- compatible: "brcm,bcm3368", "brcm,bcm3384", "brcm,bcm33843"
               "brcm,bcm3384-viper", "brcm,bcm33843-viper"
               "brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6368",
               "brcm,bcm63168", "brcm,bcm63268",
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index f146d12..4fbd2f1 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -98,7 +98,7 @@ static void bcm6328_quirks(void)
 static void bcm6358_quirks(void)
 {
 	/*
-	 * BCM6358 needs special handling for its shared TLB, so
+	 * BCM3368/BCM6358 need special handling for their shared TLB, so
 	 * disable SMP for now
 	 */
 	bmips_smp_enabled = 0;
@@ -110,6 +110,7 @@ static void bcm6368_quirks(void)
 }
 
 static const struct bmips_quirk bmips_quirk_list[] = {
+	{ "brcm,bcm3368",		&bcm6358_quirks			},
 	{ "brcm,bcm3384-viper",		&bcm3384_viper_quirks		},
 	{ "brcm,bcm33843-viper",	&bcm3384_viper_quirks		},
 	{ "brcm,bcm6328",		&bcm6328_quirks			},
-- 
2.1.4

[toc] | [next] | [standalone]

#1456610

On Wed, Aug 03, 2016 at 11:58:27AM +0200, Álvaro Fernández Rojas wrote:
> BCM3368 has a shared TLB which conflicts with current SMP support, so it must
> be disabled for now.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
>  arch/mips/bmips/setup.c                             | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
> index 4a7e030..65bc572 100644
> --- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
> +++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
> @@ -2,7 +2,7 @@
>  
>  Required properties:
>  
> -- compatible: "brcm,bcm3384", "brcm,bcm33843"
> +- compatible: "brcm,bcm3368", "brcm,bcm3384", "brcm,bcm33843"

No need to respin just for this, but please make this one valid 
combination per line if you respin the series.

Acked-by: Rob Herring <robh@kernel.org>

>                "brcm,bcm3384-viper", "brcm,bcm33843-viper"
>                "brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6368",
>                "brcm,bcm63168", "brcm,bcm63268",

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web