diff options
Diffstat (limited to 'board/freescale/common')
| -rw-r--r-- | board/freescale/common/Makefile | 3 | ||||
| -rw-r--r-- | board/freescale/common/ics307_clk.c | 21 | ||||
| -rw-r--r-- | board/freescale/common/qixis.c | 151 | ||||
| -rw-r--r-- | board/freescale/common/qixis.h | 101 | 
4 files changed, 268 insertions, 8 deletions
| diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 353d3c6f0..9077aaf10 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -34,6 +34,7 @@ COBJS-$(CONFIG_FSL_VIA)		+= cds_via.o  COBJS-$(CONFIG_FMAN_ENET)	+= fman.o  COBJS-$(CONFIG_FSL_PIXIS)	+= pixis.o  COBJS-$(CONFIG_FSL_NGPIXIS)	+= ngpixis.o +COBJS-$(CONFIG_FSL_QIXIS)	+= qixis.o  COBJS-$(CONFIG_PQ_MDS_PIB)	+= pq-mds-pib.o  COBJS-$(CONFIG_ID_EEPROM)	+= sys_eeprom.o  COBJS-$(CONFIG_FSL_SGMII_RISER)	+= sgmii_riser.o @@ -50,12 +51,14 @@ COBJS-$(CONFIG_MPC8572DS)	+= ics307_clk.o  COBJS-$(CONFIG_P1022DS)		+= ics307_clk.o  COBJS-$(CONFIG_P2020DS)		+= ics307_clk.o  COBJS-$(CONFIG_P3041DS)		+= ics307_clk.o +COBJS-$(CONFIG_P3060QDS)       	+= ics307_clk.o  COBJS-$(CONFIG_P4080DS)		+= ics307_clk.o  COBJS-$(CONFIG_P5020DS)		+= ics307_clk.o  # deal with common files for P-series corenet based devices  SUBLIB-$(CONFIG_P2041RDB)	+= p_corenet/libp_corenet.o  SUBLIB-$(CONFIG_P3041DS)	+= p_corenet/libp_corenet.o +SUBLIB-$(CONFIG_P3060QDS)	+= p_corenet/libp_corenet.o  SUBLIB-$(CONFIG_P4080DS)	+= p_corenet/libp_corenet.o  SUBLIB-$(CONFIG_P5020DS)	+= p_corenet/libp_corenet.o diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c index 6acbc361a..95a3cd778 100644 --- a/board/freescale/common/ics307_clk.c +++ b/board/freescale/common/ics307_clk.c @@ -1,5 +1,5 @@  /* - * Copyright 2010 Freescale Semiconductor, Inc. + * Copyright 2010-2011 Freescale Semiconductor, Inc.   *   * See file CREDITS for list of people who contributed to this   * project. @@ -25,10 +25,15 @@  #include "ics307_clk.h" -#ifdef CONFIG_FSL_NGPIXIS +#if defined(CONFIG_FSL_NGPIXIS)  #include "ngpixis.h" +#define fpga_reg pixis +#elif defined(CONFIG_FSL_QIXIS) +#include "qixis.h" +#define fpga_reg ((struct qixis *)QIXIS_BASE)  #else  #include "pixis.h" +#define fpga_reg pixis  #endif  /* define for SYS CLK or CLK1Frequency */ @@ -143,15 +148,15 @@ static unsigned long ics307_clk_freq(u8 cw0, u8 cw1, u8 cw2)  unsigned long get_board_sys_clk(void)  {  	return ics307_clk_freq( -			in_8(&pixis->sclk[0]), -			in_8(&pixis->sclk[1]), -			in_8(&pixis->sclk[2])); +			in_8(&fpga_reg->sclk[0]), +			in_8(&fpga_reg->sclk[1]), +			in_8(&fpga_reg->sclk[2]));  }  unsigned long get_board_ddr_clk(void)  {  	return ics307_clk_freq( -			in_8(&pixis->dclk[0]), -			in_8(&pixis->dclk[1]), -			in_8(&pixis->dclk[2])); +			in_8(&fpga_reg->dclk[0]), +			in_8(&fpga_reg->dclk[1]), +			in_8(&fpga_reg->dclk[2]));  } diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c new file mode 100644 index 000000000..6cd7e5108 --- /dev/null +++ b/board/freescale/common/qixis.c @@ -0,0 +1,151 @@ +/* + * Copyright 2011 Freescale Semiconductor + * Author: Shengzhou Liu <Shengzhou.Liu@freescale.com> + * + * 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 file provides support for the QIXIS of some Freescale reference boards. + * + */ + +#include <common.h> +#include <command.h> +#include <asm/io.h> +#include "qixis.h" + +u8 qixis_read(unsigned int reg) +{ +	void *p = (void *)QIXIS_BASE; + +	return in_8(p + reg); +} + +void qixis_write(unsigned int reg, u8 value) +{ +	void *p = (void *)QIXIS_BASE; + +	out_8(p + reg, value); +} + +void qixis_reset(void) +{ +	QIXIS_WRITE(rst_ctl, 0x83); +} + +void qixis_bank_reset(void) +{ +	QIXIS_WRITE(rcfg_ctl, 0x20); +	QIXIS_WRITE(rcfg_ctl, 0x21); +} + +/* Set the boot bank to the power-on default bank0 */ +void clear_altbank(void) +{ +	u8 reg; + +	reg = QIXIS_READ(brdcfg[0]); +	reg = reg & ~QIXIS_LBMAP_MASK; +	QIXIS_WRITE(brdcfg[0], reg); +} + +/* Set the boot bank to the alternate bank */ +void set_altbank(void) +{ +	u8 reg; + +	reg = QIXIS_READ(brdcfg[0]); +	reg = (reg & ~QIXIS_LBMAP_MASK) | QIXIS_LBMAP_ALTBANK; +	QIXIS_WRITE(brdcfg[0], reg); +} + +#ifdef DEBUG +static void qixis_dump_regs(void) +{ +	int i; + +	printf("id	= %02x\n", QIXIS_READ(id)); +	printf("arch	= %02x\n", QIXIS_READ(arch)); +	printf("scver	= %02x\n", QIXIS_READ(scver)); +	printf("model	= %02x\n", QIXIS_READ(model)); +	printf("rst_ctl	= %02x\n", QIXIS_READ(rst_ctl)); +	printf("aux	= %02x\n", QIXIS_READ(aux)); +	for (i = 0; i < 16; i++) +		printf("brdcfg%02d = %02x\n", i, QIXIS_READ(brdcfg[i])); +	for (i = 0; i < 16; i++) +		printf("dutcfg%02d = %02x\n", i, QIXIS_READ(dutcfg[i])); +	printf("sclk	= %02x%02x%02x\n", QIXIS_READ(sclk[0]), +		QIXIS_READ(sclk[1]), QIXIS_READ(sclk[2])); +	printf("dclk	= %02x%02x%02x\n", QIXIS_READ(dclk[0]), +		QIXIS_READ(dclk[1]), QIXIS_READ(dclk[2])); +	printf("aux     = %02x\n", QIXIS_READ(aux)); +	printf("watch	= %02x\n", QIXIS_READ(watch)); +	printf("ctl_sys	= %02x\n", QIXIS_READ(ctl_sys)); +	printf("rcw_ctl = %02x\n", QIXIS_READ(rcw_ctl)); +	printf("present = %02x\n", QIXIS_READ(present)); +	printf("clk_spd = %02x\n", QIXIS_READ(clk_spd)); +	printf("stat_dut = %02x\n", QIXIS_READ(stat_dut)); +	printf("stat_sys = %02x\n", QIXIS_READ(stat_sys)); +	printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm)); +	printf("ctl_sys2 = %02x\n", QIXIS_READ(ctl_sys2)); +} +#endif + +int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ +	int i; + +	if (argc <= 1) { +		clear_altbank(); +		qixis_reset(); +	} else if (strcmp(argv[1], "altbank") == 0) { +		set_altbank(); +		qixis_bank_reset(); +	} else if (strcmp(argv[1], "watchdog") == 0) { +		static char *period[9] = {"2s", "4s", "8s", "16s", "32s", +					  "1min", "2min", "4min", "8min"}; +		u8 rcfg = QIXIS_READ(rcfg_ctl); + +		if (argv[2] == NULL) { +			printf("qixis watchdog <watchdog_period>\n"); +			return 0; +		} +		for (i = 0; i < ARRAY_SIZE(period); i++) { +			if (strcmp(argv[2], period[i]) == 0) { +				/* disable watchdog */ +				QIXIS_WRITE(rcfg_ctl, rcfg & ~0x08); +				QIXIS_WRITE(watch, ((i<<2) - 1)); +				QIXIS_WRITE(rcfg_ctl, rcfg); +				return 0; +			} +		} +	} + +#ifdef DEBUG +	else if (strcmp(argv[1], "dump") == 0) { +		qixis_dump_regs(); +		return 0; +	} +#endif + +	else { +		printf("Invalid option: %s\n", argv[1]); +		return 1; +	} + +	return 0; +} + +U_BOOT_CMD( +	qixis_reset, CONFIG_SYS_MAXARGS, 1, qixis_reset_cmd, +	"Reset the board using the FPGA sequencer", +	"- hard reset to default bank\n" +	"qixis_reset altbank - reset to alternate bank\n" +	"qixis watchdog <watchdog_period> - set the watchdog period\n" +	"	period: 1s 2s 4s 8s 16s 32s 1min 2min 4min 8min\n" +#ifdef DEBUG +	"qixis_reset dump - display the QIXIS registers\n" +#endif +	); diff --git a/board/freescale/common/qixis.h b/board/freescale/common/qixis.h new file mode 100644 index 000000000..7a0268a02 --- /dev/null +++ b/board/freescale/common/qixis.h @@ -0,0 +1,101 @@ +/* + * Copyright 2011 Freescale Semiconductor + * Author: Shengzhou Liu <Shengzhou.Liu@freescale.com> + * + * 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 file provides support for the QIXIS of some Freescale reference boards. + */ + +#ifndef __QIXIS_H_ +#define __QIXIS_H_ + +struct qixis { +	u8 id;      /* ID value uniquely identifying each QDS board type */ +	u8 arch;    /* Board version information */ +	u8 scver;   /* QIXIS Version Register */ +	u8 model;   /* Information of software programming model version */ +	u8 tagdata; +	u8 ctl_sys; +	u8 aux;         /* Auxiliary Register,0x06 */ +	u8 clk_spd; +	u8 stat_dut; +	u8 stat_sys; +	u8 stat_alrm; +	u8 present; +	u8 ctl_sys2; +	u8 rcw_ctl; +	u8 ctl_led; +	u8 i2cblk; +	u8 rcfg_ctl;    /* Reconfig Control Register,0x10 */ +	u8 rcfg_st; +	u8 dcm_ad; +	u8 dcm_da; +	u8 dcmd; +	u8 dmsg; +	u8 gdc; +	u8 gdd;         /* DCM Debug Data Register,0x17 */ +	u8 dmack; +	u8 res1[6]; +	u8 watch;       /* Watchdog Register,0x1F */ +	u8 pwr_ctl[2];  /* Power Control Register,0x20 */ +	u8 res2[2]; +	u8 pwr_stat[4]; /* Power Status Register,0x24 */ +	u8 res3[8]; +	u8 clk_spd2[2];  /* SYSCLK clock Speed Register,0x30 */ +	u8 res4[2]; +	u8 sclk[3];  /* Clock Configuration Registers,0x34 */ +	u8 res5; +	u8 dclk[3]; +	u8 res6; +	u8 clk_dspd[3]; +	u8 res7; +	u8 rst_ctl;     /* Reset Control Register,0x40 */ +	u8 rst_stat;    /* Reset Status Register */ +	u8 rst_rsn;     /* Reset Reason Register */ +	u8 rst_frc[2];  /* Reset Force Registers,0x43 */ +	u8 res8[11]; +	u8 brdcfg[16];  /* Board Configuration Register,0x50 */ +	u8 dutcfg[16]; +	u8 rcw_ad[2];   /* RCW SRAM Address Registers,0x70 */ +	u8 rcw_data; +	u8 res9[5]; +	u8 post_ctl; +	u8 post_stat; +	u8 post_dat[2]; +	u8 pi_d[4]; +	u8 gpio_io[4]; +	u8 gpio_dir[4]; +	u8 res10[20]; +	u8 rjtag_ctl; +	u8 rjtag_dat; +	u8 res11[2]; +	u8 trig_src[4]; +	u8 trig_dst[4]; +	u8 trig_stat; +	u8 res12[3]; +	u8 trig_ctr[4]; +	u8 res13[48]; +	u8 aux2[4];	/* Auxiliary Registers,0xE0 */ +	u8 res14[10]; +	u8 aux_ad; +	u8 aux_da; +	u8 res15[16]; +}; + +#define QIXIS_BASE		0xffdf0000 +#define QIXIS_LBMAP_SWITCH	7 +#define QIXIS_LBMAP_MASK	0x0f +#define QIXIS_LBMAP_SHIFT	0 +#define QIXIS_LBMAP_ALTBANK	0x04 + +u8 qixis_read(unsigned int reg); +void qixis_write(unsigned int reg, u8 value); + +#define QIXIS_READ(reg) qixis_read(offsetof(struct qixis, reg)) +#define QIXIS_WRITE(reg, value) qixis_write(offsetof(struct qixis, reg), value) + +#endif |