qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-26 10:46:16 +02:00
Code

add-glmo-mmc.patch

Browse Source 
Moves various .h into include from drivers
Gets glamo-mmc.h working so we can detect
card ID / Size if the card is plugged in.

Adds FAT / MMC kernel source entry for GTA02 that
is first before the NAND one.  When it works it will
favour to boot off SD Card if a kernel is found there, but
right now we don't have a working filesystem parser and
partition handling hooked up.

Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green 2008-11-28 10:16:37 +00:00 committed by Andy Green
parent 9759d4e910
commit fdd6c5544b
8 changed files with 242 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qiboot/src/drivers/glamo-mmc.h → qiboot/include/glamo-mmc.h
View File

@ -122,19 +122,19 @@ struct sd_cid {
char pnm_0; /* product name */ char pnm_0; /* product name */
char oid_1; /* OEM/application ID */ char oid_1; /* OEM/application ID */
char oid_0; char oid_0;
uint8_t mid; /* manufacturer ID */ u8 mid; /* manufacturer ID */
char pnm_4; char pnm_4;
char pnm_3; char pnm_3;
char pnm_2; char pnm_2;
char pnm_1; char pnm_1;
uint8_t psn_2; /* product serial number */ u8 psn_2; /* product serial number */
uint8_t psn_1; u8 psn_1;
uint8_t psn_0; /* MSB */ u8 psn_0; /* MSB */
uint8_t prv; /* product revision */ u8 prv; /* product revision */
uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */ u8 crc; /* CRC7 checksum, b0 is unused and set to 1 */
uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */ u8 mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */
uint8_t mdt_0; /* MSB */ u8 mdt_0; /* MSB */
uint8_t psn_3; /* LSB */ u8 psn_3; /* LSB */
}; };
enum card_type { enum card_type {

4
qiboot/src/drivers/glamo-regs.h → qiboot/include/glamo-regs.h
View File

@ -98,8 +98,8 @@ enum glamo_register_generic {
GLAMO_REG_DFT_GEN3 = 0x0074, GLAMO_REG_DFT_GEN3 = 0x0074,
GLAMO_REG_DFT_GEN4 = 0x0076, GLAMO_REG_DFT_GEN4 = 0x0076,
GLAMO_REG_DFT_GEN5 = 0x01e0, GLAMO_REG_PLL_GEN6 = 0x01e0,
GLAMO_REG_DFT_GEN6 = 0x01f0, GLAMO_REG_PLL_GEN7 = 0x01f0,
}; };
#define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2)) #define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2))

459
qiboot/include/glamo_regs.h
View File

@ -1,459 +0,0 @@
#ifndef _GLAMO_REGS_H
#define _GLAMO_REGS_H
/* Smedia Glamo 336x/337x driver
*
* (C) 2007 by OpenMoko, Inc.
* Author: Harald Welte <laforge@openmoko.org>
* All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
enum glamo_regster_offsets {
GLAMO_REGOFS_GENERIC = 0x0000,
GLAMO_REGOFS_HOSTBUS = 0x0200,
GLAMO_REGOFS_MEMORY = 0x0300,
GLAMO_REGOFS_VIDCAP = 0x0400,
GLAMO_REGOFS_ISP = 0x0500,
GLAMO_REGOFS_JPEG = 0x0800,
GLAMO_REGOFS_MPEG = 0x0c00,
GLAMO_REGOFS_LCD = 0x1100,
GLAMO_REGOFS_MMC = 0x1400,
GLAMO_REGOFS_MPROC0 = 0x1500,
GLAMO_REGOFS_MPROC1 = 0x1580,
GLAMO_REGOFS_CMDQUEUE = 0x1600,
GLAMO_REGOFS_RISC = 0x1680,
GLAMO_REGOFS_2D = 0x1700,
GLAMO_REGOFS_3D = 0x1b00,
};
enum glamo_register_generic {
GLAMO_REG_GCONF1 = 0x0000,
GLAMO_REG_GCONF2 = 0x0002,
#define GLAMO_REG_DEVICE_ID GLAMO_REG_GCONF2
GLAMO_REG_GCONF3 = 0x0004,
#define GLAMO_REG_REVISION_ID GLAMO_REG_GCONF3
GLAMO_REG_IRQ_GEN1 = 0x0006,
#define GLAMO_REG_IRQ_ENABLE GLAMO_REG_IRQ_GEN1
GLAMO_REG_IRQ_GEN2 = 0x0008,
#define GLAMO_REG_IRQ_SET GLAMO_REG_IRQ_GEN2
GLAMO_REG_IRQ_GEN3 = 0x000a,
#define GLAMO_REG_IRQ_CLEAR GLAMO_REG_IRQ_GEN3
GLAMO_REG_IRQ_GEN4 = 0x000c,
#define GLAMO_REG_IRQ_STATUS GLAMO_REG_IRQ_GEN4
GLAMO_REG_CLOCK_HOST = 0x0010,
GLAMO_REG_CLOCK_MEMORY = 0x0012,
GLAMO_REG_CLOCK_LCD = 0x0014,
GLAMO_REG_CLOCK_MMC = 0x0016,
GLAMO_REG_CLOCK_ISP = 0x0018,
GLAMO_REG_CLOCK_JPEG = 0x001a,
GLAMO_REG_CLOCK_3D = 0x001c,
GLAMO_REG_CLOCK_2D = 0x001e,
GLAMO_REG_CLOCK_RISC1 = 0x0020, /* 3365 only? */
GLAMO_REG_CLOCK_RISC2 = 0x0022, /* 3365 only? */
GLAMO_REG_CLOCK_MPEG = 0x0024,
GLAMO_REG_CLOCK_MPROC = 0x0026,
GLAMO_REG_CLOCK_GEN5_1 = 0x0030,
GLAMO_REG_CLOCK_GEN5_2 = 0x0032,
GLAMO_REG_CLOCK_GEN6 = 0x0034,
GLAMO_REG_CLOCK_GEN7 = 0x0036,
GLAMO_REG_CLOCK_GEN8 = 0x0038,
GLAMO_REG_CLOCK_GEN9 = 0x003a,
GLAMO_REG_CLOCK_GEN10 = 0x003c,
GLAMO_REG_CLOCK_GEN11 = 0x003e,
GLAMO_REG_PLL_GEN1 = 0x0040,
GLAMO_REG_PLL_GEN2 = 0x0042,
GLAMO_REG_PLL_GEN3 = 0x0044,
GLAMO_REG_PLL_GEN4 = 0x0046,
GLAMO_REG_PLL_GEN5 = 0x0048,
GLAMO_REG_GPIO_GEN1 = 0x0050,
GLAMO_REG_GPIO_GEN2 = 0x0052,
GLAMO_REG_GPIO_GEN3 = 0x0054,
GLAMO_REG_GPIO_GEN4 = 0x0056,
GLAMO_REG_GPIO_GEN5 = 0x0058,
GLAMO_REG_GPIO_GEN6 = 0x005a,
GLAMO_REG_GPIO_GEN7 = 0x005c,
GLAMO_REG_GPIO_GEN8 = 0x005e,
GLAMO_REG_GPIO_GEN9 = 0x0060,
GLAMO_REG_GPIO_GEN10 = 0x0062,
GLAMO_REG_DFT_GEN1 = 0x0070,
GLAMO_REG_DFT_GEN2 = 0x0072,
GLAMO_REG_DFT_GEN3 = 0x0074,
GLAMO_REG_DFT_GEN4 = 0x0076,
GLAMO_REG_PLL_GEN6 = 0x01e0,
GLAMO_REG_PLL_GEN7 = 0x01f0,
};
enum glamo_reg_mem_dram1 {
GLAMO_MEM_DRAM1_EN_SDRAM_CLK = (1 << 11),
GLAMO_MEM_DRAM1_SELF_REFRESH = (1 << 12),
};
enum glamo_reg_mem_dram2 {
GLAMO_MEM_DRAM2_DEEP_PWRDOWN = (1 << 12),
};
enum glamo_reg_clock51 {
GLAMO_CLOCK_GEN51_EN_DIV_MCLK = 0x0001,
GLAMO_CLOCK_GEN51_EN_DIV_SCLK = 0x0002,
GLAMO_CLOCK_GEN51_EN_DIV_JCLK = 0x0004,
GLAMO_CLOCK_GEN51_EN_DIV_DCLK = 0x0008,
GLAMO_CLOCK_GEN51_EN_DIV_DMCLK = 0x0010,
GLAMO_CLOCK_GEN51_EN_DIV_DHCLK = 0x0020,
GLAMO_CLOCK_GEN51_EN_DIV_GCLK = 0x0040,
GLAMO_CLOCK_GEN51_EN_DIV_TCLK = 0x0080,
/* FIXME: higher bits */
};
enum glamo_reg_hostbus2 {
GLAMO_HOSTBUS2_MMIO_EN_ISP = 0x0001,
GLAMO_HOSTBUS2_MMIO_EN_JPEG = 0x0002,
GLAMO_HOSTBUS2_MMIO_EN_MPEG = 0x0004,
GLAMO_HOSTBUS2_MMIO_EN_LCD = 0x0008,
GLAMO_HOSTBUS2_MMIO_EN_MMC = 0x0010,
GLAMO_HOSTBUS2_MMIO_EN_MICROP0 = 0x0020,
GLAMO_HOSTBUS2_MMIO_EN_MICROP1 = 0x0040,
GLAMO_HOSTBUS2_MMIO_EN_CQ = 0x0080,
GLAMO_HOSTBUS2_MMIO_EN_RISC = 0x0100,
GLAMO_HOSTBUS2_MMIO_EN_2D = 0x0200,
GLAMO_HOSTBUS2_MMIO_EN_3D = 0x0400,
};
#define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2))
#define REG_MEM(x) (GLAMO_REGOFS_MEMORY+(x))
#define GLAMO_REG_MEM_TIMING(x) (GLAMO_REG_MEM_TIMING1-2+(x*2))
enum glamo_register_mem {
GLAMO_REG_MEM_TYPE = REG_MEM(0x00),
GLAMO_REG_MEM_GEN = REG_MEM(0x02),
GLAMO_REG_MEM_TIMING1 = REG_MEM(0x04),
GLAMO_REG_MEM_TIMING2 = REG_MEM(0x06),
GLAMO_REG_MEM_TIMING3 = REG_MEM(0x08),
GLAMO_REG_MEM_TIMING4 = REG_MEM(0x0a),
GLAMO_REG_MEM_TIMING5 = REG_MEM(0x0c),
GLAMO_REG_MEM_TIMING6 = REG_MEM(0x0e),
GLAMO_REG_MEM_TIMING7 = REG_MEM(0x10),
GLAMO_REG_MEM_TIMING8 = REG_MEM(0x12),
GLAMO_REG_MEM_TIMING9 = REG_MEM(0x14),
GLAMO_REG_MEM_TIMING10 = REG_MEM(0x16),
GLAMO_REG_MEM_TIMING11 = REG_MEM(0x18),
GLAMO_REG_MEM_POWER1 = REG_MEM(0x1a),
GLAMO_REG_MEM_POWER2 = REG_MEM(0x1c),
GLAMO_REG_MEM_LCD_BUF1 = REG_MEM(0x1e),
GLAMO_REG_MEM_LCD_BUF2 = REG_MEM(0x20),
GLAMO_REG_MEM_LCD_BUF3 = REG_MEM(0x22),
GLAMO_REG_MEM_LCD_BUF4 = REG_MEM(0x24),
GLAMO_REG_MEM_BIST1 = REG_MEM(0x26),
GLAMO_REG_MEM_BIST2 = REG_MEM(0x28),
GLAMO_REG_MEM_BIST3 = REG_MEM(0x2a),
GLAMO_REG_MEM_BIST4 = REG_MEM(0x2c),
GLAMO_REG_MEM_BIST5 = REG_MEM(0x2e),
GLAMO_REG_MEM_MAH1 = REG_MEM(0x30),
GLAMO_REG_MEM_MAH2 = REG_MEM(0x32),
GLAMO_REG_MEM_DRAM1 = REG_MEM(0x34),
GLAMO_REG_MEM_DRAM2 = REG_MEM(0x36),
GLAMO_REG_MEM_CRC = REG_MEM(0x38),
};
enum glamo_irq {
GLAMO_IRQ_HOSTBUS = 0x0001,
GLAMO_IRQ_JPEG = 0x0002,
GLAMO_IRQ_MPEG = 0x0004,
GLAMO_IRQ_MPROC1 = 0x0008,
GLAMO_IRQ_MPROC0 = 0x0010,
GLAMO_IRQ_CMDQUEUE = 0x0020,
GLAMO_IRQ_2D = 0x0040,
GLAMO_IRQ_MMC = 0x0080,
GLAMO_IRQ_RISC = 0x0100,
};
enum glamo_reg_clock_host {
GLAMO_CLOCK_HOST_DG_BCLK = 0x0001,
GLAMO_CLOCK_HOST_DG_M0CLK = 0x0004,
GLAMO_CLOCK_HOST_RESET = 0x1000,
};
enum glamo_reg_clock_mem {
GLAMO_CLOCK_MEM_DG_M1CLK = 0x0001,
GLAMO_CLOCK_MEM_EN_M1CLK = 0x0002,
GLAMO_CLOCK_MEM_DG_MOCACLK = 0x0004,
GLAMO_CLOCK_MEM_EN_MOCACLK = 0x0008,
GLAMO_CLOCK_MEM_RESET = 0x1000,
GLAMO_CLOCK_MOCA_RESET = 0x2000,
};
enum glamo_reg_clock_lcd {
GLAMO_CLOCK_LCD_DG_DCLK = 0x0001,
GLAMO_CLOCK_LCD_EN_DCLK = 0x0002,
GLAMO_CLOCK_LCD_DG_DMCLK = 0x0004,
GLAMO_CLOCK_LCD_EN_DMCLK = 0x0008,
//
GLAMO_CLOCK_LCD_EN_DHCLK = 0x0020,
GLAMO_CLOCK_LCD_DG_M5CLK = 0x0040,
GLAMO_CLOCK_LCD_EN_M5CLK = 0x0080,
GLAMO_CLOCK_LCD_RESET = 0x1000,
};
enum glamo_reg_clock_mmc {
GLAMO_CLOCK_MMC_DG_TCLK = 0x0001,
GLAMO_CLOCK_MMC_EN_TCLK = 0x0002,
GLAMO_CLOCK_MMC_DG_M9CLK = 0x0004,
GLAMO_CLOCK_MMC_EN_M9CLK = 0x0008,
GLAMO_CLOCK_MMC_RESET = 0x1000,
};
enum glamo_reg_clock_isp {
GLAMO_CLOCK_ISP_DG_I1CLK = 0x0001,
GLAMO_CLOCK_ISP_EN_I1CLK = 0x0002,
GLAMO_CLOCK_ISP_DG_CCLK = 0x0004,
GLAMO_CLOCK_ISP_EN_CCLK = 0x0008,
//
GLAMO_CLOCK_ISP_EN_SCLK = 0x0020,
GLAMO_CLOCK_ISP_DG_M2CLK = 0x0040,
GLAMO_CLOCK_ISP_EN_M2CLK = 0x0080,
GLAMO_CLOCK_ISP_DG_M15CLK = 0x0100,
GLAMO_CLOCK_ISP_EN_M15CLK = 0x0200,
GLAMO_CLOCK_ISP1_RESET = 0x1000,
GLAMO_CLOCK_ISP2_RESET = 0x2000,
};
enum glamo_reg_clock_jpeg {
GLAMO_CLOCK_JPEG_DG_JCLK = 0x0001,
GLAMO_CLOCK_JPEG_EN_JCLK = 0x0002,
GLAMO_CLOCK_JPEG_DG_M3CLK = 0x0004,
GLAMO_CLOCK_JPEG_EN_M3CLK = 0x0008,
GLAMO_CLOCK_JPEG_RESET = 0x1000,
};
enum glamo_reg_clock_3d {
GLAMO_CLOCK_3D_DG_GCLK = 0x0001,
GLAMO_CLOCK_3D_EN_GCLK = 0x0002,
GLAMO_CLOCK_3D_DG_M7CLK = 0x0004,
GLAMO_CLOCK_3D_EN_M7CLK = 0x0008,
GLAMO_CLOCK_3D_DG_M6CLK = 0x0010,
GLAMO_CLOCK_3D_EN_M6CLK = 0x0020,
GLAMO_CLOCK_3D_2D_RESET = 0x1000,
GLAMO_CLOCK_3D_CQ_RESET = 0x2000,
};
enum glamo_reg_clock_mpeg {
GLAMO_CLOCK_MPEG_DG_X0CLK = 0x0001,
GLAMO_CLOCK_MPEG_EN_X0CLK = 0x0002,
GLAMO_CLOCK_MPEG_DG_X1CLK = 0x0004,
GLAMO_CLOCK_MPEG_EN_X1CLK = 0x0008,
GLAMO_CLOCK_MPEG_DG_X2CLK = 0x0010,
GLAMO_CLOCK_MPEG_EN_X2CLK = 0x0020,
GLAMO_CLOCK_MPEG_DG_X3CLK = 0x0040,
GLAMO_CLOCK_MPEG_EN_X3CLK = 0x0080,
GLAMO_CLOCK_MPEG_DG_X4CLK = 0x0100,
GLAMO_CLOCK_MPEG_EN_X4CLK = 0x0200,
GLAMO_CLOCK_MPEG_DG_X6CLK = 0x0400,
GLAMO_CLOCK_MPEG_EN_X6CLK = 0x0800,
GLAMO_CLOCK_MPEG_ENC_RESET = 0x1000,
GLAMO_CLOCK_MPEG_DEC_RESET = 0x2000,
};
/* LCD Controller */
#define REG_LCD(x) (x)
enum glamo_reg_lcd {
GLAMO_REG_LCD_MODE1 = REG_LCD(0x00),
GLAMO_REG_LCD_MODE2 = REG_LCD(0x02),
GLAMO_REG_LCD_MODE3 = REG_LCD(0x04),
GLAMO_REG_LCD_WIDTH = REG_LCD(0x06),
GLAMO_REG_LCD_HEIGHT = REG_LCD(0x08),
GLAMO_REG_LCD_POLARITY = REG_LCD(0x0a),
GLAMO_REG_LCD_A_BASE1 = REG_LCD(0x0c),
GLAMO_REG_LCD_A_BASE2 = REG_LCD(0x0e),
GLAMO_REG_LCD_B_BASE1 = REG_LCD(0x10),
GLAMO_REG_LCD_B_BASE2 = REG_LCD(0x12),
GLAMO_REG_LCD_C_BASE1 = REG_LCD(0x14),
GLAMO_REG_LCD_C_BASE2 = REG_LCD(0x16),
GLAMO_REG_LCD_PITCH = REG_LCD(0x18),
/* RES */
GLAMO_REG_LCD_HORIZ_TOTAL = REG_LCD(0x1c),
/* RES */
GLAMO_REG_LCD_HORIZ_RETR_START = REG_LCD(0x20),
/* RES */
GLAMO_REG_LCD_HORIZ_RETR_END = REG_LCD(0x24),
/* RES */
GLAMO_REG_LCD_HORIZ_DISP_START = REG_LCD(0x28),
/* RES */
GLAMO_REG_LCD_HORIZ_DISP_END = REG_LCD(0x2c),
/* RES */
GLAMO_REG_LCD_VERT_TOTAL = REG_LCD(0x30),
/* RES */
GLAMO_REG_LCD_VERT_RETR_START = REG_LCD(0x34),
/* RES */
GLAMO_REG_LCD_VERT_RETR_END = REG_LCD(0x38),
/* RES */
GLAMO_REG_LCD_VERT_DISP_START = REG_LCD(0x3c),
/* RES */
GLAMO_REG_LCD_VERT_DISP_END = REG_LCD(0x40),
/* RES */
GLAMO_REG_LCD_POL = REG_LCD(0x44),
GLAMO_REG_LCD_DATA_START = REG_LCD(0x46),
GLAMO_REG_LCD_FRATE_CONTRO = REG_LCD(0x48),
GLAMO_REG_LCD_DATA_CMD_HDR = REG_LCD(0x4a),
GLAMO_REG_LCD_SP_START = REG_LCD(0x4c),
GLAMO_REG_LCD_SP_END = REG_LCD(0x4e),
GLAMO_REG_LCD_CURSOR_BASE1 = REG_LCD(0x50),
GLAMO_REG_LCD_CURSOR_BASE2 = REG_LCD(0x52),
GLAMO_REG_LCD_CURSOR_PITCH = REG_LCD(0x54),
GLAMO_REG_LCD_CURSOR_X_SIZE = REG_LCD(0x56),
GLAMO_REG_LCD_CURSOR_Y_SIZE = REG_LCD(0x58),
GLAMO_REG_LCD_CURSOR_X_POS = REG_LCD(0x5a),
GLAMO_REG_LCD_CURSOR_Y_POS = REG_LCD(0x5c),
GLAMO_REG_LCD_CURSOR_PRESET = REG_LCD(0x5e),
GLAMO_REG_LCD_CURSOR_FG_COLOR = REG_LCD(0x60),
/* RES */
GLAMO_REG_LCD_CURSOR_BG_COLOR = REG_LCD(0x64),
/* RES */
GLAMO_REG_LCD_CURSOR_DST_COLOR = REG_LCD(0x68),
/* RES */
GLAMO_REG_LCD_STATUS1 = REG_LCD(0x80),
GLAMO_REG_LCD_STATUS2 = REG_LCD(0x82),
GLAMO_REG_LCD_STATUS3 = REG_LCD(0x84),
GLAMO_REG_LCD_STATUS4 = REG_LCD(0x86),
/* RES */
GLAMO_REG_LCD_COMMAND1 = REG_LCD(0xa0),
GLAMO_REG_LCD_COMMAND2 = REG_LCD(0xa2),
/* RES */
GLAMO_REG_LCD_WFORM_DELAY1 = REG_LCD(0xb0),
GLAMO_REG_LCD_WFORM_DELAY2 = REG_LCD(0xb2),
/* RES */
GLAMO_REG_LCD_GAMMA_CORR = REG_LCD(0x100),
/* RES */
GLAMO_REG_LCD_GAMMA_R_ENTRY01 = REG_LCD(0x110),
GLAMO_REG_LCD_GAMMA_R_ENTRY23 = REG_LCD(0x112),
GLAMO_REG_LCD_GAMMA_R_ENTRY45 = REG_LCD(0x114),
GLAMO_REG_LCD_GAMMA_R_ENTRY67 = REG_LCD(0x116),
GLAMO_REG_LCD_GAMMA_R_ENTRY8 = REG_LCD(0x118),
/* RES */
GLAMO_REG_LCD_GAMMA_G_ENTRY01 = REG_LCD(0x130),
GLAMO_REG_LCD_GAMMA_G_ENTRY23 = REG_LCD(0x132),
GLAMO_REG_LCD_GAMMA_G_ENTRY45 = REG_LCD(0x134),
GLAMO_REG_LCD_GAMMA_G_ENTRY67 = REG_LCD(0x136),
GLAMO_REG_LCD_GAMMA_G_ENTRY8 = REG_LCD(0x138),
/* RES */
GLAMO_REG_LCD_GAMMA_B_ENTRY01 = REG_LCD(0x150),
GLAMO_REG_LCD_GAMMA_B_ENTRY23 = REG_LCD(0x152),
GLAMO_REG_LCD_GAMMA_B_ENTRY45 = REG_LCD(0x154),
GLAMO_REG_LCD_GAMMA_B_ENTRY67 = REG_LCD(0x156),
GLAMO_REG_LCD_GAMMA_B_ENTRY8 = REG_LCD(0x158),
/* RES */
GLAMO_REG_LCD_SRAM_DRIVING1 = REG_LCD(0x160),
GLAMO_REG_LCD_SRAM_DRIVING2 = REG_LCD(0x162),
GLAMO_REG_LCD_SRAM_DRIVING3 = REG_LCD(0x164),
};
enum glamo_reg_lcd_mode1 {
GLAMO_LCD_MODE1_PWRSAVE = 0x0001,
GLAMO_LCD_MODE1_PARTIAL_PRT = 0x0002,
GLAMO_LCD_MODE1_HWFLIP = 0x0004,
GLAMO_LCD_MODE1_LCD2 = 0x0008,
/* RES */
GLAMO_LCD_MODE1_PARTIAL_MODE = 0x0020,
GLAMO_LCD_MODE1_CURSOR_DSTCOLOR = 0x0040,
GLAMO_LCD_MODE1_PARTIAL_ENABLE = 0x0080,
GLAMO_LCD_MODE1_TVCLK_IN_ENABLE = 0x0100,
GLAMO_LCD_MODE1_HSYNC_HIGH_ACT = 0x0200,
GLAMO_LCD_MODE1_VSYNC_HIGH_ACT = 0x0400,
GLAMO_LCD_MODE1_HSYNC_FLIP = 0x0800,
GLAMO_LCD_MODE1_GAMMA_COR_EN = 0x1000,
GLAMO_LCD_MODE1_DITHER_EN = 0x2000,
GLAMO_LCD_MODE1_CURSOR_EN = 0x4000,
GLAMO_LCD_MODE1_ROTATE_EN = 0x8000,
};
enum glamo_reg_lcd_mode2 {
GLAMO_LCD_MODE2_CRC_CHECK_EN = 0x0001,
GLAMO_LCD_MODE2_DCMD_PER_LINE = 0x0002,
GLAMO_LCD_MODE2_NOUSE_BDEF = 0x0004,
GLAMO_LCD_MODE2_OUT_POS_MODE = 0x0008,
GLAMO_LCD_MODE2_FRATE_CTRL_EN = 0x0010,
GLAMO_LCD_MODE2_SINGLE_BUFFER = 0x0020,
GLAMO_LCD_MODE2_SER_LSB_TO_MSB = 0x0040,
/* FIXME */
};
enum glamo_reg_lcd_mode3 {
/* LCD color source data format */
GLAMO_LCD_SRC_RGB565 = 0x0000,
GLAMO_LCD_SRC_ARGB1555 = 0x4000,
GLAMO_LCD_SRC_ARGB4444 = 0x8000,
/* interface type */
GLAMO_LCD_MODE3_LCD = 0x1000,
GLAMO_LCD_MODE3_RGB = 0x0800,
GLAMO_LCD_MODE3_CPU = 0x0000,
/* mode */
GLAMO_LCD_MODE3_RGB332 = 0x0000,
GLAMO_LCD_MODE3_RGB444 = 0x0100,
GLAMO_LCD_MODE3_RGB565 = 0x0200,
GLAMO_LCD_MODE3_RGB666 = 0x0300,
/* depth */
GLAMO_LCD_MODE3_6BITS = 0x0000,
GLAMO_LCD_MODE3_8BITS = 0x0010,
GLAMO_LCD_MODE3_9BITS = 0x0020,
GLAMO_LCD_MODE3_16BITS = 0x0030,
GLAMO_LCD_MODE3_18BITS = 0x0040,
};
enum glamo_lcd_cmd_type {
GLAMO_LCD_CMD_TYPE_DISP = 0x0000,
GLAMO_LCD_CMD_TYPE_PARALLEL = 0x4000,
GLAMO_LCD_CMD_TYPE_SERIAL = 0x8000,
GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000,
};
#define GLAMO_LCD_CMD_TYPE_MASK 0xc000
enum glamo_lcd_cmds {
GLAMO_LCD_CMD_DATA_DISP_FIRE = 0x00,
GLAMO_LCD_CMD_DATA_DISP_SYNC = 0x01, /* RGB only */
/* switch to command mode, no display */
GLAMO_LCD_CMD_DATA_FIRE_NO_DISP = 0x02,
/* display until VSYNC, switch to command */
GLAMO_LCD_CMD_DATA_FIRE_VSYNC = 0x11,
/* display until HSYNC, switch to command */
GLAMO_LCD_CMD_DATA_FIRE_HSYNC = 0x12,
/* display until VSYNC, 1 black frame, VSYNC, switch to command */
GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B = 0x13,
/* don't care about display and switch to command */
GLAMO_LCD_CMD_DATA_FIRE_FREE = 0x14, /* RGB only */
/* don't care about display, keep data display but disable data,
* and switch to command */
GLAMO_LCD_CMD_DATA_FIRE_FREE_D = 0x15, /* RGB only */
};
enum glamo_reg_clock_2d {
GLAMO_CLOCK_2D_DG_GCLK = 0x0001,
GLAMO_CLOCK_2D_EN_GCLK = 0x0002,
GLAMO_CLOCK_2D_DG_M7CLK = 0x0004,
GLAMO_CLOCK_2D_EN_M7CLK = 0x0008,
GLAMO_CLOCK_2D_DG_M6CLK = 0x0010,
GLAMO_CLOCK_2D_EN_M6CLK = 0x0020,
GLAMO_CLOCK_2D_RESET = 0x1000,
GLAMO_CLOCK_2D_CQ_RESET = 0x2000,
};
#endif /* _GLAMO_REGS_H */

110
qiboot/include/mmc.h Normal file
View File

@ -0,0 +1,110 @@
/*
* linux/drivers/mmc/mmc_pxa.h
*
* Author: Vladimir Shebordaev, Igor Oblakov
* Copyright: MontaVista Software Inc.
*
* $Id: mmc_pxa.h,v 0.3.1.6 2002/09/25 19:25:48 ted Exp ted $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __MMC_PXA_P_H__
#define __MMC_PXA_P_H__
#define MMC_DEFAULT_RCA (1<<16)
#define MMC_BLOCK_SIZE 512
#define MMC_CMD_RESET 0
#define MMC_CMD_SEND_OP_COND 1
#define MMC_CMD_ALL_SEND_CID 2
#define MMC_CMD_SET_RCA 3
#define MMC_CMD_SELECT_CARD 7
#define MMC_CMD_SEND_CSD 9
#define MMC_CMD_SEND_CID 10
#define MMC_CMD_SEND_STATUS 13
#define MMC_CMD_SET_BLOCKLEN 16
#define MMC_CMD_READ_BLOCK 17
#define MMC_CMD_RD_BLK_MULTI 18
#define MMC_CMD_WRITE_BLOCK 24
#define MMC_MAX_BLOCK_SIZE 512
#define MMC_R1_IDLE_STATE 0x01
#define MMC_R1_ERASE_STATE 0x02
#define MMC_R1_ILLEGAL_CMD 0x04
#define MMC_R1_COM_CRC_ERR 0x08
#define MMC_R1_ERASE_SEQ_ERR 0x01
#define MMC_R1_ADDR_ERR 0x02
#define MMC_R1_PARAM_ERR 0x04
#define MMC_R1B_WP_ERASE_SKIP 0x0002
#define MMC_R1B_ERR 0x0004
#define MMC_R1B_CC_ERR 0x0008
#define MMC_R1B_CARD_ECC_ERR 0x0010
#define MMC_R1B_WP_VIOLATION 0x0020
#define MMC_R1B_ERASE_PARAM 0x0040
#define MMC_R1B_OOR 0x0080
#define MMC_R1B_IDLE_STATE 0x0100
#define MMC_R1B_ERASE_RESET 0x0200
#define MMC_R1B_ILLEGAL_CMD 0x0400
#define MMC_R1B_COM_CRC_ERR 0x0800
#define MMC_R1B_ERASE_SEQ_ERR 0x1000
#define MMC_R1B_ADDR_ERR 0x2000
#define MMC_R1B_PARAM_ERR 0x4000
typedef struct mmc_cid
{
/* FIXME: BYTE_ORDER */
u8 year:4,
month:4;
u8 sn[3];
u8 fwrev:4,
hwrev:4;
u8 name[6];
u8 id[3];
} mmc_cid_t;
typedef struct mmc_csd
{
u8 ecc:2,
file_format:2,
tmp_write_protect:1,
perm_write_protect:1,
copy:1,
file_format_grp:1;
unsigned long long content_prot_app:1,
rsvd3:4,
write_bl_partial:1,
write_bl_len:4,
r2w_factor:3,
default_ecc:2,
wp_grp_enable:1,
wp_grp_size:5,
erase_grp_mult:5,
erase_grp_size:5,
c_size_mult1:3,
vdd_w_curr_max:3,
vdd_w_curr_min:3,
vdd_r_curr_max:3,
vdd_r_curr_min:3,
c_size:12,
rsvd2:2,
dsr_imp:1,
read_blk_misalign:1,
write_blk_misalign:1,
read_bl_partial:1;
u16 read_bl_len:4,
ccc:12;
u8 tran_speed;
u8 nsac;
u8 taac;
u8 rsvd1:2,
spec_vers:4,
csd_structure:2;
} mmc_csd_t;
#endif /* __MMC_PXA_P_H__ */

1
qiboot/include/qi.h
View File

@ -80,6 +80,7 @@ int printk(const char *fmt, ...);
int vsprintf(char *buf, const char *fmt, va_list args); int vsprintf(char *buf, const char *fmt, va_list args);
int puts(const char *string); int puts(const char *string);
void printhex(unsigned char v); void printhex(unsigned char v);
void print8(unsigned char u);
void print32(unsigned int u); void print32(unsigned int u);
void hexdump(unsigned char *start, int len); void hexdump(unsigned char *start, int len);
unsigned int _ntohl(unsigned int n); unsigned int _ntohl(unsigned int n);

208
qiboot/src/drivers/glamo-mmc.c
View File

@ -25,22 +25,15 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#if 0 #include <qi.h>
#include <config.h>
#include <common.h>
#include <mmc.h> #include <mmc.h>
#include <asm/errno.h>
#include <asm/io.h>
#include <part.h>
#include <fat.h>
#include <pcf50633.h>
#include "glamo-regs.h" #include <glamo-regs.h>
#include "glamo-mmc.h" #include <glamo-mmc.h>
#define CONFIG_GLAMO_BASE 0x08000000
#define MMC_BLOCK_SIZE_BITS 9 #define MMC_BLOCK_SIZE_BITS 9
#define MMC_BLOCK_SIZE (1 << MMC_BLOCK_SIZE_BITS)
#define GLAMO_REG(x) (*(volatile u16 *)(CONFIG_GLAMO_BASE + x)) #define GLAMO_REG(x) (*(volatile u16 *)(CONFIG_GLAMO_BASE + x))
#define GLAMO_INTRAM_OFFSET (8 * 1024 * 1024) #define GLAMO_INTRAM_OFFSET (8 * 1024 * 1024)
@ -49,25 +42,29 @@
GLAMO_INTRAM_OFFSET + GLAMO_FB_SIZE)) GLAMO_INTRAM_OFFSET + GLAMO_FB_SIZE))
static int ccnt; static int ccnt;
static block_dev_desc_t mmc_dev; //static mmc_csd_t mmc_csd;
static mmc_csd_t mmc_csd;
static int mmc_ready = 0; static int mmc_ready = 0;
static int wide = 0; //static int wide = 0;
static enum card_type card_type = CARDTYPE_NONE; static enum card_type card_type = CARDTYPE_NONE;
block_dev_desc_t * mmc_get_dev(int dev) int mmc_read(unsigned long src, u8 *dst, int size);
int q;
void udelay(int n)
{ {
return (block_dev_desc_t *)&mmc_dev; while (n--)
q+=n * q;
} }
static void static void
glamo_reg_write(u_int16_t val, u_int16_t reg) glamo_reg_write(u16 val, u16 reg)
{ {
GLAMO_REG(reg) = val; GLAMO_REG(reg) = val;
} }
static u_int16_t static u16
glamo_reg_read(u_int16_t reg) glamo_reg_read(u16 reg)
{ {
return GLAMO_REG(reg); return GLAMO_REG(reg);
} }
@ -89,9 +86,10 @@ unsigned char CRC7(u8 * pu8, int cnt)
return (crc << 1) | 1; return (crc << 1) | 1;
} }
ulong mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst) unsigned long mmc_bread(int dev_num, unsigned long blknr, unsigned long blkcnt,
void *dst)
{ {
ulong src = blknr * MMC_BLOCK_SIZE; unsigned long src = blknr * MMC_BLOCK_SIZE;
if (!blkcnt) if (!blkcnt)
return 0; return 0;
@ -103,7 +101,7 @@ ulong mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code /* MMC_DEFAULT_RCA should probably be just 1, but this may break other code
that expects it to be shifted. */ that expects it to be shifted. */
static u_int16_t rca = MMC_DEFAULT_RCA >> 16; static u16 rca = MMC_DEFAULT_RCA >> 16;
static void do_pio_read(u16 *buf, int count_words) static void do_pio_read(u16 *buf, int count_words)
{ {
@ -160,7 +158,7 @@ static int mmc_cmd(int opcode, int arg, int flags,
GLAMO_REGOFS_MMC + GLAMO_REG_MMC_WDATADS1); GLAMO_REGOFS_MMC + GLAMO_REG_MMC_WDATADS1);
glamo_reg_write((u16)(GLAMO_FB_SIZE >> 16), glamo_reg_write((u16)(GLAMO_FB_SIZE >> 16),
GLAMO_REGOFS_MMC + GLAMO_REG_MMC_WDATADS2); GLAMO_REGOFS_MMC + GLAMO_REG_MMC_WDATADS2);
glamo_reg_write((u16)GLAMO_FB_SIZE, glamo_reg_write((u16)GLAMO_FB_/*SIZE*/,
GLAMO_REGOFS_MMC + GLAMO_REG_MMC_RDATADS1); GLAMO_REGOFS_MMC + GLAMO_REG_MMC_RDATADS1);
glamo_reg_write((u16)(GLAMO_FB_SIZE >> 16), glamo_reg_write((u16)(GLAMO_FB_SIZE >> 16),
GLAMO_REGOFS_MMC + GLAMO_REG_MMC_RDATADS2); GLAMO_REGOFS_MMC + GLAMO_REG_MMC_RDATADS2);
@ -318,8 +316,12 @@ static int mmc_cmd(int opcode, int arg, int flags,
return 0; return 0;
if (error) { if (error) {
printf("cmd 0x%x, arg 0x%x flags 0x%x\n", opcode, arg, flags); // printf("cmd 0x%x, arg 0x%x flags 0x%x\n", opcode, arg, flags);
printf("Error after cmd: 0x%x\n", error); #if 0
puts("Error after cmd: 0x");
print32(error);
puts("\n");
#endif
goto done; goto done;
} }
/* /*
@ -357,8 +359,12 @@ static int mmc_cmd(int opcode, int arg, int flags,
if (status & GLAMO_STAT1_MMC_RTOUT) if (status & GLAMO_STAT1_MMC_RTOUT)
error = -5; error = -5;
if (error) { if (error) {
printf("cmd 0x%x, arg 0x%x flags 0x%x\n", opcode, arg, flags); // printf("cmd 0x%x, arg 0x%x flags 0x%x\n", opcode, arg, flags);
printf("Error after resp: 0x%x\n", status); #if 0
puts("Error after resp: 0x");
print32(status);
puts("\n");
#endif
goto done; goto done;
} }
#if 0 #if 0
@ -386,7 +392,6 @@ static void glamo_mci_reset(void)
GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK | GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
GLAMO_CLOCK_MMC_EN_M9CLK, GLAMO_CLOCK_MMC_EN_M9CLK,
GLAMO_REG_CLOCK_MMC); GLAMO_REG_CLOCK_MMC);
udelay(100000);
/* and disable reset */ /* and disable reset */
glamo_reg_write(GLAMO_CLOCK_MMC_DG_TCLK | glamo_reg_write(GLAMO_CLOCK_MMC_DG_TCLK |
GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK | GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
@ -395,30 +400,21 @@ static void glamo_mci_reset(void)
} }
static u_int8_t ldo_voltage(unsigned int millivolts)
{
if (millivolts < 900)
return 0;
else if (millivolts > 3600)
return 0x1f;
millivolts -= 900; int mmc_read(unsigned long src, u8 *dst, int size)
return millivolts / 100;
}
int mmc_read(ulong src, uchar *dst, int size)
{ {
int resp; int resp;
u8 response[16]; u8 response[16];
int size_original = size; int size_original = size;
if ((!size) || (size & (MMC_BLOCK_SIZE - 1))) { if ((!size) || (size & (MMC_BLOCK_SIZE - 1))) {
printf("Bad size %d\n", size); puts("Bad size 0x");
print32(size);
return 0; return 0;
} }
if (((int)dst) & 1) { if (((int)dst) & 1) {
printf("Bad align on dst\n"); puts("Bad align on dst\n");
return 0; return 0;
} }
@ -454,19 +450,20 @@ int mmc_read(ulong src, uchar *dst, int size)
return size_original; return size_original;
} }
int mmc_write(uchar *src, ulong dst, int size) int mmc_write(u8 *src, unsigned long dst, int size)
{ {
int resp; int resp;
u8 response[16]; u8 response[16];
int size_original = size; int size_original = size;
if ((!size) || (size & (MMC_BLOCK_SIZE - 1))) { if ((!size) || (size & (MMC_BLOCK_SIZE - 1))) {
printf("Bad size %d\n", size); puts("Bad size 0x");
print32(size);
return 0; return 0;
} }
if (((int)dst) & 1) { if (((int)dst) & 1) {
printf("Bad align on dst\n"); puts("Bad align on dst\n");
return 0; return 0;
} }
@ -503,40 +500,46 @@ int mmc_write(uchar *src, ulong dst, int size)
return size_original; return size_original;
} }
#if 0
static void print_mmc_cid(mmc_cid_t *cid) static void print_mmc_cid(mmc_cid_t *cid)
{ {
printf("MMC found. Card desciption is:\n"); puts("MMC found. Card desciption is:\n");
printf("Manufacturer ID = %02x%02x%02x\n", puts("Manufacturer ID = ");
cid->id[0], cid->id[1], cid->id[2]); print8(cid->id[0]);
printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev); print8(cid->id[1]);
cid->hwrev = cid->fwrev = 0; /* null terminate string */ print8(cid->id[2]);
printf("Product Name = %s\n",cid->name); /*
puts("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
cid->hwrev = cid->fwrev = 0;
puts("Product Name = %s\n",cid->name);
printf("Serial Number = %02x%02x%02x\n", printf("Serial Number = %02x%02x%02x\n",
cid->sn[0], cid->sn[1], cid->sn[2]); cid->sn[0], cid->sn[1], cid->sn[2]);
printf("Month = %d\n",cid->month); printf("Month = %d\n",cid->month);
printf("Year = %d\n",1997 + cid->year); printf("Year = %d\n",1997 + cid->year);
*/
} }
#endif
static void print_sd_cid(const struct sd_cid *cid) static void print_sd_cid(const struct sd_cid *cid)
{ {
printf("Card Type: "); puts("Card Type: ");
switch (card_type) { switch (card_type) {
case CARDTYPE_NONE: case CARDTYPE_NONE:
printf("(None)\n"); puts("(None)\n");
break; break;
case CARDTYPE_MMC: case CARDTYPE_MMC:
printf("MMC\n"); puts("MMC\n");
break; break;
case CARDTYPE_SD: case CARDTYPE_SD:
printf("SD\n"); puts("SD\n");
break; break;
case CARDTYPE_SD20: case CARDTYPE_SD20:
printf("SD 2.0\n"); puts("SD 2.0\n");
break; break;
case CARDTYPE_SDHC: case CARDTYPE_SDHC:
printf("SD 2.0 SDHC\n"); puts("SD 2.0 SDHC\n");
break; break;
} }
#if 0
printf("Manufacturer: 0x%02x, OEM \"%c%c\"\n", printf("Manufacturer: 0x%02x, OEM \"%c%c\"\n",
cid->mid, cid->oid_0, cid->oid_1); cid->mid, cid->oid_0, cid->oid_1);
printf("Product name: \"%c%c%c%c%c\", revision %d.%d\n", printf("Product name: \"%c%c%c%c%c\", revision %d.%d\n",
@ -548,6 +551,7 @@ static void print_sd_cid(const struct sd_cid *cid)
printf("Manufacturing date: %d/%d\n", printf("Manufacturing date: %d/%d\n",
cid->mdt_1 & 15, cid->mdt_1 & 15,
2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4)); 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
#endif
/* printf("CRC: 0x%02x, b0 = %d\n", /* printf("CRC: 0x%02x, b0 = %d\n",
cid->crc >> 1, cid->crc & 1); */ cid->crc >> 1, cid->crc & 1); */
} }
@ -555,11 +559,11 @@ static void print_sd_cid(const struct sd_cid *cid)
int mmc_init(int verbose) int mmc_init(int verbose)
{ {
int retries = 14, rc = -ENODEV; int retries = 14, rc = -1;
int resp; int resp;
u8 response[16]; u8 response[16];
mmc_cid_t *mmc_cid = (mmc_cid_t *)response; // mmc_cid_t *mmc_cid = (mmc_cid_t *)response;
struct sd_cid *sd_cid = (struct sd_cid *)response; // struct sd_cid *sd_cid = (struct sd_cid *)response;
u32 hcs = 0; u32 hcs = 0;
card_type = CARDTYPE_NONE; card_type = CARDTYPE_NONE;
@ -577,14 +581,6 @@ int mmc_init(int verbose)
glamo_mci_reset(); glamo_mci_reset();
/* power the sdcard slot */
pcf50633_reg_write(PCF50633_REG_HCLDOOUT, ldo_voltage(3300));
udelay(10000);
pcf50633_reg_write(PCF50633_REG_HCLDOOUT + 1,
pcf50633_reg_read(PCF50633_REG_HCLDOOUT + 1) | 1); /* on */
udelay(10000);
/* start the clock -- slowly (50MHz / 250 == 195kHz */ /* start the clock -- slowly (50MHz / 250 == 195kHz */
glamo_reg_write((glamo_reg_read(GLAMO_REG_CLOCK_GEN8) & 0xff00) | 250, glamo_reg_write((glamo_reg_read(GLAMO_REG_CLOCK_GEN8) & 0xff00) | 250,
@ -613,6 +609,7 @@ int mmc_init(int verbose)
udelay(100000); udelay(100000);
udelay(100000); udelay(100000);
udelay(100000); udelay(100000);
udelay(100000);
/* SDHC card? */ /* SDHC card? */
@ -629,6 +626,7 @@ int mmc_init(int verbose)
while (retries--) { while (retries--) {
udelay(100000); udelay(100000);
udelay(100000);
resp = mmc_cmd(MMC_APP_CMD, 0x00000000, resp = mmc_cmd(MMC_APP_CMD, 0x00000000,
MMC_CMD_AC | MMC_RSP_R1, 0, 0, 0, MMC_CMD_AC | MMC_RSP_R1, 0, 0, 0,
@ -650,17 +648,18 @@ int mmc_init(int verbose)
break; break;
} }
} }
if (retries < 0) if (retries < 0) {
puts("no response\n");
return 1; return 1;
}
if (card_type == CARDTYPE_NONE) { if (card_type == CARDTYPE_NONE) {
retries = 10; retries = 10;
printf("failed to detect SD Card, trying MMC\n"); puts("failed to detect SD Card, trying MMC\n");
do { do {
resp = mmc_cmd(MMC_SEND_OP_COND, 0x00ffc000, resp = mmc_cmd(MMC_SEND_OP_COND, 0x00ffc000,
MMC_CMD_BCR | MMC_RSP_R3, 0, 0, 0, MMC_CMD_BCR | MMC_RSP_R3, 0, 0, 0,
(u16 *)&response[0]); (u16 *)&response[0]);
debug("resp %x %x\n", response[0], response[1]);
udelay(50); udelay(50);
} while (retries-- && !(response[3] & 0x80)); } while (retries-- && !(response[3] & 0x80));
if (retries >= 0) if (retries >= 0)
@ -670,6 +669,7 @@ int mmc_init(int verbose)
} }
/* fill in device description */ /* fill in device description */
#if 0
mmc_dev.if_type = IF_TYPE_MMC; mmc_dev.if_type = IF_TYPE_MMC;
mmc_dev.part_type = PART_TYPE_DOS; mmc_dev.part_type = PART_TYPE_DOS;
mmc_dev.dev = 0; mmc_dev.dev = 0;
@ -679,7 +679,7 @@ int mmc_init(int verbose)
mmc_dev.block_read = mmc_bread; mmc_dev.block_read = mmc_bread;
mmc_dev.blksz = 512; mmc_dev.blksz = 512;
mmc_dev.lba = 1 << 16; /* 64K x 512 blocks = 32MB default */ mmc_dev.lba = 1 << 16; /* 64K x 512 blocks = 32MB default */
#endif
/* try to get card id */ /* try to get card id */
resp = mmc_cmd(MMC_ALL_SEND_CID, hcs, resp = mmc_cmd(MMC_ALL_SEND_CID, hcs,
MMC_CMD_BCR | MMC_RSP_R2, 0, 0, 0, MMC_CMD_BCR | MMC_RSP_R2, 0, 0, 0,
@ -691,7 +691,7 @@ int mmc_init(int verbose)
case CARDTYPE_MMC: case CARDTYPE_MMC:
/* TODO configure mmc driver depending on card /* TODO configure mmc driver depending on card
attributes */ attributes */
#if 0
if (verbose) if (verbose)
print_mmc_cid(mmc_cid); print_mmc_cid(mmc_cid);
sprintf((char *) mmc_dev.vendor, sprintf((char *) mmc_dev.vendor,
@ -701,7 +701,7 @@ int mmc_init(int verbose)
sprintf((char *) mmc_dev.product, "%s", mmc_cid->name); sprintf((char *) mmc_dev.product, "%s", mmc_cid->name);
sprintf((char *) mmc_dev.revision, "%x %x", sprintf((char *) mmc_dev.revision, "%x %x",
mmc_cid->hwrev, mmc_cid->fwrev); mmc_cid->hwrev, mmc_cid->fwrev);
#endif
/* MMC exists, get CSD too */ /* MMC exists, get CSD too */
resp = mmc_cmd(MMC_SET_RELATIVE_ADDR, MMC_DEFAULT_RCA, resp = mmc_cmd(MMC_SET_RELATIVE_ADDR, MMC_DEFAULT_RCA,
MMC_CMD_AC | MMC_RSP_R1, 0, 0, 0, MMC_CMD_AC | MMC_RSP_R1, 0, 0, 0,
@ -713,6 +713,7 @@ int mmc_init(int verbose)
case CARDTYPE_SDHC: case CARDTYPE_SDHC:
if (verbose) if (verbose)
print_sd_cid(sd_cid); print_sd_cid(sd_cid);
#if 0
sprintf((char *) mmc_dev.vendor, sprintf((char *) mmc_dev.vendor,
"Man %02 OEM %c%c \"%c%c%c%c%c\"", "Man %02 OEM %c%c \"%c%c%c%c%c\"",
sd_cid->mid, sd_cid->oid_0, sd_cid->oid_1, sd_cid->mid, sd_cid->oid_0, sd_cid->oid_1,
@ -723,7 +724,7 @@ int mmc_init(int verbose)
sd_cid->psn_2 << 8 | sd_cid->psn_3); sd_cid->psn_2 << 8 | sd_cid->psn_3);
sprintf((char *) mmc_dev.revision, "%d.%d", sprintf((char *) mmc_dev.revision, "%d.%d",
sd_cid->prv >> 4, sd_cid->prv & 15); sd_cid->prv >> 4, sd_cid->prv & 15);
#endif
resp = mmc_cmd(SD_SEND_RELATIVE_ADDR, MMC_DEFAULT_RCA, resp = mmc_cmd(SD_SEND_RELATIVE_ADDR, MMC_DEFAULT_RCA,
MMC_CMD_BCR | MMC_RSP_R6, 0, 0, 0, MMC_CMD_BCR | MMC_RSP_R6, 0, 0, 0,
(u16 *)&response[0]); (u16 *)&response[0]);
@ -742,17 +743,20 @@ int mmc_init(int verbose)
if (!resp) { if (!resp) {
mmc_csd_t *csd = (mmc_csd_t *)response; mmc_csd_t *csd = (mmc_csd_t *)response;
memcpy(&mmc_csd, csd, sizeof(csd)); // memcpy(&mmc_csd, csd, sizeof(csd));
rc = 0; rc = 0;
mmc_ready = 1; mmc_ready = 1;
/* FIXME add verbose printout for csd */ /* FIXME add verbose printout for csd */
/* printf("READ_BL_LEN=%u, C_SIZE_MULT=%u, C_SIZE=%u\n", /* printf("READ_BL_LEN=%u, C_SIZE_MULT=%u, C_SIZE=%u\n",
csd->read_bl_len, csd->c_size_mult1, csd->read_bl_len, csd->c_size_mult1,
csd->c_size); */ csd->c_size); */
mmc_dev.blksz = 512; // mmc_dev.blksz = 512;
mmc_dev.lba = (((unsigned long)1 << csd->c_size_mult1) * // mmc_dev.lba = (((unsigned long)1 << csd->c_size_mult1) *
(unsigned long)csd->c_size) >> 9; // (unsigned long)csd->c_size) >> 9;
printf("MMC/SD size: %dMiB\n", mmc_dev.lba >> 1); puts(" MMC/SD size: ");
print32((((unsigned long)1 << csd->c_size_mult1) *
(unsigned long)csd->c_size) >> 10);
puts(" MiB\n");
} }
resp = mmc_cmd(MMC_SELECT_CARD, rca<<16, MMC_CMD_AC | MMC_RSP_R1, resp = mmc_cmd(MMC_SELECT_CARD, rca<<16, MMC_CMD_AC | MMC_RSP_R1,
@ -779,50 +783,8 @@ int mmc_init(int verbose)
glamo_reg_write((glamo_reg_read(GLAMO_REG_CLOCK_GEN8) & 0xff00) | 2, glamo_reg_write((glamo_reg_read(GLAMO_REG_CLOCK_GEN8) & 0xff00) | 2,
GLAMO_REG_CLOCK_GEN8); GLAMO_REG_CLOCK_GEN8);
fat_register_device(&mmc_dev, 1); /* partitions start counting with 1 */
return rc; return rc;
} }
void mmc_depower(void)
{
u8 response[16];
/* reset */
mmc_cmd(MMC_GO_IDLE_STATE, 0, MMC_CMD_BCR, 0, 0, 0,
(u16 *)&response[0]);
/* hold engine reset, remove clocks */
glamo_reg_write(GLAMO_CLOCK_MMC_RESET, GLAMO_REG_CLOCK_MMC);
/* disable engine */
glamo_reg_write(0, GLAMO_REG_CLOCK_MMC);
glamo_reg_write(glamo_reg_read(GLAMO_REG_HOSTBUS(2)) &
(~GLAMO_HOSTBUS2_MMIO_EN_MMC), GLAMO_REG_HOSTBUS(2));
/* remove power */
pcf50633_reg_write(PCF50633_REG_HCLDOOUT + 1,
pcf50633_reg_read(PCF50633_REG_HCLDOOUT + 1) & ~1); /* off */
}
int
mmc_ident(block_dev_desc_t *dev)
{
return 0;
}
int
mmc2info(ulong addr)
{
/* FIXME hard codes to 32 MB device */
if (addr >= CFG_MMC_BASE && addr < CFG_MMC_BASE + 0x02000000)
return 1;
return 0;
}
#endif

33
qiboot/src/gta02/gta02.c
View File

@ -198,14 +198,13 @@ void port_init_gta02(void)
/* configure MPLL */ /* configure MPLL */
*MPLLCON = ((42 << 12) + (1 << 4) + 0); *MPLLCON = ((42 << 12) + (1 << 4) + 0);
/* get debug UART working at 115kbps */
serial_init_115200_s3c24xx(GTA02_DEBUG_UART, 50 /* 50MHz PCLK */);
/* we're going to use Glamo for SD Card access, so we need to init the /* we're going to use Glamo for SD Card access, so we need to init the
* evil beast * evil beast
*/ */
glamo_core_init(); glamo_core_init();
/* get debug UART working at 115kbps */
serial_init_115200_s3c24xx(GTA02_DEBUG_UART, 50 /* 50MHz PCLK */);
} }
/** /**
@ -257,7 +256,12 @@ int gta02_get_pcb_revision(void)
return n; return n;
} }
int sd_card_init_gta02(void)
{
extern int mmc_init(int verbose);
return mmc_init(1);
}
/* return nonzero if we believe we run on GTA02 */ /* return nonzero if we believe we run on GTA02 */
@ -297,6 +301,27 @@ const struct board_api board_api_gta02 = {
/* these are the ways we could boot GTA02 in order to try */ /* these are the ways we could boot GTA02 in order to try */
.kernel_source = { .kernel_source = {
[0] = { [0] = {
.name = "SD Card FAT Kernel",
.block_init = sd_card_init_gta02,
.block_read = nand_read_ll,
.partition_index = 0,
.filesystem = FS_FAT,
.commandline = "mtdparts=physmap-flash:-(nor);" \
"neo1973-nand:" \
"0x00040000(qi)," \
"0x00040000(cmdline)," \
"0x00800000(backupkernel)," \
"0x000a0000(extra)," \
"0x00040000(identity)," \
"0x0f6a0000(backuprootfs) " \
"rootfstype=jffs2 " \
"root=/dev/mtdblock6 " \
"console=ttySAC2,115200 " \
"loglevel=8 " \
"init=/sbin/init "\
"ro"
},
[1] = {
.name = "NAND Kernel", .name = "NAND Kernel",
.block_read = nand_read_ll, .block_read = nand_read_ll,
.partition_index = -1, .partition_index = -1,

12
qiboot/src/utils.c
View File

@ -71,7 +71,7 @@ void printnybble(unsigned char n)
this_board->putc('a' + n - 10); this_board->putc('a' + n - 10);
} }
void printhex(unsigned char n) void print8(unsigned char n)
{ {
printnybble((n >> 4) & 15); printnybble((n >> 4) & 15);
printnybble(n & 15); printnybble(n & 15);
@ -79,10 +79,10 @@ void printhex(unsigned char n)
void print32(unsigned int u) void print32(unsigned int u)
{ {
printhex(u >> 24); print8(u >> 24);
printhex(u >> 16); print8(u >> 16);
printhex(u >> 8); print8(u >> 8);
printhex(u); print8(u);
} }
void hexdump(unsigned char *start, int len) void hexdump(unsigned char *start, int len)
@ -94,7 +94,7 @@ void hexdump(unsigned char *start, int len)
this_board->putc(':'); this_board->putc(':');
this_board->putc(' '); this_board->putc(' ');
for (n = 0; n < 16; n++) { for (n = 0; n < 16; n++) {
printhex(*start++); print8(*start++);
this_board->putc(' '); this_board->putc(' ');
} }
this_board->putc('\n'); this_board->putc('\n');