[PATCH 3/3] Update Nook Color machine 3284 to common Encore name.

[PATCH 3/3] Update Nook Color machine 3284 to common Encore name.

[Tony Lindgren]

* green at linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]:
> From: Oleg Drokin <green@linuxhacker.ru>
> 
> Machine database already updated:
> http://www.arm.linux.org.uk/developer/machines/list.php?id=3284
> 
> Signed-off-by: Oleg Drokin <green@linuxhacker.ru>

Russell, do have some immutable branch containing the mach-types changes
that I could pull for my devel-board branch for this?

If you want me to apply this one along with the related board-*.c
changes please ack.

Regards,

Tony



> ---
>  arch/arm/tools/mach-types |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> index 3b3776d..fff68d0 100644
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -910,7 +910,7 @@ omapl138_case_a3	MACH_OMAPL138_CASE_A3	OMAPL138_CASE_A3	3280
>  uemd			MACH_UEMD		UEMD			3281
>  ccwmx51mut		MACH_CCWMX51MUT		CCWMX51MUT		3282
>  rockhopper		MACH_ROCKHOPPER		ROCKHOPPER		3283
> -nookcolor		MACH_NOOKCOLOR		NOOKCOLOR		3284
> +encore			MACH_ENCORE		ENCORE			3284
>  hkdkc100		MACH_HKDKC100		HKDKC100		3285
>  ts42xx			MACH_TS42XX		TS42XX			3286
>  aebl			MACH_AEBL		AEBL			3287
> -- 
> 1.7.4.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/3] Update Nook Color machine 3284 to common Encore name.

[Russell King - ARM Linux]

On Thu, Jun 30, 2011 at 06:35:38AM -0700, Tony Lindgren wrote:
> * green at linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]:
> > From: Oleg Drokin <green@linuxhacker.ru>
> > 
> > Machine database already updated:
> > http://www.arm.linux.org.uk/developer/machines/list.php?id=3284
> > 
> > Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> 
> Russell, do have some immutable branch containing the mach-types changes
> that I could pull for my devel-board branch for this?
> 
> If you want me to apply this one along with the related board-*.c
> changes please ack.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

[PATCH 2/3] Add tps65921 chip

[Tony Lindgren]

Samuel,

* green at linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]:
> From: Oleg Drokin <green@linuxhacker.ru>
> 
> Very similar to TPS65920
> List of differences: http://www.ti.com/litv/pdf/swcu066b
> 
> CC: sameo at linux.intel.com
> Signed-off-by: Oleg Drokin <green@linuxhacker.ru>

Looks like this one can be merged independently of the rest of the
Nook patches via your mfd tree. Care to queue this?

Regards,

Tony


> ---
>  drivers/mfd/twl-core.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index b8f2a4e..756f3eb 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -1284,6 +1284,8 @@ static const struct i2c_device_id twl_ids[] = {
>  	{ "tps65950", 0 },		/* catalog version of twl5030 */
>  	{ "tps65930", TPS_SUBSET },	/* fewer LDOs and DACs; no charger */
>  	{ "tps65920", TPS_SUBSET },	/* fewer LDOs; no codec or charger */
> +	{ "tps65921", TPS_SUBSET },	/* fewer LDOs; no codec, no LED
> +					   and vibrator. Charger in USB module*/
>  	{ "twl6030", TWL6030_CLASS },	/* "Phoenix power chip" */
>  	{ "twl6025", TWL6030_CLASS | TWL6025_SUBCLASS }, /* "Phoenix lite" */
>  	{ /* end of list */ },
> -- 
> 1.7.4.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] Add tps65921 chip

[Samuel Ortiz]

Hi Tony,

On Fri, Jul 01, 2011 at 12:35:58AM -0700, Tony Lindgren wrote:
> Samuel,
> 
> * green at linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]:
> > From: Oleg Drokin <green@linuxhacker.ru>
> > 
> > Very similar to TPS65920
> > List of differences: http://www.ti.com/litv/pdf/swcu066b
> > 
> > CC: sameo at linux.intel.com
> > Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> 
> Looks like this one can be merged independently of the rest of the
> Nook patches via your mfd tree. Care to queue this?
I asked Oleg to rebase this patch against my for-next branch as it was not
applying cleanly. But I never got the fixed patch.
I fixed it up now, and it's applied.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[PATCH 2/3] Add tps65921 chip

[Tony Lindgren]

* Samuel Ortiz <sameo@linux.intel.com> [110701 04:32]:
> Hi Tony,
> 
> On Fri, Jul 01, 2011 at 12:35:58AM -0700, Tony Lindgren wrote:
> > Samuel,
> > 
> > * green at linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]:
> > > From: Oleg Drokin <green@linuxhacker.ru>
> > > 
> > > Very similar to TPS65920
> > > List of differences: http://www.ti.com/litv/pdf/swcu066b
> > > 
> > > CC: sameo at linux.intel.com
> > > Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
> > 
> > Looks like this one can be merged independently of the rest of the
> > Nook patches via your mfd tree. Care to queue this?
> I asked Oleg to rebase this patch against my for-next branch as it was not
> applying cleanly. But I never got the fixed patch.
> I fixed it up now, and it's applied.

OK thanks!

Tony

Initial B&N Nook Color support, take four

[green at linuxhacker.ru]

Hello!

  Next attempt at B&N Nook Color board file submission.
  USB peripheral mode is fully operational as is serial console and
  MMC/SDCard.

  Changes
  since v3:
  Separated mach-types change into a separate patch (already got RMK approval)
  Dramatically cut number of includes in the board file again.
  No longer set voltage regulator dev, just device name in the supply.
  Style fixes
  Serial in uncompress.h sorted by name
  Corrected MUX package to CBP in board file.
  omap_i2c_init now has no return since it's unused anyway.
  Fixed keypad definition.

  since v2:
  rebased on devel-cleanup branch

  since v1:
  Threw away all the android stuff as suggested 
  Cleaned up voltage regulators and removed the ones our twl chip actually
    does not have
  Changed the split of the patches to board file + twl update

Bye,
   Oleg

[PATCH 3/3] Update Nook Color machine 3284 to common Encore name.

[green at linuxhacker.ru]

From: Oleg Drokin <green@linuxhacker.ru>

Nachine database already updated:
http://www.arm.linux.org.uk/developer/machines/list.php?id=3284

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
 arch/arm/tools/mach-types |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 7ca41f0..2f0db3e 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -962,7 +962,7 @@ omapl138_case_a3	MACH_OMAPL138_CASE_A3	OMAPL138_CASE_A3	3280
 uemd			MACH_UEMD		UEMD			3281
 ccwmx51mut		MACH_CCWMX51MUT		CCWMX51MUT		3282
 rockhopper		MACH_ROCKHOPPER		ROCKHOPPER		3283
-nookcolor		MACH_NOOKCOLOR		NOOKCOLOR		3284
+encore			MACH_ENCORE		ENCORE			3284
 hkdkc100		MACH_HKDKC100		HKDKC100		3285
 ts42xx			MACH_TS42XX		TS42XX			3286
 aebl			MACH_AEBL		AEBL			3287
-- 
1.7.4.4