Skip to contentSkip to conversation

cm-t3517 fixes

PATCH New Igor Grinberg 2 participants 4 messages Jan 13, 2011 – Jan 19, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Igor Grinberg

author
#0 lore raw

cover cm-t3517 fixes

This little patch serie is based on Tony's devel-board branch. It fixes the rtc and some comments on cm-t3517.

Igor Grinberg (2):
arm: omap3: cm-t3517: rtc fix
arm: omap3: cm-t3517: minor comment fix

 arch/arm/mach-omap2/board-cm-t3517.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 1/2 arm: omap3: cm-t3517: rtc fix

Fix rtc gpios and mux

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap2/board-cm-t3517.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-cm-t3517.c +22 -3
index 5b0c777..1706df0 100644
@@ -124,8 +124,9 @@ static inline void cm_t3517_init_hecc(void) {}
 #if defined(CONFIG_RTC_DRV_V3020) || defined(CONFIG_RTC_DRV_V3020_MODULE)
 #define RTC_IO_GPIO		(153)
 #define RTC_WR_GPIO		(154)
-#define RTC_RD_GPIO		(160)
+#define RTC_RD_GPIO		(53)
 #define RTC_CS_GPIO		(163)
+#define RTC_CS_EN_GPIO		(160)
 
 struct v3020_platform_data cm_t3517_v3020_pdata = {
 	.use_gpio	= 1,

@@ -145,6 +146,16 @@ static struct platform_device cm_t3517_rtc_device = {
 
 static void __init cm_t3517_init_rtc(void)
 {
+	int err;
+
+	err = gpio_request(RTC_CS_EN_GPIO, "rtc cs en");
+	if (err) {
+		pr_err("CM-T3517: rtc cs en gpio request failed: %d\n", err);
+		return;
+	}
+
+	gpio_direction_output(RTC_CS_EN_GPIO, 1);
+
 	platform_device_register(&cm_t3517_rtc_device);
 }
 #else

@@ -256,11 +267,19 @@ static void __init cm_t3517_init_irq(void)
 static struct omap_board_mux board_mux[] __initdata = {
 	/* GPIO186 - Green LED */
 	OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
-	/* RTC GPIOs: IO, WR#, RD#, CS# */
+
+	/* RTC GPIOs: */
+	/* IO - GPIO153 */
 	OMAP3_MUX(MCBSP4_DR, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
+	/* WR# - GPIO154 */
 	OMAP3_MUX(MCBSP4_DX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
-	OMAP3_MUX(MCBSP_CLKS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
+	/* RD# - GPIO53 */
+	OMAP3_MUX(GPMC_NCS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
+	/* CS# - GPIO163 */
 	OMAP3_MUX(UART3_CTS_RCTX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
+	/* CS EN - GPIO160 */
+	OMAP3_MUX(MCBSP_CLKS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
+
 	/* HSUSB1 RESET */
 	OMAP3_MUX(UART2_TX, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
 	/* HSUSB2 RESET */
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 2/2 arm: omap3: cm-t3517: minor comment fix

In reply to Igor Grinberg

offsets in the comment were wrong - fix this.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap2/board-cm-t3517.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-cm-t3517.c +2 -2
index 1706df0..8f9a64d 100644
@@ -225,12 +225,12 @@ static struct mtd_partition cm_t3517_nand_partitions[] = {
 	},
 	{
 		.name           = "linux",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x2A0000 */
 		.size           = 32 * NAND_BLOCK_SIZE,
 	},
 	{
 		.name           = "rootfs",
-		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
+		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x6A0000 */
 		.size           = MTDPART_SIZ_FULL,
 	},
 };
Signature · 1 line
1.7.2.5
maintainer
#3 lore raw

cover cm-t3517 fixes

In reply to Igor Grinberg
Quoted 9 lines · Igor Grinberg

This little patch serie is based on Tony's devel-board branch. It fixes the rtc and some comments on cm-t3517.

Igor Grinberg (2):
arm: omap3: cm-t3517: rtc fix
arm: omap3: cm-t3517: minor comment fix

 arch/arm/mach-omap2/board-cm-t3517.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

Thanks, queueing these as fixes.

Tony