From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754225Ab0IVSJr (ORCPT ); Wed, 22 Sep 2010 14:09:47 -0400 Received: from LUNGE.MIT.EDU ([18.54.1.69]:59312 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701Ab0IVSJq (ORCPT ); Wed, 22 Sep 2010 14:09:46 -0400 Date: Wed, 22 Sep 2010 11:28:27 -0700 From: Andres Salomon To: Daniel Drake Cc: tglx@linutronix.de, x86@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] OLPC: extended board revision detection Message-ID: <20100922112827.61d62e41@debxo> In-Reply-To: <20100922164307.8D7F09D401B@zog.reactivated.net> References: <20100922164307.8D7F09D401B@zog.reactivated.net> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 22 Sep 2010 17:43:07 +0100 (BST) Daniel Drake wrote: > Add some functions to easily detect which version of the laptop we are > running on, and document the board IDs which are accepted by > olpc_board(). > > Signed-off-by: Daniel Drake > --- > arch/x86/include/asm/olpc.h | 37 > +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 > insertions(+), 0 deletions(-) > > diff --git a/arch/x86/include/asm/olpc.h b/arch/x86/include/asm/olpc.h > index 101229b..9f3219b 100644 > --- a/arch/x86/include/asm/olpc.h > +++ b/arch/x86/include/asm/olpc.h > @@ -23,6 +23,21 @@ extern struct olpc_platform_t olpc_platform_info; > * and the minor build number withing 0x000f. Pre-builds have a > minor > * number less than 8, and normal builds start at 8. For example, > 0x0B10 > * is a PreB1, and 0x0C18 is a C1. > + * > + * History of board IDs that you can pass into this function: > + * 0xb1 - XO-1 B1 > + * 0xb2 - XO-1 B2 > + * 0xb3 - XO-1 B3 > + * 0xc1 - XO-1 C1 > + * 0xc2 - XO-1 C2 > + * 0xd0 - XO-1.5 A0 and A1 test > + * 0xd1 - XO-1.5 B1 and B2 test > + * 0xd2 - XO-1.5 B3 test > + * 0xd3 - XO-1.5 C1 initial factory build (12/2009) > + * 0xd4 - XO-1.5 C2 ramp build (02/2010) > + * 0xd3 - XO-1.5 mass production > + * 0xd4 - XO-1.5 > + * 0xd5 - XO-1.5 > */ > > static inline uint32_t olpc_board(uint8_t id) > @@ -40,6 +55,18 @@ static inline int machine_is_olpc(void) > return (olpc_platform_info.flags & OLPC_F_PRESENT) ? 1 : 0; > } > > +static inline int machine_is_olpc_xo_1(void) > +{ > + return machine_is_olpc() && > + olpc_platform_info.boardrev < olpc_board_pre(0xd0); > +} > + > +static inline int machine_is_olpc_xo_1_5(void) > +{ > + return machine_is_olpc() && > + olpc_platform_info.boardrev >= olpc_board_pre(0xd0); > +} > + These should be returning bools (ditto for the rest of the patches in this series). Otherwise, this looks fine to me.