mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] fixup! tegra: add Tegra3 to relevant lowlevel functions
@ 2014-02-27  8:49 Lucas Stach
  2014-02-27  9:42 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2014-02-27  8:49 UTC (permalink / raw)
  To: barebox

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
This got messed up while applying. You may want to
squash this in while the original patch still sits
in -next.
---
 arch/arm/mach-tegra/include/mach/lowlevel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h
index 11d930b..cc346a0 100644
--- a/arch/arm/mach-tegra/include/mach/lowlevel.h
+++ b/arch/arm/mach-tegra/include/mach/lowlevel.h
@@ -78,6 +78,8 @@ enum tegra_chiptype tegra_get_chiptype(void)
 	switch ((hidrev & HIDREV_CHIPID_MASK) >> HIDREV_CHIPID_SHIFT) {
 	case 0x20:
 		return TEGRA20;
+	case 0x30:
+		return TEGRA30;
 	default:
 		return TEGRA_UNK_REV;
 	}
@@ -89,8 +91,6 @@ int tegra_get_num_cores(void)
 	switch (tegra_get_chiptype()) {
 	case TEGRA20:
 		return 2;
-	case 0x30:
-		return TEGRA30;
 	case TEGRA30:
 		return 4;
 	default:
-- 
1.8.5.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] fixup! tegra: add Tegra3 to relevant lowlevel functions
  2014-02-27  8:49 [PATCH] fixup! tegra: add Tegra3 to relevant lowlevel functions Lucas Stach
@ 2014-02-27  9:42 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2014-02-27  9:42 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Thu, Feb 27, 2014 at 09:49:46AM +0100, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <dev@lynxeye.de>
> ---
> This got messed up while applying. You may want to
> squash this in while the original patch still sits
> in -next.

Just did that.

Sascha

> ---
>  arch/arm/mach-tegra/include/mach/lowlevel.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h
> index 11d930b..cc346a0 100644
> --- a/arch/arm/mach-tegra/include/mach/lowlevel.h
> +++ b/arch/arm/mach-tegra/include/mach/lowlevel.h
> @@ -78,6 +78,8 @@ enum tegra_chiptype tegra_get_chiptype(void)
>  	switch ((hidrev & HIDREV_CHIPID_MASK) >> HIDREV_CHIPID_SHIFT) {
>  	case 0x20:
>  		return TEGRA20;
> +	case 0x30:
> +		return TEGRA30;
>  	default:
>  		return TEGRA_UNK_REV;
>  	}
> @@ -89,8 +91,6 @@ int tegra_get_num_cores(void)
>  	switch (tegra_get_chiptype()) {
>  	case TEGRA20:
>  		return 2;
> -	case 0x30:
> -		return TEGRA30;
>  	case TEGRA30:
>  		return 4;
>  	default:
> -- 
> 1.8.5.3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-27  9:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27  8:49 [PATCH] fixup! tegra: add Tegra3 to relevant lowlevel functions Lucas Stach
2014-02-27  9:42 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox