* [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes
@ 2009-02-02 5:53 Dirk Behme
2009-02-02 5:53 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Dirk Behme
2009-02-04 12:46 ` [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Jason Kridner
0 siblings, 2 replies; 26+ messages in thread
From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw)
To: u-boot
OMAP3 support recently merged is version from mid december 2008.
This patch series adds some additional clean up, fixes and
improvements done since then. It brings U-Boot mainline in sync
with U-Boot tree of OMAP3 developers ("omap3-dev").
This patch series is against U-Boot mainline, commit
6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd "Merge branch 'master'
of git://git.denx.de/u-boot-arm"
Best regards
Dirk
^ permalink raw reply [flat|nested] 26+ messages in thread* [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration 2009-02-02 5:53 [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Dirk Behme 2009-02-04 23:18 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Jean-Christophe PLAGNIOL-VILLARD 2009-02-04 12:46 ` [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Jason Kridner 1 sibling, 2 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot * Make Overo GPIO114 an input for touchscreen PENDOWN * Make Overo GPIO144-147 readable * Make Overo EHCI pinmux match beagle rev c setup * Adjust pinmux for SMSC911X network chip support * Remove unnecessary GPIO setup * Fix merge error in Makefile Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- board/omap3/overo/Makefile | 1 + board/omap3/overo/overo.c | 13 ------------- board/omap3/overo/overo.h | 18 ++++++++++-------- 3 files changed, 11 insertions(+), 21 deletions(-) Index: u-boot-main/board/omap3/overo/overo.h =================================================================== --- u-boot-main.orig/board/omap3/overo/overo.h +++ u-boot-main/board/omap3/overo/overo.h @@ -130,7 +130,8 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_NWP), (IEN | PTD | DIS | M0)) /*GPMC_nWP*/\ MUX_VAL(CP(GPMC_WAIT0), (IEN | PTU | EN | M0)) /*GPMC_WAIT0*/\ MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M0)) /*GPMC_WAIT1*/\ - MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M0)) /*GPMC_nCS3*/\ + MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | DIS | M4)) /*GPIO_64*/\ + /* - SMSC911X_NRES*/\ MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0)) /*GPMC_nCS3*/\ /*DSS*/\ MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\ @@ -184,7 +185,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /*CAM_STROBE*/\ MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M0)) /*CSI2_DX0*/\ MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M0)) /*CSI2_DY0*/\ - MUX_VAL(CP(CSI2_DX1), (IEN | PTD | DIS | M0)) /*CSI2_DX1*/\ + MUX_VAL(CP(CSI2_DX1), (IEN | PTD | EN | M4)) /*GPIO_114*/\ MUX_VAL(CP(CSI2_DY1), (IEN | PTU | EN | M4)) /*GPIO_115*/\ /*Audio Interface */\ MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\ @@ -218,10 +219,10 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M1)) /*UART2_RTS*/\ MUX_VAL(CP(MCBSP3_CLKX), (IDIS | PTD | DIS | M1)) /*UART2_TX*/\ MUX_VAL(CP(MCBSP3_FSX), (IEN | PTD | DIS | M1)) /*UART2_RX*/\ - MUX_VAL(CP(UART2_CTS), (IDIS | PTD | DIS | M4)) /*GPIO_144 - LCD_EN*/\ - MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M4)) /*GPIO_145*/\ - MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M4)) /*GPIO_146*/\ - MUX_VAL(CP(UART2_RX), (IDIS | PTD | DIS | M4)) /*GPIO_147*/\ + MUX_VAL(CP(UART2_CTS), (IEN | PTD | DIS | M4)) /*GPIO_144 - LCD_EN*/\ + MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M4)) /*GPIO_145*/\ + MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/\ + MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M4)) /*GPIO_147*/\ MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /*UART1_TX*/\ MUX_VAL(CP(UART1_RTS), (IEN | PTU | DIS | M4)) /*GPIO_149*/ \ MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M4)) /*GPIO_150-MMC3_WP*/\ @@ -271,7 +272,8 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI */\ MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ - MUX_VAL(CP(MCSPI1_CS2), (IDIS | PTD | DIS | M4)) /*GPIO_176*/\ + MUX_VAL(CP(MCSPI1_CS2), (IEN | PTD | DIS | M4)) /*GPIO_176*/\ + /* - SMSC911X_IRQ*/\ MUX_VAL(CP(MCSPI1_CS3), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA2*/\ MUX_VAL(CP(MCSPI2_CLK), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA7*/\ MUX_VAL(CP(MCSPI2_SIMO), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA4*/\ @@ -306,7 +308,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT6*/\ MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT5*/\ MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_CLK*/\ - MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTU | EN | M3)) /*HSUSB2_STP*/\ + MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_STP*/\ MUX_VAL(CP(ETK_D12_ES2), (IEN | PTD | DIS | M3)) /*HSUSB2_DIR*/\ MUX_VAL(CP(ETK_D13_ES2), (IEN | PTD | DIS | M3)) /*HSUSB2_NXT*/\ MUX_VAL(CP(ETK_D14_ES2), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA0*/\ Index: u-boot-main/board/omap3/overo/overo.c =================================================================== --- u-boot-main.orig/board/omap3/overo/overo.c +++ u-boot-main/board/omap3/overo/overo.c @@ -58,21 +58,8 @@ int board_init(void) *****************************************************************************/ int misc_init_r(void) { - gpio_t *gpio5_base = (gpio_t *)OMAP34XX_GPIO5_BASE; - gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; - power_init_r(); - /* Configure GPIOs to output */ - writel(~((GPIO10) | GPIO9 | GPIO3 | GPIO2), &gpio6_base->oe); - writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe); - - /* Set GPIOs */ - writel(GPIO10 | GPIO9 | GPIO3 | GPIO2, &gpio6_base->setdataout); - writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); - return 0; } Index: u-boot-main/board/omap3/overo/Makefile =================================================================== --- u-boot-main.orig/board/omap3/overo/Makefile +++ u-boot-main/board/omap3/overo/Makefile @@ -46,3 +46,4 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend +######################################################################### ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection 2009-02-02 5:53 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 3/7] OMAP3: Add OMAP3 auto detection Dirk Behme 2009-02-04 23:22 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Jean-Christophe PLAGNIOL-VILLARD 2009-02-04 23:18 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 2 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot With BeagleBoard revision C some HW changes are introduced (e.g. PinMUX) which might need different software handling. For this, GPIO pin 171 (GPIO module 6, offset 11) can be used to check for board revision. If this pin is low, we have a rev C board. Else it must be a revision Ax or Bx board. Global variable beagle_revision_c can be used later to handle board differences. E.g. if (beagle_revision_c) { /* do special revision C stuff here */ } Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- board/omap3/beagle/beagle.c | 28 ++++++++++++++++++++++++++++ board/omap3/beagle/beagle.h | 4 ++++ include/asm-arm/arch-omap3/omap3.h | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) Index: u-boot-main/board/omap3/beagle/beagle.c =================================================================== --- u-boot-main.orig/board/omap3/beagle/beagle.c +++ u-boot-main/board/omap3/beagle/beagle.c @@ -54,6 +54,32 @@ int board_init(void) } /****************************************************************************** + * Routine: board_identify + * Description: Detect if we are running on a Beagle revision Ax/Bx or + * Cx. This can be done by GPIO_171. If this is low, we are + * running on a revision C board. + *****************************************************************************/ +void board_identify(void) +{ + gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; + + /* Configure GPIO 171 as input */ + writel(readl(&gpio6_base->oe) | GPIO11, &gpio6_base->oe); + + /* Get value of GPIO 171 */ + beagle_revision_c = readl(&gpio6_base->datain) & BOARD_REVISION_MASK; + + printf("Board revision "); + if (beagle_revision_c) { + printf("Ax/Bx\n"); + beagle_revision_c = 0; + } else { + printf("C\n"); + beagle_revision_c = 1; + } +} + +/****************************************************************************** * Routine: misc_init_r * Description: Configure board specific parts *****************************************************************************/ @@ -75,6 +101,8 @@ int misc_init_r(void) writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); + board_identify(); + return 0; } Index: u-boot-main/board/omap3/beagle/beagle.h =================================================================== --- u-boot-main.orig/board/omap3/beagle/beagle.h +++ u-boot-main/board/omap3/beagle/beagle.h @@ -36,6 +36,10 @@ const omap3_sysinfo sysinfo = { #endif }; +#define BOARD_REVISION_MASK (0x1 << 11) + +unsigned int beagle_revision_c; + /* * IEN - Input Enable * IDIS - Input Disable Index: u-boot-main/include/asm-arm/arch-omap3/omap3.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/omap3.h +++ u-boot-main/include/asm-arm/arch-omap3/omap3.h @@ -97,7 +97,8 @@ typedef struct s32ktimer { typedef struct gpio { unsigned char res1[0x34]; unsigned int oe; /* 0x34 */ - unsigned char res2[0x58]; + unsigned int datain; /* 0x38 */ + unsigned char res2[0x54]; unsigned int cleardataout; /* 0x90 */ unsigned int setdataout; /* 0x94 */ } gpio_t; ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 3/7] OMAP3: Add OMAP3 auto detection 2009-02-02 5:53 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Dirk Behme 2009-02-04 23:22 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 1 reply; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot This patch adds OMAP3 cpu type auto detection based on OMAP3 register and removes hardcoded values. Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- board/omap3/beagle/beagle.h | 1 - board/omap3/evm/evm.h | 1 - board/omap3/overo/overo.h | 1 - board/omap3/pandora/pandora.h | 1 - board/omap3/zoom1/zoom1.h | 1 - cpu/arm_cortexa8/omap3/sys_info.c | 31 +++++++++++++++++++++++++++++-- include/asm-arm/arch-omap3/cpu.h | 20 ++++++++++++++++++++ include/asm-arm/arch-omap3/sys_proto.h | 1 - 8 files changed, 49 insertions(+), 8 deletions(-) Index: u-boot-main/include/asm-arm/arch-omap3/cpu.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/cpu.h +++ u-boot-main/include/asm-arm/arch-omap3/cpu.h @@ -35,11 +35,31 @@ typedef struct ctrl { unsigned short gpmc_nwe; /* 0xC4 */ unsigned char res2[0x22A]; unsigned int status; /* 0x2F0 */ + unsigned int gpstatus; /* 0x2F4 */ + unsigned char res3[0x08]; + unsigned int rpubkey_0; /* 0x300 */ + unsigned int rpubkey_1; /* 0x304 */ + unsigned int rpubkey_2; /* 0x308 */ + unsigned int rpubkey_3; /* 0x30C */ + unsigned int rpubkey_4; /* 0x310 */ + unsigned char res4[0x04]; + unsigned int randkey_0; /* 0x318 */ + unsigned int randkey_1; /* 0x31C */ + unsigned int randkey_2; /* 0x320 */ + unsigned int randkey_3; /* 0x324 */ + unsigned char res5[0x124]; + unsigned int ctrl_omap_stat; /* 0x44C */ } ctrl_t; #else /* __ASSEMBLY__ */ #define CONTROL_STATUS 0x2F0 #endif /* __ASSEMBLY__ */ +/* cpu type */ +#define OMAP3503 0x5c00 +#define OMAP3515 0x1c00 +#define OMAP3525 0x4c00 +#define OMAP3530 0x0c00 + /* device type */ #define DEVICE_MASK (0x7 << 8) #define SYSBOOT_MASK 0x1F Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c =================================================================== --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c @@ -37,6 +37,14 @@ static sdrc_t *sdrc_base = (sdrc_t *)OMA static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; /****************************************** + * get_cpu_type(void) - extract cpu info + ******************************************/ +u32 get_cpu_type(void) +{ + return readl(&ctrl_base->ctrl_omap_stat); +} + +/****************************************** * get_cpu_rev(void) - extract version info ******************************************/ u32 get_cpu_rev(void) @@ -156,7 +164,25 @@ u32 get_board_rev(void) *********************************************************************/ void display_board_info(u32 btype) { - char *mem_s, *sec_s; + char *cpu_s, *mem_s, *sec_s; + + switch (get_cpu_type()) { + case OMAP3503: + cpu_s = "3503"; + break; + case OMAP3515: + cpu_s = "3515"; + break; + case OMAP3525: + cpu_s = "3525"; + break; + case OMAP3530: + cpu_s = "3530"; + break; + default: + cpu_s = "35XX"; + break; + } if (is_mem_sdr()) mem_s = "mSDR"; @@ -180,7 +206,8 @@ void display_board_info(u32 btype) sec_s = "?"; } - printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", sysinfo.cpu_string, + + printf("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n", cpu_s, sec_s, get_cpu_rev()); printf("%s + %s/%s\n", sysinfo.board_string, mem_s, sysinfo.nand_string); Index: u-boot-main/board/omap3/beagle/beagle.h =================================================================== --- u-boot-main.orig/board/omap3/beagle/beagle.h +++ u-boot-main/board/omap3/beagle/beagle.h @@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = { SDP_3430_V1, SDP_3430_V2, DDR_STACKED, - "3530", "OMAP3 Beagle board", #if defined(CONFIG_ENV_IS_IN_ONENAND) "OneNAND", Index: u-boot-main/board/omap3/evm/evm.h =================================================================== --- u-boot-main.orig/board/omap3/evm/evm.h +++ u-boot-main/board/omap3/evm/evm.h @@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = { OMAP3EVM_V1, OMAP3EVM_V2, DDR_DISCRETE, - "35X-Family", "OMAP3 EVM board", #if defined(CONFIG_ENV_IS_IN_ONENAND) "OneNAND", Index: u-boot-main/board/omap3/overo/overo.h =================================================================== --- u-boot-main.orig/board/omap3/overo/overo.h +++ u-boot-main/board/omap3/overo/overo.h @@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = { SDP_3430_V1, SDP_3430_V2, DDR_STACKED, - "3503", "Gumstix Overo board", #if defined(CONFIG_ENV_IS_IN_ONENAND) "OneNAND", Index: u-boot-main/board/omap3/pandora/pandora.h =================================================================== --- u-boot-main.orig/board/omap3/pandora/pandora.h +++ u-boot-main/board/omap3/pandora/pandora.h @@ -27,7 +27,6 @@ const omap3_sysinfo sysinfo = { SDP_3430_V1, SDP_3430_V2, DDR_STACKED, - "3530", "OMAP3 Pandora", "NAND", }; Index: u-boot-main/board/omap3/zoom1/zoom1.h =================================================================== --- u-boot-main.orig/board/omap3/zoom1/zoom1.h +++ u-boot-main/board/omap3/zoom1/zoom1.h @@ -31,7 +31,6 @@ const omap3_sysinfo sysinfo = { SDP_3430_V1, SDP_3430_V2, DDR_STACKED, - "3430", "OMAP3 Zoom MDK Rev 1", "NAND", }; Index: u-boot-main/include/asm-arm/arch-omap3/sys_proto.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/sys_proto.h +++ u-boot-main/include/asm-arm/arch-omap3/sys_proto.h @@ -25,7 +25,6 @@ typedef struct { u32 board_type_v1; u32 board_type_v2; u32 mtype; - char *cpu_string; char *board_string; char *nand_string; } omap3_sysinfo; ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-02 5:53 ` [U-Boot] [PATCH 3/7] OMAP3: Add OMAP3 auto detection Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme 2009-02-04 23:24 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 2 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot Update Pandora pin mux. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> --- board/omap3/pandora/pandora.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: u-boot-main/board/omap3/pandora/pandora.h =================================================================== --- u-boot-main.orig/board/omap3/pandora/pandora.h +++ u-boot-main/board/omap3/pandora/pandora.h @@ -199,12 +199,12 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M1)) /*MMC2_CLKIN*/\ MUX_VAL(CP(MMC1_DAT5), (IEN | PTD | DIS | M4)) /*GPIO_127 - MMC2_WP*/\ /*SDIO Interface to WIFI Module*/\ - MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M2)) /*MMC3_CLK*/\ - MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTD | DIS | M2)) /*MMC3_CMD*/\ - MUX_VAL(CP(ETK_D4_ES2), (IEN | PTD | DIS | M2)) /*MMC3_DAT0*/\ - MUX_VAL(CP(ETK_D5_ES2), (IEN | PTD | DIS | M2)) /*MMC3_DAT1*/\ - MUX_VAL(CP(ETK_D6_ES2), (IEN | PTD | DIS | M2)) /*MMC3_DAT2*/\ - MUX_VAL(CP(ETK_D3_ES2), (IEN | PTD | DIS | M2)) /*MMC3_DAT3*/\ + MUX_VAL(CP(ETK_CLK_ES2), (IEN | PTD | DIS | M2)) /*MMC3_CLK*/\ + MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\ + MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT0*/\ + MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT1*/\ + MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT2*/\ + MUX_VAL(CP(ETK_D3_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT3*/\ /*Audio Interface To Bluetooth chip*/\ MUX_VAL(CP(MCBSP3_DX), (IDIS | PTD | DIS | M0)) /*McBSP3_DX*/\ MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M0)) /*McBSP3_DR*/\ ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-02 5:53 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme ` (2 more replies) 2009-02-04 23:24 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 3 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot Add serial number based on OMAP3 die ID. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- board/omap3/beagle/beagle.c | 2 ++ board/omap3/evm/evm.c | 2 ++ board/omap3/overo/overo.c | 2 ++ board/omap3/pandora/pandora.c | 2 ++ board/omap3/zoom1/zoom1.c | 1 + cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++++++++++++++++++++ include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ include/asm-arm/arch-omap3/omap3.h | 1 + include/asm-arm/arch-omap3/sys_proto.h | 1 + 9 files changed, 51 insertions(+) Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c =================================================================== --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c @@ -36,6 +36,33 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_ static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; +/***************************************************************** + * serial_num_r(void) - read and set serial number based on DIE ID + *****************************************************************/ +void serial_num_r(void) +{ + ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE; + char *uid_s, die_id[34]; + u32 id[4]; + + memset(die_id, 0, sizeof(die_id)); + + uid_s = getenv("serial"); + + if (uid_s == NULL) { + id[3] = readl(&id_base->die_id_0); + id[2] = readl(&id_base->die_id_1); + id[1] = readl(&id_base->die_id_2); + id[0] = readl(&id_base->die_id_3); + sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]); + setenv("serial", die_id); + } else { + strncpy(die_id, uid_s, 34); + } + + printf("Serial #%s\n", die_id); +} + /****************************************** * get_cpu_type(void) - extract cpu info ******************************************/ Index: u-boot-main/include/asm-arm/arch-omap3/cpu.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/cpu.h +++ u-boot-main/include/asm-arm/arch-omap3/cpu.h @@ -60,6 +60,19 @@ typedef struct ctrl { #define OMAP3525 0x4c00 #define OMAP3530 0x0c00 +#ifndef __ASSEMBLY__ +typedef struct ctrl_id { + unsigned char res1[0x4]; + unsigned int idcode; /* 0x04 */ + unsigned int prod_id; /* 0x08 */ + unsigned char res2[0x0C]; + unsigned int die_id_0; /* 0x18 */ + unsigned int die_id_1; /* 0x1C */ + unsigned int die_id_2; /* 0x20 */ + unsigned int die_id_3; /* 0x24 */ +} ctrl_id_t; +#endif /* __ASSEMBLY__ */ + /* device type */ #define DEVICE_MASK (0x7 << 8) #define SYSBOOT_MASK 0x1F Index: u-boot-main/include/asm-arm/arch-omap3/omap3.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/omap3.h +++ u-boot-main/include/asm-arm/arch-omap3/omap3.h @@ -43,6 +43,7 @@ */ #define OMAP34XX_CORE_L4_IO_BASE 0x48000000 #define OMAP34XX_WAKEUP_L4_IO_BASE 0x48300000 +#define OMAP34XX_ID_L4_IO_BASE 0x4830A200 #define OMAP34XX_L4_PER 0x49000000 #define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE Index: u-boot-main/board/omap3/overo/overo.c =================================================================== --- u-boot-main.orig/board/omap3/overo/overo.c +++ u-boot-main/board/omap3/overo/overo.c @@ -60,6 +60,8 @@ int misc_init_r(void) { power_init_r(); + serial_num_r(); + return 0; } Index: u-boot-main/board/omap3/beagle/beagle.c =================================================================== --- u-boot-main.orig/board/omap3/beagle/beagle.c +++ u-boot-main/board/omap3/beagle/beagle.c @@ -103,6 +103,8 @@ int misc_init_r(void) board_identify(); + serial_num_r(); + return 0; } Index: u-boot-main/board/omap3/evm/evm.c =================================================================== --- u-boot-main.orig/board/omap3/evm/evm.c +++ u-boot-main/board/omap3/evm/evm.c @@ -68,6 +68,8 @@ int misc_init_r(void) setup_net_chip(); #endif + serial_num_r(); + return 0; } Index: u-boot-main/include/asm-arm/arch-omap3/sys_proto.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/sys_proto.h +++ u-boot-main/include/asm-arm/arch-omap3/sys_proto.h @@ -66,5 +66,6 @@ void sdelay(unsigned long); void make_cs1_contiguous(void); void omap_nand_switch_ecc(int); void power_init_r(void); +void serial_num_r(void); #endif Index: u-boot-main/board/omap3/pandora/pandora.c =================================================================== --- u-boot-main.orig/board/omap3/pandora/pandora.c +++ u-boot-main/board/omap3/pandora/pandora.c @@ -77,6 +77,8 @@ int misc_init_r(void) writel(GPIO28, &gpio5_base->setdataout); writel(GPIO4, &gpio6_base->setdataout); + serial_num_r(); + return 0; } Index: u-boot-main/board/omap3/zoom1/zoom1.c =================================================================== --- u-boot-main.orig/board/omap3/zoom1/zoom1.c +++ u-boot-main/board/omap3/zoom1/zoom1.c @@ -61,6 +61,7 @@ int board_init(void) int misc_init_r(void) { power_init_r(); + serial_num_r(); return 0; } ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 7/7] OMAP3: Clean up MMC code Dirk Behme 2009-02-11 22:26 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Jean-Christophe PLAGNIOL-VILLARD 2009-02-04 23:28 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Jean-Christophe PLAGNIOL-VILLARD 2009-02-11 22:34 ` Wolfgang Denk 2 siblings, 2 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot OMAp3 core changes necessary for MUSB Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- Note: OMAP3 USb code will be sent later to USB maintainer, so CONFIG_MUSB isn't used anywhere yet. This will avoid USB maintainer to change OMAP3 core files. cpu/arm_cortexa8/omap3/clock.c | 5 +++++ include/asm-arm/arch-omap3/cpu.h | 2 ++ include/asm-arm/arch-omap3/omap3.h | 11 +++++++++++ 3 files changed, 18 insertions(+) Index: u-boot-main/cpu/arm_cortexa8/omap3/clock.c =================================================================== --- u-boot-main.orig/cpu/arm_cortexa8/omap3/clock.c +++ u-boot-main/cpu/arm_cortexa8/omap3/clock.c @@ -377,5 +377,10 @@ void per_clocks_enable(void) sr32(&prcm_base->fclken_per, 0, 32, FCK_PER_ON); sr32(&prcm_base->iclken_per, 0, 32, ICK_PER_ON); +#ifdef CONFIG_MUSB + /* Enable the MUSB interface clock */ + sr32(&prcm_base->iclken1_core, 4, 1, 0x1); +#endif + sdelay(1000); } Index: u-boot-main/include/asm-arm/arch-omap3/cpu.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/cpu.h +++ u-boot-main/include/asm-arm/arch-omap3/cpu.h @@ -432,4 +432,6 @@ typedef struct pm { #define I2C_BASE2 (OMAP34XX_CORE_L4_IO_BASE + 0x72000) #define I2C_BASE3 (OMAP34XX_CORE_L4_IO_BASE + 0x60000) +#define UDC_BASE (OMAP34XX_CORE_L4_IO_BASE + 0xAB000) + #endif /* _CPU_H */ Index: u-boot-main/include/asm-arm/arch-omap3/omap3.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/omap3.h +++ u-boot-main/include/asm-arm/arch-omap3/omap3.h @@ -3,6 +3,7 @@ * Texas Instruments, <www.ti.com> * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <x0khasim@ti.com> + * Atin Malaviya <atin.malaviya@gmail.com> * * See file CREDITS for list of people who contributed to this * project. @@ -200,6 +201,7 @@ typedef struct gpio { #define LEDBPWM (0x1 << 5) /* I2C ID4 (slave4) register */ +#define PROTECT_KEY 0x44 #define VAUX2_DEV_GRP 0x76 #define VAUX2_DEDICATED 0x79 #define VAUX3_DEV_GRP 0x7A @@ -209,6 +211,15 @@ typedef struct gpio { #define VDAC_DEV_GRP 0x96 #define VDAC_DEDICATED 0x99 +#define VUSB1V5_DEV_GRP 0xCC +#define VUSB1V5_TYPE 0xCD +#define VUSB1V8_DEV_GRP 0xCF +#define VUSB1V8_TYPE 0xD0 +#define VUSB3V1_DEV_GRP 0xD2 +#define VUSB3V1_TYPE 0xD3 +#define VUSB_DEDICATED1 0xD8 +#define VUSB_DEDICATED2 0xD9 + #define DEV_GRP_P1 0x20 #define DEV_GRP_ALL 0xE0 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 7/7] OMAP3: Clean up MMC code 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme @ 2009-02-02 5:53 ` Dirk Behme 2009-02-11 22:26 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 0 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-02 5:53 UTC (permalink / raw) To: u-boot Clean up OMAP3 MMC code: * Convert register access to struct & readx/writex style * Replace hardcode values by macros * Remove macro defined twice Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> --- drivers/mmc/omap3_mmc.c | 145 +++++++++++++++--------------- include/asm-arm/arch-omap3/mmc_host_def.h | 64 ++++++++----- include/asm-arm/arch-omap3/omap3.h | 3 3 files changed, 118 insertions(+), 94 deletions(-) Index: u-boot-main/include/asm-arm/arch-omap3/mmc_host_def.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/mmc_host_def.h +++ u-boot-main/include/asm-arm/arch-omap3/mmc_host_def.h @@ -25,30 +25,50 @@ #ifndef MMC_HOST_DEF_H #define MMC_HOST_DEF_H +/* T2 Register definitions */ +#define T2_BASE 0x48002000 + +typedef struct t2 { + unsigned char res1[0x274]; + unsigned int devconf0; /* 0x274 */ + unsigned char res2[0x2A8]; + unsigned int pbias_lite; /* 0x520 */ +} t2_t; + +#define MMCSDIO1ADPCLKISEL (1 << 24) + +#define PBIASLITEPWRDNZ0 (1 << 1) +#define PBIASSPEEDCTRL0 (1 << 2) +#define PBIASLITEPWRDNZ1 (1 << 9) + /* * OMAP HSMMC register definitions */ -#define OMAP_HSMMC_SYSCONFIG (*(unsigned int *) 0x4809C010) -#define OMAP_HSMMC_SYSSTATUS (*(unsigned int *) 0x4809C014) -#define OMAP_HSMMC_CON (*(unsigned int *) 0x4809C02C) -#define OMAP_HSMMC_BLK (*(unsigned int *) 0x4809C104) -#define OMAP_HSMMC_ARG (*(unsigned int *) 0x4809C108) -#define OMAP_HSMMC_CMD (*(unsigned int *) 0x4809C10C) -#define OMAP_HSMMC_RSP10 (*(unsigned int *) 0x4809C110) -#define OMAP_HSMMC_RSP32 (*(unsigned int *) 0x4809C114) -#define OMAP_HSMMC_RSP54 (*(unsigned int *) 0x4809C118) -#define OMAP_HSMMC_RSP76 (*(unsigned int *) 0x4809C11C) -#define OMAP_HSMMC_DATA (*(unsigned int *) 0x4809C120) -#define OMAP_HSMMC_PSTATE (*(unsigned int *) 0x4809C124) -#define OMAP_HSMMC_HCTL (*(unsigned int *) 0x4809C128) -#define OMAP_HSMMC_SYSCTL (*(unsigned int *) 0x4809C12C) -#define OMAP_HSMMC_STAT (*(unsigned int *) 0x4809C130) -#define OMAP_HSMMC_IE (*(unsigned int *) 0x4809C134) -#define OMAP_HSMMC_CAPA (*(unsigned int *) 0x4809C140) +#define OMAP_HSMMC_BASE 0x4809C000 -/* T2 Register definitions */ -#define CONTROL_DEV_CONF0 (*(unsigned int *) 0x48002274) -#define CONTROL_PBIAS_LITE (*(unsigned int *) 0x48002520) +typedef struct hsmmc { + unsigned char res1[0x10]; + unsigned int sysconfig; /* 0x10 */ + unsigned int sysstatus; /* 0x14 */ + unsigned char res2[0x14]; + unsigned int con; /* 0x2C */ + unsigned char res3[0xD4]; + unsigned int blk; /* 0x104 */ + unsigned int arg; /* 0x108 */ + unsigned int cmd; /* 0x10C */ + unsigned int rsp10; /* 0x110 */ + unsigned int rsp32; /* 0x114 */ + unsigned int rsp54; /* 0x118 */ + unsigned int rsp76; /* 0x11C */ + unsigned int data; /* 0x120 */ + unsigned int pstate; /* 0x124 */ + unsigned int hctl; /* 0x128 */ + unsigned int sysctl; /* 0x12C */ + unsigned int stat; /* 0x130 */ + unsigned int ie; /* 0x134 */ + unsigned char res4[0x8]; + unsigned int capa; /* 0x140 */ +} hsmmc_t; /* * OMAP HS MMC Bit definitions @@ -159,8 +179,6 @@ typedef struct { } mmc_card_data; #define mmc_reg_out(addr, mask, val)\ - (addr) = (((addr)) & (~(mask))) | ((val) & (mask)); -#define mmc_reg_out(addr, mask, val)\ - (addr) = (((addr)) & (~(mask))) | ((val) & (mask)); + writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) #endif /* MMC_HOST_DEF_H */ Index: u-boot-main/drivers/mmc/omap3_mmc.c =================================================================== --- u-boot-main.orig/drivers/mmc/omap3_mmc.c +++ u-boot-main/drivers/mmc/omap3_mmc.c @@ -28,6 +28,7 @@ #include <mmc.h> #include <part.h> #include <i2c.h> +#include <asm/io.h> const unsigned short mmc_transspeed_val[15][4] = { {CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)}, @@ -49,6 +50,7 @@ const unsigned short mmc_transspeed_val[ mmc_card_data cur_card_data; static block_dev_desc_t mmc_blk_dev; +static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC_BASE; block_dev_desc_t *mmc_get_dev(int dev) { @@ -59,55 +61,49 @@ void twl4030_mmc_config(void) { unsigned char data; - data = 0x20; - i2c_write(0x4B, 0x82, 1, &data, 1); - data = 0x2; - i2c_write(0x4B, 0x85, 1, &data, 1); + data = DEV_GRP_P1; + i2c_write(PWRMGT_ADDR_ID4, VMMC1_DEV_GRP, 1, &data, 1); + data = VMMC1_VSEL_30; + i2c_write(PWRMGT_ADDR_ID4, VMMC1_DEDICATED, 1, &data, 1); } unsigned char mmc_board_init(void) { - unsigned int value = 0; + t2_t *t2_base = (t2_t *)T2_BASE; twl4030_mmc_config(); - value = CONTROL_PBIAS_LITE; - CONTROL_PBIAS_LITE = value | (1 << 2) | (1 << 1) | (1 << 9); + writel(readl(&t2_base->pbias_lite) | PBIASLITEPWRDNZ1 | + PBIASSPEEDCTRL0 | PBIASLITEPWRDNZ0, + &t2_base->pbias_lite); - value = CONTROL_DEV_CONF0; - CONTROL_DEV_CONF0 = value | (1 << 24); + writel(readl(&t2_base->devconf0) | MMCSDIO1ADPCLKISEL, + &t2_base->devconf0); return 1; } void mmc_init_stream(void) { - volatile unsigned int mmc_stat; + writel(readl(&mmc_base->con) | INIT_INITSTREAM, &mmc_base->con); - OMAP_HSMMC_CON |= INIT_INITSTREAM; + writel(MMC_CMD0, &mmc_base->cmd); + while (!(readl(&mmc_base->stat) & CC_MASK)); - OMAP_HSMMC_CMD = MMC_CMD0; - do { - mmc_stat = OMAP_HSMMC_STAT; - } while (!(mmc_stat & CC_MASK)); - - OMAP_HSMMC_STAT = CC_MASK; + writel(CC_MASK, &mmc_base->stat); - OMAP_HSMMC_CMD = MMC_CMD0; - do { - mmc_stat = OMAP_HSMMC_STAT; - } while (!(mmc_stat & CC_MASK)); + writel(MMC_CMD0, &mmc_base->cmd); + while (!(readl(&mmc_base->stat) & CC_MASK)); - OMAP_HSMMC_STAT = OMAP_HSMMC_STAT; - OMAP_HSMMC_CON &= ~INIT_INITSTREAM; + writel(readl(&mmc_base->con) & ~INIT_INITSTREAM, &mmc_base->con); } unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div) { unsigned int val; - mmc_reg_out(OMAP_HSMMC_SYSCTL, (ICE_MASK | DTO_MASK | CEN_MASK), - (ICE_STOP | DTO_15THDTO | CEN_DISABLE)); + mmc_reg_out(&mmc_base->sysctl, (ICE_MASK | DTO_MASK | CEN_MASK), + (ICE_STOP | DTO_15THDTO | CEN_DISABLE)); switch (iclk) { case CLK_INITSEQ: @@ -122,12 +118,12 @@ unsigned char mmc_clock_config(unsigned default: return 0; } - mmc_reg_out(OMAP_HSMMC_SYSCTL, - ICE_MASK | CLKD_MASK, (val << CLKD_OFFSET) | ICE_OSCILLATE); + mmc_reg_out(&mmc_base->sysctl, ICE_MASK | CLKD_MASK, + (val << CLKD_OFFSET) | ICE_OSCILLATE); - while ((OMAP_HSMMC_SYSCTL & ICS_MASK) == ICS_NOTREADY) ; + while ((readl(&mmc_base->sysctl) & ICS_MASK) == ICS_NOTREADY); - OMAP_HSMMC_SYSCTL |= CEN_ENABLE; + writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl); return 1; } @@ -137,59 +133,63 @@ unsigned char mmc_init_setup(void) mmc_board_init(); - OMAP_HSMMC_SYSCONFIG |= MMC_SOFTRESET; - while ((OMAP_HSMMC_SYSSTATUS & RESETDONE) == 0) ; - - OMAP_HSMMC_SYSCTL |= SOFTRESETALL; - while ((OMAP_HSMMC_SYSCTL & SOFTRESETALL) != 0x0) ; - - OMAP_HSMMC_HCTL = DTW_1_BITMODE | SDBP_PWROFF | SDVS_3V0; - OMAP_HSMMC_CAPA |= VS30_3V0SUP | VS18_1V8SUP; - - reg_val = OMAP_HSMMC_CON & RESERVED_MASK; - - OMAP_HSMMC_CON = CTPL_MMC_SD | reg_val | WPP_ACTIVEHIGH | - CDP_ACTIVEHIGH | MIT_CTO | DW8_1_4BITMODE | MODE_FUNC | - STR_BLOCK | HR_NOHOSTRESP | INIT_NOINIT | NOOPENDRAIN; + writel(readl(&mmc_base->sysconfig) | MMC_SOFTRESET, + &mmc_base->sysconfig); + while ((readl(&mmc_base->sysstatus) & RESETDONE) == 0); + + writel(readl(&mmc_base->sysctl) | SOFTRESETALL, &mmc_base->sysctl); + while ((readl(&mmc_base->sysctl) & SOFTRESETALL) != 0x0); + + writel(DTW_1_BITMODE | SDBP_PWROFF | SDVS_3V0, &mmc_base->hctl); + writel(readl(&mmc_base->capa) | VS30_3V0SUP | VS18_1V8SUP, + &mmc_base->capa); + + reg_val = readl(&mmc_base->con) & RESERVED_MASK; + + writel(CTPL_MMC_SD | reg_val | WPP_ACTIVEHIGH | CDP_ACTIVEHIGH | + MIT_CTO | DW8_1_4BITMODE | MODE_FUNC | STR_BLOCK | + HR_NOHOSTRESP | INIT_NOINIT | NOOPENDRAIN, &mmc_base->con); mmc_clock_config(CLK_INITSEQ, 0); - OMAP_HSMMC_HCTL |= SDBP_PWRON; + writel(readl(&mmc_base->hctl) | SDBP_PWRON, &mmc_base->hctl); - OMAP_HSMMC_IE = 0x307f0033; + writel(IE_BADA | IE_CERR | IE_DEB | IE_DCRC | IE_DTO | IE_CIE | + IE_CEB | IE_CCRC | IE_CTO | IE_BRR | IE_BWR | IE_TC | IE_CC, + &mmc_base->ie); mmc_init_stream(); return 1; } unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg, - unsigned int *response) + unsigned int *response) { - volatile unsigned int mmc_stat; + unsigned int mmc_stat; - while ((OMAP_HSMMC_PSTATE & DATI_MASK) == DATI_CMDDIS) ; + while ((readl(&mmc_base->pstate) & DATI_MASK) == DATI_CMDDIS); - OMAP_HSMMC_BLK = BLEN_512BYTESLEN | NBLK_STPCNT; - OMAP_HSMMC_STAT = 0xFFFFFFFF; - OMAP_HSMMC_ARG = arg; - OMAP_HSMMC_CMD = cmd | CMD_TYPE_NORMAL | CICE_NOCHECK | - CCCE_NOCHECK | MSBS_SGLEBLK | ACEN_DISABLE | BCE_DISABLE | - DE_DISABLE; + writel(BLEN_512BYTESLEN | NBLK_STPCNT, &mmc_base->blk); + writel(0xFFFFFFFF, &mmc_base->stat); + writel(arg, &mmc_base->arg); + writel(cmd | CMD_TYPE_NORMAL | CICE_NOCHECK | CCCE_NOCHECK | + MSBS_SGLEBLK | ACEN_DISABLE | BCE_DISABLE | DE_DISABLE, + &mmc_base->cmd); while (1) { do { - mmc_stat = OMAP_HSMMC_STAT; + mmc_stat = readl(&mmc_base->stat); } while (mmc_stat == 0); if ((mmc_stat & ERRI_MASK) != 0) return (unsigned char) mmc_stat; if (mmc_stat & CC_MASK) { - OMAP_HSMMC_STAT = CC_MASK; - response[0] = OMAP_HSMMC_RSP10; + writel(CC_MASK, &mmc_base->stat); + response[0] = readl(&mmc_base->rsp10); if ((cmd & RSP_TYPE_MASK) == RSP_TYPE_LGHT136) { - response[1] = OMAP_HSMMC_RSP32; - response[2] = OMAP_HSMMC_RSP54; - response[3] = OMAP_HSMMC_RSP76; + response[1] = readl(&mmc_base->rsp32); + response[2] = readl(&mmc_base->rsp54); + response[3] = readl(&mmc_base->rsp76); } break; } @@ -199,7 +199,7 @@ unsigned char mmc_send_cmd(unsigned int unsigned char mmc_read_data(unsigned int *output_buf) { - volatile unsigned int mmc_stat; + unsigned int mmc_stat; unsigned int read_count = 0; /* @@ -207,7 +207,7 @@ unsigned char mmc_read_data(unsigned int */ while (1) { do { - mmc_stat = OMAP_HSMMC_STAT; + mmc_stat = readl(&mmc_base->stat); } while (mmc_stat == 0); if ((mmc_stat & ERRI_MASK) != 0) @@ -216,19 +216,22 @@ unsigned char mmc_read_data(unsigned int if (mmc_stat & BRR_MASK) { unsigned int k; - OMAP_HSMMC_STAT |= BRR_MASK; + writel(readl(&mmc_base->stat) | BRR_MASK, + &mmc_base->stat); for (k = 0; k < MMCSD_SECTOR_SIZE / 4; k++) { - *output_buf = OMAP_HSMMC_DATA; + *output_buf = readl(&mmc_base->data); output_buf++; read_count += 4; } } if (mmc_stat & BWR_MASK) - OMAP_HSMMC_STAT |= BWR_MASK; + writel(readl(&mmc_base->stat) | BWR_MASK, + &mmc_base->stat); if (mmc_stat & TC_MASK) { - OMAP_HSMMC_STAT |= TC_MASK; + writel(readl(&mmc_base->stat) | TC_MASK, + &mmc_base->stat); break; } } @@ -272,8 +275,8 @@ unsigned char mmc_detect_card(mmc_card_d mmc_card_cur->card_type = MMC_CARD; ocr_value |= MMC_OCR_REG_ACCESS_MODE_SECTOR; ret_cmd41 = MMC_CMD1; - OMAP_HSMMC_CON &= ~OD; - OMAP_HSMMC_CON |= OPENDRAIN; + writel(readl(&mmc_base->con) & ~OD, &mmc_base->con); + writel(readl(&mmc_base->con) | OPENDRAIN, &mmc_base->con); } argument = ocr_value; @@ -341,8 +344,8 @@ unsigned char mmc_detect_card(mmc_card_d mmc_card_cur->RCA = ((mmc_resp_r6 *) resp)->newpublishedrca; } - OMAP_HSMMC_CON &= ~OD; - OMAP_HSMMC_CON |= NOOPENDRAIN; + writel(readl(&mmc_base->con) & ~OD, &mmc_base->con); + writel(readl(&mmc_base->con) | NOOPENDRAIN, &mmc_base->con); return 1; } @@ -517,7 +520,7 @@ unsigned long mmc_bread(int dev_num, uns void *dst) { omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, - (unsigned long *) dst); + (unsigned long *) dst); return 1; } Index: u-boot-main/include/asm-arm/arch-omap3/omap3.h =================================================================== --- u-boot-main.orig/include/asm-arm/arch-omap3/omap3.h +++ u-boot-main/include/asm-arm/arch-omap3/omap3.h @@ -206,6 +206,8 @@ typedef struct gpio { #define VAUX2_DEDICATED 0x79 #define VAUX3_DEV_GRP 0x7A #define VAUX3_DEDICATED 0x7D +#define VMMC1_DEV_GRP 0x82 +#define VMMC1_DEDICATED 0x85 #define VPLL2_DEV_GRP 0x8E #define VPLL2_DEDICATED 0x91 #define VDAC_DEV_GRP 0x96 @@ -227,5 +229,6 @@ typedef struct gpio { #define VAUX3_VSEL_28 0x03 #define VPLL2_VSEL_18 0x05 #define VDAC_VSEL_18 0x03 +#define VMMC1_VSEL_30 0x02 #endif ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 7/7] OMAP3: Clean up MMC code Dirk Behme @ 2009-02-11 22:26 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-12 18:56 ` Dirk Behme 1 sibling, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-11 22:26 UTC (permalink / raw) To: u-boot On 06:53 Mon 02 Feb , Dirk Behme wrote: > OMAp3 core changes necessary for MUSB > > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> > > --- > Note: OMAP3 USb code will be sent later to USB maintainer, so > CONFIG_MUSB isn't used anywhere yet. This will avoid > USB maintainer to change OMAP3 core files. > > cpu/arm_cortexa8/omap3/clock.c | 5 +++++ > include/asm-arm/arch-omap3/cpu.h | 2 ++ > include/asm-arm/arch-omap3/omap3.h | 11 +++++++++++ > 3 files changed, 18 insertions(+) > > Index: u-boot-main/cpu/arm_cortexa8/omap3/clock.c > =================================================================== > --- u-boot-main.orig/cpu/arm_cortexa8/omap3/clock.c > +++ u-boot-main/cpu/arm_cortexa8/omap3/clock.c > @@ -377,5 +377,10 @@ void per_clocks_enable(void) > sr32(&prcm_base->fclken_per, 0, 32, FCK_PER_ON); > sr32(&prcm_base->iclken_per, 0, 32, ICK_PER_ON); > > +#ifdef CONFIG_MUSB > + /* Enable the MUSB interface clock */ > + sr32(&prcm_base->iclken1_core, 4, 1, 0x1); > +#endif > + why do you enable the clock every time if you do not use it u-boot please do no enable it as done for the ethernet as example Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB 2009-02-11 22:26 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-12 18:56 ` Dirk Behme 0 siblings, 0 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-12 18:56 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 06:53 Mon 02 Feb , Dirk Behme wrote: >> OMAp3 core changes necessary for MUSB >> >> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> >> >> --- >> Note: OMAP3 USb code will be sent later to USB maintainer, so >> CONFIG_MUSB isn't used anywhere yet. This will avoid >> USB maintainer to change OMAP3 core files. >> >> cpu/arm_cortexa8/omap3/clock.c | 5 +++++ >> include/asm-arm/arch-omap3/cpu.h | 2 ++ >> include/asm-arm/arch-omap3/omap3.h | 11 +++++++++++ >> 3 files changed, 18 insertions(+) >> >> Index: u-boot-main/cpu/arm_cortexa8/omap3/clock.c >> =================================================================== >> --- u-boot-main.orig/cpu/arm_cortexa8/omap3/clock.c >> +++ u-boot-main/cpu/arm_cortexa8/omap3/clock.c >> @@ -377,5 +377,10 @@ void per_clocks_enable(void) >> sr32(&prcm_base->fclken_per, 0, 32, FCK_PER_ON); >> sr32(&prcm_base->iclken_per, 0, 32, ICK_PER_ON); >> >> +#ifdef CONFIG_MUSB >> + /* Enable the MUSB interface clock */ >> + sr32(&prcm_base->iclken1_core, 4, 1, 0x1); >> +#endif >> + > why do you enable the clock every time if you do not use it u-boot please do > no enable it as done for the ethernet as example Hmmh, sorry if I missed something? But my understanding and implementation goal is to have MUSB clock enabled only if CONFIG_MUSB is enabled (and not every time). As mentioned above, this will be done later with an USB patch to be sent to USB maintainer. I.e. MUSB clock will be enabled only if it is really needed because CONFIG_MUSB is enabled (by patch to be sent later). Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme @ 2009-02-04 23:28 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:14 ` Dirk Behme 2009-02-11 22:34 ` Wolfgang Denk 2 siblings, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-04 23:28 UTC (permalink / raw) To: u-boot On 06:53 Mon 02 Feb , Dirk Behme wrote: > Add serial number based on OMAP3 die ID. > > Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> > > --- > board/omap3/beagle/beagle.c | 2 ++ > board/omap3/evm/evm.c | 2 ++ > board/omap3/overo/overo.c | 2 ++ > board/omap3/pandora/pandora.c | 2 ++ > board/omap3/zoom1/zoom1.c | 1 + > cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++++++++++++++++++++ > include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ > include/asm-arm/arch-omap3/omap3.h | 1 + > include/asm-arm/arch-omap3/sys_proto.h | 1 + > 9 files changed, 51 insertions(+) > > Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c > =================================================================== > --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c > +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c > @@ -36,6 +36,33 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_ > static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; > static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; > > +/***************************************************************** > + * serial_num_r(void) - read and set serial number based on DIE ID > + *****************************************************************/ > +void serial_num_r(void) > +{ > + ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE; > + char *uid_s, die_id[34]; > + u32 id[4]; > + > + memset(die_id, 0, sizeof(die_id)); > + > + uid_s = getenv("serial"); why not call a cat a cat? IMHO why don't you report the die id? > + > + if (uid_s == NULL) { > + id[3] = readl(&id_base->die_id_0); > + id[2] = readl(&id_base->die_id_1); > + id[1] = readl(&id_base->die_id_2); > + id[0] = readl(&id_base->die_id_3); > + sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]); > + setenv("serial", die_id); > + } else { > + strncpy(die_id, uid_s, 34); why copy it? why not simply print it > + } > + > + printf("Serial #%s\n", die_id); > +} > + > /****************************************** > * get_cpu_type(void) - extract cpu info > ******************************************/ > Index: u-boot-main/include/asm-arm/arch-omap3/cpu.h Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-04 23:28 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 19:14 ` Dirk Behme 2009-02-11 22:24 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 26+ messages in thread From: Dirk Behme @ 2009-02-05 19:14 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 06:53 Mon 02 Feb , Dirk Behme wrote: >> Add serial number based on OMAP3 die ID. >> >> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> >> >> --- >> board/omap3/beagle/beagle.c | 2 ++ >> board/omap3/evm/evm.c | 2 ++ >> board/omap3/overo/overo.c | 2 ++ >> board/omap3/pandora/pandora.c | 2 ++ >> board/omap3/zoom1/zoom1.c | 1 + >> cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++++++++++++++++++++ >> include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ >> include/asm-arm/arch-omap3/omap3.h | 1 + >> include/asm-arm/arch-omap3/sys_proto.h | 1 + >> 9 files changed, 51 insertions(+) >> >> Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >> =================================================================== >> --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c >> +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >> @@ -36,6 +36,33 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_ >> static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; >> static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; >> >> +/***************************************************************** >> + * serial_num_r(void) - read and set serial number based on DIE ID >> + *****************************************************************/ >> +void serial_num_r(void) >> +{ >> + ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE; >> + char *uid_s, die_id[34]; >> + u32 id[4]; >> + >> + memset(die_id, 0, sizeof(die_id)); >> + >> + uid_s = getenv("serial"); > why not call a cat a cat? Why not give the cat a fitting name? The user gets a serial number, so we name it serial. How and where we get it from is hidden from user. It wouldn't help to name it "die ID" for user, nobody would know what this is. But serial number is clear to every body. > IMHO why don't you report the die id? >> + >> + if (uid_s == NULL) { >> + id[3] = readl(&id_base->die_id_0); >> + id[2] = readl(&id_base->die_id_1); >> + id[1] = readl(&id_base->die_id_2); >> + id[0] = readl(&id_base->die_id_3); >> + sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]); >> + setenv("serial", die_id); >> + } else { >> + strncpy(die_id, uid_s, 34); > why copy it? why not simply print it Same concept as in beagle revision patch: Touch hardware only once if not done already, store the value and deal with value read from HW instead of touching HW again and again. Then we use one central output location for the printf below, not repeating same printf at different lines. >> + } >> + >> + printf("Serial #%s\n", die_id); >> +} Dirk Btw.: I hope that the other OMAP3 patch sent independently http://lists.denx.de/pipermail/u-boot/2009-February/046691.html will not be forgotten? ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-05 19:14 ` Dirk Behme @ 2009-02-11 22:24 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-12 18:56 ` Dirk Behme 0 siblings, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-11 22:24 UTC (permalink / raw) To: u-boot On 20:14 Thu 05 Feb , Dirk Behme wrote: > Dear Jean-Christophe, > > Jean-Christophe PLAGNIOL-VILLARD wrote: >> On 06:53 Mon 02 Feb , Dirk Behme wrote: >>> Add serial number based on OMAP3 die ID. >>> >>> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> >>> >>> --- >>> board/omap3/beagle/beagle.c | 2 ++ >>> board/omap3/evm/evm.c | 2 ++ >>> board/omap3/overo/overo.c | 2 ++ >>> board/omap3/pandora/pandora.c | 2 ++ >>> board/omap3/zoom1/zoom1.c | 1 + >>> cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++++++++++++++++++++ >>> include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ >>> include/asm-arm/arch-omap3/omap3.h | 1 + >>> include/asm-arm/arch-omap3/sys_proto.h | 1 + >>> 9 files changed, 51 insertions(+) >>> >>> Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >>> =================================================================== >>> --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c >>> +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >>> @@ -36,6 +36,33 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_ >>> static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; >>> static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; >>> +/***************************************************************** >>> + * serial_num_r(void) - read and set serial number based on DIE ID >>> + *****************************************************************/ >>> +void serial_num_r(void) >>> +{ >>> + ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE; >>> + char *uid_s, die_id[34]; >>> + u32 id[4]; >>> + >>> + memset(die_id, 0, sizeof(die_id)); >>> + >>> + uid_s = getenv("serial"); >> why not call a cat a cat? > > Why not give the cat a fitting name? > > The user gets a serial number, so we name it serial. How and where we > get it from is hidden from user. It wouldn't help to name it "die ID" > for user, nobody would know what this is. But serial number is clear to > every body. serial number is board specific not CPU specific when you product board and need to track then, you need to have a serial number that can not change even if you when the cpu. > >> IMHO why don't you report the die id? >>> + >>> + if (uid_s == NULL) { >>> + id[3] = readl(&id_base->die_id_0); >>> + id[2] = readl(&id_base->die_id_1); >>> + id[1] = readl(&id_base->die_id_2); >>> + id[0] = readl(&id_base->die_id_3); >>> + sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]); >>> + setenv("serial", die_id); >>> + } else { >>> + strncpy(die_id, uid_s, 34); >> why copy it? why not simply print it why do copy from a memory to an other instead of just update the pointer? Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-11 22:24 ` Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-12 18:56 ` Dirk Behme 0 siblings, 0 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-12 18:56 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 20:14 Thu 05 Feb , Dirk Behme wrote: >> Dear Jean-Christophe, >> >> Jean-Christophe PLAGNIOL-VILLARD wrote: >>> On 06:53 Mon 02 Feb , Dirk Behme wrote: >>>> Add serial number based on OMAP3 die ID. >>>> >>>> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> >>>> >>>> --- >>>> board/omap3/beagle/beagle.c | 2 ++ >>>> board/omap3/evm/evm.c | 2 ++ >>>> board/omap3/overo/overo.c | 2 ++ >>>> board/omap3/pandora/pandora.c | 2 ++ >>>> board/omap3/zoom1/zoom1.c | 1 + >>>> cpu/arm_cortexa8/omap3/sys_info.c | 27 +++++++++++++++++++++++++++ >>>> include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ >>>> include/asm-arm/arch-omap3/omap3.h | 1 + >>>> include/asm-arm/arch-omap3/sys_proto.h | 1 + >>>> 9 files changed, 51 insertions(+) >>>> >>>> Index: u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >>>> =================================================================== >>>> --- u-boot-main.orig/cpu/arm_cortexa8/omap3/sys_info.c >>>> +++ u-boot-main/cpu/arm_cortexa8/omap3/sys_info.c >>>> @@ -36,6 +36,33 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_ >>>> static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE; >>>> static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE; >>>> +/***************************************************************** >>>> + * serial_num_r(void) - read and set serial number based on DIE ID >>>> + *****************************************************************/ >>>> +void serial_num_r(void) >>>> +{ >>>> + ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE; >>>> + char *uid_s, die_id[34]; >>>> + u32 id[4]; >>>> + >>>> + memset(die_id, 0, sizeof(die_id)); >>>> + >>>> + uid_s = getenv("serial"); >>> why not call a cat a cat? >> Why not give the cat a fitting name? >> >> The user gets a serial number, so we name it serial. How and where we >> get it from is hidden from user. It wouldn't help to name it "die ID" >> for user, nobody would know what this is. But serial number is clear to >> every body. > serial number is board specific not CPU specific > > when you product board and need to track then, you need to have a serial number that > can not change even if you when the cpu. Hmmh. With OMAP3 SoC we have a (serial) number we can easily access and report independent of board similar on all OMAP3 based boards. Yes, you are right, this is no board serial number. But as OMAP3 is something like 515-pin PBGA with .4mm/.65mm pitch, board and cpu (SoC) will most probably never be split/exchanged by 'normal' user. I really hope that for OMAP3 you can accept that we report OMAP3 serial number and not (maybe even not existing) board serial number? Thanks Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme 2009-02-04 23:28 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-11 22:34 ` Wolfgang Denk 2 siblings, 0 replies; 26+ messages in thread From: Wolfgang Denk @ 2009-02-11 22:34 UTC (permalink / raw) To: u-boot Dear Dirk Behme, In message <1233554011-30084-6-git-send-email-dirk.behme@googlemail.com> you wrote: > Add serial number based on OMAP3 die ID. Sorry for the late response, but... > + setenv("serial", die_id); U-Boot uses "serial#" - please stick to the standard name, too. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Only a fool fights in a burning house. -- Kank the Klingon, "Day of the Dove", stardate unknown ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-02 5:53 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme @ 2009-02-04 23:24 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:13 ` Dirk Behme 1 sibling, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-04 23:24 UTC (permalink / raw) To: u-boot On 06:53 Mon 02 Feb , Dirk Behme wrote: > Update Pandora pin mux. for what and why? Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-04 23:24 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 19:13 ` Dirk Behme 2009-02-05 19:52 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 26+ messages in thread From: Dirk Behme @ 2009-02-05 19:13 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 06:53 Mon 02 Feb , Dirk Behme wrote: >> Update Pandora pin mux. > for what and why? Well, this is a very good example of why it is good to "use macros instead of hard coded values" :) Looking at the changes done in this patch, thanks to the macros used, it is obvious that here pulls are enabled for MMC data/cmd lines, and disabled for clock line. In case you are familiar with MMC hardware configuration, you should know why this is necessary. Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-05 19:13 ` Dirk Behme @ 2009-02-05 19:52 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 20:01 ` Dirk Behme 0 siblings, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 19:52 UTC (permalink / raw) To: u-boot On 20:13 Thu 05 Feb , Dirk Behme wrote: > Dear Jean-Christophe, > > Jean-Christophe PLAGNIOL-VILLARD wrote: >> On 06:53 Mon 02 Feb , Dirk Behme wrote: >>> Update Pandora pin mux. >> for what and why? > > Well, this is a very good example of why it is good to "use macros > instead of hard coded values" :) > > Looking at the changes done in this patch, thanks to the macros used, it > is obvious that here pulls are enabled for MMC data/cmd lines, and > disabled for clock line. In case you are familiar with MMC hardware > configuration, you should know why this is necessary. so please update the commit message to explain it Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-05 19:52 ` Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 20:01 ` Dirk Behme 2009-02-05 20:54 ` Grazvydas Ignotas 0 siblings, 1 reply; 26+ messages in thread From: Dirk Behme @ 2009-02-05 20:01 UTC (permalink / raw) To: u-boot Jean-Christophe PLAGNIOL-VILLARD wrote: > On 20:13 Thu 05 Feb , Dirk Behme wrote: >> Dear Jean-Christophe, >> >> Jean-Christophe PLAGNIOL-VILLARD wrote: >>> On 06:53 Mon 02 Feb , Dirk Behme wrote: >>>> Update Pandora pin mux. >>> for what and why? >> Well, this is a very good example of why it is good to "use macros >> instead of hard coded values" :) >> >> Looking at the changes done in this patch, thanks to the macros used, it >> is obvious that here pulls are enabled for MMC data/cmd lines, and >> disabled for clock line. In case you are familiar with MMC hardware >> configuration, you should know why this is necessary. > so please update the commit message to explain it Sorry of being unclear: I meant that every necessary explanation is already there if you look carefully. Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux 2009-02-05 20:01 ` Dirk Behme @ 2009-02-05 20:54 ` Grazvydas Ignotas 0 siblings, 0 replies; 26+ messages in thread From: Grazvydas Ignotas @ 2009-02-05 20:54 UTC (permalink / raw) To: u-boot Here is a patch with better commit message. Hope it helps. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection 2009-02-02 5:53 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 3/7] OMAP3: Add OMAP3 auto detection Dirk Behme @ 2009-02-04 23:22 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:12 ` Dirk Behme 1 sibling, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-04 23:22 UTC (permalink / raw) To: u-boot > /****************************************************************************** > + * Routine: board_identify > + * Description: Detect if we are running on a Beagle revision Ax/Bx or > + * Cx. This can be done by GPIO_171. If this is low, we are > + * running on a revision C board. > + *****************************************************************************/ > +void board_identify(void) > +{ > + gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; > + > + /* Configure GPIO 171 as input */ we may need to start to think about merge to the gpiolib to simplify it > + writel(readl(&gpio6_base->oe) | GPIO11, &gpio6_base->oe); > + > + /* Get value of GPIO 171 */ > + beagle_revision_c = readl(&gpio6_base->datain) & BOARD_REVISION_MASK; > + > + printf("Board revision "); > + if (beagle_revision_c) { ??? I'm not a fan of glabal var please create a function that will return if it's a rev c or not Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection 2009-02-04 23:22 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 19:12 ` Dirk Behme 2009-02-11 22:17 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 26+ messages in thread From: Dirk Behme @ 2009-02-05 19:12 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > >> /****************************************************************************** >> + * Routine: board_identify >> + * Description: Detect if we are running on a Beagle revision Ax/Bx or >> + * Cx. This can be done by GPIO_171. If this is low, we are >> + * running on a revision C board. >> + *****************************************************************************/ >> +void board_identify(void) >> +{ >> + gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; >> + >> + /* Configure GPIO 171 as input */ > we may need to start to think about merge to the gpiolib to simplify it >> + writel(readl(&gpio6_base->oe) | GPIO11, &gpio6_base->oe); >> + >> + /* Get value of GPIO 171 */ >> + beagle_revision_c = readl(&gpio6_base->datain) & BOARD_REVISION_MASK; >> + >> + printf("Board revision "); >> + if (beagle_revision_c) { > ??? > I'm not a fan of glabal var And I'm not a fan of bad weather. But I'm not sure if it really matters here what we are fans of? ;) > please create a function that will return if it's > a rev c or not And where should this function you propose get the info from which board revision it is? Note that we follow here (and in the serial number patch) the concept of "touch hardware only once, remember the value and then deal with the remembered value. Don't touch hardware again if done already". I.e. it's the concept behind this to not have a function to read HW (and do masking etc) again and again if revision value is needed. Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection 2009-02-05 19:12 ` Dirk Behme @ 2009-02-11 22:17 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-11 22:17 UTC (permalink / raw) To: u-boot On 20:12 Thu 05 Feb , Dirk Behme wrote: > Dear Jean-Christophe, > > Jean-Christophe PLAGNIOL-VILLARD wrote: >> >>> /****************************************************************************** >>> + * Routine: board_identify >>> + * Description: Detect if we are running on a Beagle revision Ax/Bx or >>> + * Cx. This can be done by GPIO_171. If this is low, we are >>> + * running on a revision C board. >>> + *****************************************************************************/ >>> +void board_identify(void) >>> +{ >>> + gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; >>> + >>> + /* Configure GPIO 171 as input */ >> we may need to start to think about merge to the gpiolib to simplify it >>> + writel(readl(&gpio6_base->oe) | GPIO11, &gpio6_base->oe); >>> + >>> + /* Get value of GPIO 171 */ >>> + beagle_revision_c = readl(&gpio6_base->datain) & BOARD_REVISION_MASK; >>> + >>> + printf("Board revision "); >>> + if (beagle_revision_c) { >> ??? >> I'm not a fan of glabal var > > And I'm not a fan of bad weather. But I'm not sure if it really matters > here what we are fans of? ;) global var NACK specialy when other code is not supposed to change it's value you have other clean way to do it as static var with a function to return it please change to this Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration 2009-02-02 5:53 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Dirk Behme @ 2009-02-04 23:18 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:11 ` Dirk Behme 1 sibling, 1 reply; 26+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-04 23:18 UTC (permalink / raw) To: u-boot On 06:53 Mon 02 Feb , Dirk Behme wrote: > * Make Overo GPIO114 an input for touchscreen PENDOWN > * Make Overo GPIO144-147 readable > * Make Overo EHCI pinmux match beagle rev c setup > * Adjust pinmux for SMSC911X network chip support > * Remove unnecessary GPIO setup > * Fix merge error in Makefile maybe we could split it a few more because it's not so easy to folow which modification fix what? Best Regards, J. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration 2009-02-04 23:18 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Jean-Christophe PLAGNIOL-VILLARD @ 2009-02-05 19:11 ` Dirk Behme 0 siblings, 0 replies; 26+ messages in thread From: Dirk Behme @ 2009-02-05 19:11 UTC (permalink / raw) To: u-boot Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 06:53 Mon 02 Feb , Dirk Behme wrote: >> * Make Overo GPIO114 an input for touchscreen PENDOWN >> * Make Overo GPIO144-147 readable >> * Make Overo EHCI pinmux match beagle rev c setup >> * Adjust pinmux for SMSC911X network chip support >> * Remove unnecessary GPIO setup >> * Fix merge error in Makefile > maybe we could split it a few more Yes, we could. But no, we don't want to split ~20 changed lines into even smaller parts to a) avoid spamming the list b) avoid polluting the git history > because it's not so easy to folow which modification fix what? Well, looking at the patch, I would say that it is obvious that * Make Overo GPIO114 an input for touchscreen PENDOWN refers to the change which is commented with /*GPIO_114*/\ and * Make Overo GPIO144-147 readable refers to the change with the comments GPIO_144, GPIO_145, GPIO_146 and GPIO_147 and * Make Overo EHCI pinmux match beagle rev c setup refers to the change with USB comment and * Adjust pinmux for SMSC911X network chip support refers to the change with SMSC911X comment and * Remove unnecessary GPIO setup refers to the changes which remove GPIO stuff commented e.g. with "/* Set GPIOs */" and * Fix merge error in Makefile refers to the change in Makefile +++ u-boot-main/board/omap3/overo/Makefile Dirk ^ permalink raw reply [flat|nested] 26+ messages in thread
* [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes 2009-02-02 5:53 [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Dirk Behme @ 2009-02-04 12:46 ` Jason Kridner 1 sibling, 0 replies; 26+ messages in thread From: Jason Kridner @ 2009-02-04 12:46 UTC (permalink / raw) To: u-boot On Feb 1, 2009, at 11:53 PM, Dirk Behme wrote: > OMAP3 support recently merged is version from mid december 2008. > This patch series adds some additional clean up, fixes and > improvements done since then. It brings U-Boot mainline in sync > with U-Boot tree of OMAP3 developers ("omap3-dev"). > > This patch series is against U-Boot mainline, commit > 6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd "Merge branch 'master' > of git://git.denx.de/u-boot-arm" I've reviewed these patches and have been using them for a couple of days now. No issues. Thanks. ^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2009-02-12 18:56 UTC | newest] Thread overview: 26+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-02-02 5:53 [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 3/7] OMAP3: Add OMAP3 auto detection Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Dirk Behme 2009-02-02 5:53 ` [U-Boot] [PATCH 7/7] OMAP3: Clean up MMC code Dirk Behme 2009-02-11 22:26 ` [U-Boot] [PATCH 6/7] OMAP3: Add OMAP3 core changes for MUSB Jean-Christophe PLAGNIOL-VILLARD 2009-02-12 18:56 ` Dirk Behme 2009-02-04 23:28 ` [U-Boot] [PATCH 5/7] OMAP3: Add serial number based on die ID Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:14 ` Dirk Behme 2009-02-11 22:24 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-12 18:56 ` Dirk Behme 2009-02-11 22:34 ` Wolfgang Denk 2009-02-04 23:24 ` [U-Boot] [PATCH 4/7] OMAP3: Pandora: Update pin mux Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:13 ` Dirk Behme 2009-02-05 19:52 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 20:01 ` Dirk Behme 2009-02-05 20:54 ` Grazvydas Ignotas 2009-02-04 23:22 ` [U-Boot] [PATCH 2/7] OMAP3: Beagle: Add board revision detection Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:12 ` Dirk Behme 2009-02-11 22:17 ` Jean-Christophe PLAGNIOL-VILLARD 2009-02-04 23:18 ` [U-Boot] [PATCH 1/7] OMAP3: Overo: Clean up pin mux and GPIO configuration Jean-Christophe PLAGNIOL-VILLARD 2009-02-05 19:11 ` Dirk Behme 2009-02-04 12:46 ` [U-Boot] [PATCH 0/7] OMAP3: Add some additional improvements and fixes Jason Kridner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.