Initial B&N Nook Color support, take six

PATCH New [email protected] 4 participants 9 messages Jun 14, 2011 – Jul 11, 2011

Subsystems (4)

Arm (32-bit) Arm sub-architectures Multifunction devices (MFD) OMAP2+ support

lore

Share & tools

lore

[email protected]

author

2011-06-14 15:46 UTC #0 lore raw

Hello!

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

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

[email protected]

author

2011-06-14 15:46 UTC #1 lore raw

PATCH 1/3 Initial B&N Nook Color (encore) support.

From: Oleg Drokin <[email protected]>

Bare-bones board file, comes with serial console, gpio keys, MMC/SDCard and USB (peripheral) support.

Signed-off-by Oleg Drokin <[email protected]>

---
 arch/arm/mach-omap2/Kconfig                  |    5 +
 arch/arm/mach-omap2/Makefile                 |    2 +
 arch/arm/mach-omap2/board-omap3encore.c      |  348 ++++++++++++++++++++++++++
 arch/arm/plat-omap/include/plat/uncompress.h |    1 +
 4 files changed, 356 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-omap2/board-omap3encore.c

arch/arm/mach-omap2/Kconfig +5 -0

index 19d5891..b525308 100644
@@ -173,6 +173,11 @@ config MACH_OMAP3_TORPEDO
 	 for full description please see the products webpage at
 	 http://www.logicpd.com/products/development-kits/zoom-omap35x-torpedo-development-kit
 
+config MACH_ENCORE
+        bool "Barnes & Noble Encore (Nook Color)"
+        depends on ARCH_OMAP3
+        select OMAP_PACKAGE_CBP
+
 config MACH_OVERO
 	bool "Gumstix Overo board"
 	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile +2 -0

index b148077..8fe635c 100644
@@ -189,6 +189,8 @@ obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o \
 					   hsmmc.o
+obj-$(CONFIG_MACH_ENCORE)		+= board-omap3encore.o \
+					   hsmmc.o
 obj-$(CONFIG_MACH_OVERO)		+= board-overo.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o \

arch/arm/mach-omap2/board-omap3encore.c new file +348 -0

348 lines not on this page · raw message

arch/arm/plat-omap/include/plat/uncompress.h +1 -0

index ac4b60d..2d93126 100644
@@ -150,6 +150,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
 		DEBUG_LL_OMAP3(3, cm_t3517);
 		DEBUG_LL_OMAP3(3, craneboard);
 		DEBUG_LL_OMAP3(3, devkit8000);
+		DEBUG_LL_OMAP3(3, encore);
 		DEBUG_LL_OMAP3(3, igep0020);
 		DEBUG_LL_OMAP3(3, igep0030);
 		DEBUG_LL_OMAP3(3, nokia_rm680);

Signature · 1 line

1.7.4.4

[email protected]

author

2011-06-14 15:46 UTC #2 lore raw

PATCH 2/3 Add tps65921 chip

In reply to [email protected]

From: Oleg Drokin <[email protected]>

Very similar to TPS65920
List of differences: http://www.ti.com/litv/pdf/swcu066b

CC [email protected]

Signed-off-by Oleg Drokin <[email protected]>

---
 drivers/mfd/twl-core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

drivers/mfd/twl-core.c +2 -0

index b8f2a4e..756f3eb 100644
@@ -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 */ },

Signature · 1 line

1.7.4.4

Tony Lindgren

maintainer

2011-07-01 07:35 UTC #3 lore raw

PATCH 2/3 Add tps65921 chip

Samuel,

Quoted 7 lines · green at linuxhacker.ru

From: Oleg Drokin <[email protected]>
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 <[email protected]>

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

Quoted 24 lines

---
 drivers/mfd/twl-core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

drivers/mfd/twl-core.c +2 -0

index b8f2a4e..756f3eb 100644
@@ -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 */ },

Signature · 6 lines

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

Samuel Ortiz

2011-07-01 11:37 UTC #4 lore raw

PATCH 2/3 Add tps65921 chip

Hi Tony,

Quoted 5 lines · Tony Lindgren

Samuel,
Quoted 2 lines · * [email protected] <[email protected]> [110614 08:42]:
From: Oleg Drokin <[email protected]>

Quoted 8 lines

Quoted 5 lines
Very similar to TPS65920
List of differences: http://www.ti.com/litv/pdf/swcu066b
CC [email protected]
Signed-off-by Oleg Drokin <[email protected]>
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.

Signature · 2 lines

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

Tony Lindgren

maintainer

2011-07-04 06:52 UTC #5 lore raw

PATCH 2/3 Add tps65921 chip

Quoted 11 lines · Samuel Ortiz

Hi Tony,
Quoted 8 lines · Tony Lindgren
Samuel,
Quoted 5 lines · green at linuxhacker.ru
From: Oleg Drokin <[email protected]>
Very similar to TPS65920
List of differences: http://www.ti.com/litv/pdf/swcu066b

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
CC sameo at linux.intel.com
Signed-off-by Oleg Drokin <[email protected]>
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

[email protected]

author

2011-06-14 15:46 UTC #6 lore raw

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

In reply to [email protected]

From: Oleg Drokin <[email protected]>

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

Signed-off-by Oleg Drokin <[email protected]>

---
 arch/arm/tools/mach-types |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/tools/mach-types +1 -1

index 3b3776d..fff68d0 100644
@@ -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

Signature · 1 line

1.7.4.4

Tony Lindgren

maintainer

2011-06-30 13:35 UTC #7 lore raw

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

Quoted 6 lines · green at linuxhacker.ru

From: Oleg Drokin <[email protected]>
Machine database already updated:
http://www.arm.linux.org.uk/developer/machines/list.php?id=3284
Signed-off-by Oleg Drokin <[email protected]>

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

Quoted 24 lines

---
 arch/arm/tools/mach-types |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/tools/mach-types +1 -1

index 3b3776d..fff68d0 100644
@@ -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

Signature · 6 lines

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

Russell King - ARM Linux

2011-07-11 15:21 UTC #8 lore raw

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

Quoted 6 lines · Tony Lindgren

Quoted 5 lines · green at linuxhacker.ru
From: Oleg Drokin <[email protected]>
Machine database already updated:
http://www.arm.linux.org.uk/developer/machines/list.php?id=3284

Quoted 7 lines

Quoted 1 line
Signed-off-by Oleg Drokin <[email protected]>
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 <[email protected]>