[PATCH 26/88] freescale: Drop unused pixis code

Simon Glass sjg at chromium.org
Mon Jan 23 22:59:29 CET 2023


Drop this unused code.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 board/freescale/common/Makefile |   1 -
 board/freescale/common/pixis.c  | 470 --------------------------------
 board/freescale/common/pixis.h  |  54 ----
 3 files changed, 525 deletions(-)
 delete mode 100644 board/freescale/common/pixis.c
 delete mode 100644 board/freescale/common/pixis.h

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index cc1371867d8..fc51d6d3e18 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -29,7 +29,6 @@ endif
 obj-$(CONFIG_FSL_CADMUS)	+= cadmus.o
 obj-$(CONFIG_FSL_VIA)		+= cds_via.o
 obj-$(CONFIG_FMAN_ENET)	+= fman.o
-obj-$(CONFIG_FSL_PIXIS)	+= pixis.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_FSL_NGPIXIS)	+= ngpixis.o
 endif
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
deleted file mode 100644
index 7096b107e54..00000000000
--- a/board/freescale/common/pixis.c
+++ /dev/null
@@ -1,470 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2006,2010 Freescale Semiconductor
- * Jeff Brown
- * Srikanth Srinivasan (srikanth.srinivasan at freescale.com)
- */
-
-#include <common.h>
-#include <command.h>
-#include <asm/io.h>
-
-#define pixis_base (u8 *)PIXIS_BASE
-
-/*
- * Simple board reset.
- */
-void pixis_reset(void)
-{
-	out_8(pixis_base + PIXIS_RST, 0);
-
-	while (1);
-}
-
-/*
- * Per table 27, page 58 of MPC8641HPCN spec.
- */
-static int set_px_sysclk(unsigned long sysclk)
-{
-	u8 sysclk_s, sysclk_r, sysclk_v, vclkh, vclkl, sysclk_aux;
-
-	switch (sysclk) {
-	case 33:
-		sysclk_s = 0x04;
-		sysclk_r = 0x04;
-		sysclk_v = 0x07;
-		sysclk_aux = 0x00;
-		break;
-	case 40:
-		sysclk_s = 0x01;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x20;
-		sysclk_aux = 0x01;
-		break;
-	case 50:
-		sysclk_s = 0x01;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x2A;
-		sysclk_aux = 0x02;
-		break;
-	case 66:
-		sysclk_s = 0x01;
-		sysclk_r = 0x04;
-		sysclk_v = 0x04;
-		sysclk_aux = 0x03;
-		break;
-	case 83:
-		sysclk_s = 0x01;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x4B;
-		sysclk_aux = 0x04;
-		break;
-	case 100:
-		sysclk_s = 0x01;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x5C;
-		sysclk_aux = 0x05;
-		break;
-	case 134:
-		sysclk_s = 0x06;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x3B;
-		sysclk_aux = 0x06;
-		break;
-	case 166:
-		sysclk_s = 0x06;
-		sysclk_r = 0x1F;
-		sysclk_v = 0x4B;
-		sysclk_aux = 0x07;
-		break;
-	default:
-		printf("Unsupported SYSCLK frequency.\n");
-		return 0;
-	}
-
-	vclkh = (sysclk_s << 5) | sysclk_r;
-	vclkl = sysclk_v;
-
-	out_8(pixis_base + PIXIS_VCLKH, vclkh);
-	out_8(pixis_base + PIXIS_VCLKL, vclkl);
-
-	out_8(pixis_base + PIXIS_AUX, sysclk_aux);
-
-	return 1;
-}
-
-/* Set the CFG_SYSPLL bits
- *
- * This only has effect if PX_VCFGEN0[SYSPLL]=1, which is true if
- * read_from_px_regs() is called.
- */
-static int set_px_mpxpll(unsigned long mpxpll)
-{
-	switch (mpxpll) {
-	case 2:
-	case 4:
-	case 6:
-	case 8:
-	case 10:
-	case 12:
-	case 14:
-	case 16:
-		clrsetbits_8(pixis_base + PIXIS_VSPEED1, 0x1F, mpxpll);
-		return 1;
-	}
-
-	printf("Unsupported MPXPLL ratio.\n");
-	return 0;
-}
-
-static int set_px_corepll(unsigned long corepll)
-{
-	u8 val;
-
-	switch (corepll) {
-	case 20:
-		val = 0x08;
-		break;
-	case 25:
-		val = 0x0C;
-		break;
-	case 30:
-		val = 0x10;
-		break;
-	case 35:
-		val = 0x1C;
-		break;
-	case 40:
-		val = 0x14;
-		break;
-	case 45:
-		val = 0x0E;
-		break;
-	default:
-		printf("Unsupported COREPLL ratio.\n");
-		return 0;
-	}
-
-	clrsetbits_8(pixis_base + PIXIS_VSPEED0, 0x1F, val);
-	return 1;
-}
-
-#ifndef CFG_SYS_PIXIS_VCFGEN0_ENABLE
-#define CFG_SYS_PIXIS_VCFGEN0_ENABLE		0x1C
-#endif
-
-/* Tell the PIXIS where to find the COREPLL, MPXPLL, SYSCLK values
- *
- * The PIXIS can be programmed to look at either the on-board dip switches
- * or various other PIXIS registers to determine the values for COREPLL,
- * MPXPLL, and SYSCLK.
- *
- * CFG_SYS_PIXIS_VCFGEN0_ENABLE is the value to write to the PIXIS_VCFGEN0
- * register that tells the pixis to use the various PIXIS register.
- */
-static void read_from_px_regs(int set)
-{
-	u8 tmp = in_8(pixis_base + PIXIS_VCFGEN0);
-
-	if (set)
-		tmp = tmp | CFG_SYS_PIXIS_VCFGEN0_ENABLE;
-	else
-		tmp = tmp & ~CFG_SYS_PIXIS_VCFGEN0_ENABLE;
-
-	out_8(pixis_base + PIXIS_VCFGEN0, tmp);
-}
-
-/* CFG_SYS_PIXIS_VBOOT_ENABLE is the value to write to the PX_VCFGEN1
- * register that tells the pixis to use the PX_VBOOT[LBMAP] register.
- */
-#ifndef CFG_SYS_PIXIS_VBOOT_ENABLE
-#define CFG_SYS_PIXIS_VBOOT_ENABLE	0x04
-#endif
-
-/* Configure the source of the boot location
- *
- * The PIXIS can be programmed to look at either the on-board dip switches
- * or the PX_VBOOT[LBMAP] register to determine where we should boot.
- *
- * If we want to boot from the alternate boot bank, we need to tell the PIXIS
- * to ignore the on-board dip switches and use the PX_VBOOT[LBMAP] instead.
- */
-static void read_from_px_regs_altbank(int set)
-{
-	u8 tmp = in_8(pixis_base + PIXIS_VCFGEN1);
-
-	if (set)
-		tmp = tmp | CFG_SYS_PIXIS_VBOOT_ENABLE;
-	else
-		tmp = tmp & ~CFG_SYS_PIXIS_VBOOT_ENABLE;
-
-	out_8(pixis_base + PIXIS_VCFGEN1, tmp);
-}
-
-/* CFG_SYS_PIXIS_VBOOT_MASK contains the bits to set in VBOOT register that
- * tells the PIXIS what the alternate flash bank is.
- *
- * Note that it's not really a mask.  It contains the actual LBMAP bits that
- * must be set to select the alternate bank.  This code assumes that the
- * primary bank has these bits set to 0, and the alternate bank has these
- * bits set to 1.
- */
-#ifndef CFG_SYS_PIXIS_VBOOT_MASK
-#define CFG_SYS_PIXIS_VBOOT_MASK	(0x40)
-#endif
-
-/* Tell the PIXIS to boot from the default flash bank
- *
- * Program the default flash bank into the VBOOT register.  This register is
- * used only if PX_VCFGEN1[FLASH]=1.
- */
-static void clear_altbank(void)
-{
-	clrbits_8(pixis_base + PIXIS_VBOOT, CFG_SYS_PIXIS_VBOOT_MASK);
-}
-
-/* Tell the PIXIS to boot from the alternate flash bank
- *
- * Program the alternate flash bank into the VBOOT register.  This register is
- * used only if PX_VCFGEN1[FLASH]=1.
- */
-static void set_altbank(void)
-{
-	setbits_8(pixis_base + PIXIS_VBOOT, CFG_SYS_PIXIS_VBOOT_MASK);
-}
-
-/* Reset the board with watchdog disabled.
- *
- * This respects the altbank setting.
- */
-static void set_px_go(void)
-{
-	/* Disable the VELA sequencer and watchdog */
-	clrbits_8(pixis_base + PIXIS_VCTL, 9);
-
-	/* Reboot by starting the VELA sequencer */
-	setbits_8(pixis_base + PIXIS_VCTL, 0x1);
-
-	while (1);
-}
-
-/* Reset the board with watchdog enabled.
- *
- * This respects the altbank setting.
- */
-static void set_px_go_with_watchdog(void)
-{
-	/* Disable the VELA sequencer */
-	clrbits_8(pixis_base + PIXIS_VCTL, 1);
-
-	/* Enable the watchdog and reboot by starting the VELA sequencer */
-	setbits_8(pixis_base + PIXIS_VCTL, 0x9);
-
-	while (1);
-}
-
-/* Disable the watchdog
- *
- */
-static int pixis_disable_watchdog_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
-				      char *const argv[])
-{
-	/* Disable the VELA sequencer and the watchdog */
-	clrbits_8(pixis_base + PIXIS_VCTL, 9);
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	diswd, 1, 0, pixis_disable_watchdog_cmd,
-	"Disable watchdog timer",
-	""
-);
-
-/*
- * This function takes the non-integral cpu:mpx pll ratio
- * and converts it to an integer that can be used to assign
- * FPGA register values.
- * input: strptr i.e. argv[2]
- */
-static unsigned long strfractoint(char *strptr)
-{
-	int i, j;
-	int mulconst;
-	int no_dec = 0;
-	unsigned long intval = 0, decval = 0;
-	char intarr[3], decarr[3];
-
-	/* Assign the integer part to intarr[]
-	 * If there is no decimal point i.e.
-	 * if the ratio is an integral value
-	 * simply create the intarr.
-	 */
-	i = 0;
-	while (strptr[i] != '.') {
-		if (strptr[i] == 0) {
-			no_dec = 1;
-			break;
-		}
-		intarr[i] = strptr[i];
-		i++;
-	}
-
-	intarr[i] = '\0';
-
-	if (no_dec) {
-		/* Currently needed only for single digit corepll ratios */
-		mulconst = 10;
-		decval = 0;
-	} else {
-		j = 0;
-		i++;		/* Skipping the decimal point */
-		while ((strptr[i] >= '0') && (strptr[i] <= '9')) {
-			decarr[j] = strptr[i];
-			i++;
-			j++;
-		}
-
-		decarr[j] = '\0';
-
-		mulconst = 1;
-		for (i = 0; i < j; i++)
-			mulconst *= 10;
-		decval = dectoul(decarr, NULL);
-	}
-
-	intval = dectoul(intarr, NULL);
-	intval = intval * mulconst;
-
-	return intval + decval;
-}
-
-static int pixis_reset_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
-			   char *const argv[])
-{
-	unsigned int i;
-	char *p_cf = NULL;
-	char *p_cf_sysclk = NULL;
-	char *p_cf_corepll = NULL;
-	char *p_cf_mpxpll = NULL;
-	char *p_altbank = NULL;
-	char *p_wd = NULL;
-	int unknown_param = 0;
-
-	/*
-	 * No args is a simple reset request.
-	 */
-	if (argc <= 1) {
-		pixis_reset();
-		/* not reached */
-	}
-
-	for (i = 1; i < argc; i++) {
-		if (strcmp(argv[i], "cf") == 0) {
-			p_cf = argv[i];
-			if (i + 3 >= argc) {
-				break;
-			}
-			p_cf_sysclk = argv[i+1];
-			p_cf_corepll = argv[i+2];
-			p_cf_mpxpll = argv[i+3];
-			i += 3;
-			continue;
-		}
-
-		if (strcmp(argv[i], "altbank") == 0) {
-			p_altbank = argv[i];
-			continue;
-		}
-
-		if (strcmp(argv[i], "wd") == 0) {
-			p_wd = argv[i];
-			continue;
-		}
-
-		unknown_param = 1;
-	}
-
-	/*
-	 * Check that cf has all required parms
-	 */
-	if ((p_cf && !(p_cf_sysclk && p_cf_corepll && p_cf_mpxpll))
-	    ||	unknown_param) {
-#ifdef CONFIG_SYS_LONGHELP
-		puts(cmdtp->help);
-		putc('\n');
-#endif
-		return 1;
-	}
-
-	/*
-	 * PIXIS seems to be sensitive to the ordering of
-	 * the registers that are touched.
-	 */
-	read_from_px_regs(0);
-
-	if (p_altbank)
-		read_from_px_regs_altbank(0);
-
-	clear_altbank();
-
-	/*
-	 * Clock configuration specified.
-	 */
-	if (p_cf) {
-		unsigned long sysclk;
-		unsigned long corepll;
-		unsigned long mpxpll;
-
-		sysclk = dectoul(p_cf_sysclk, NULL);
-		corepll = strfractoint(p_cf_corepll);
-		mpxpll = dectoul(p_cf_mpxpll, NULL);
-
-		if (!(set_px_sysclk(sysclk)
-		      && set_px_corepll(corepll)
-		      && set_px_mpxpll(mpxpll))) {
-#ifdef CONFIG_SYS_LONGHELP
-			puts(cmdtp->help);
-			putc('\n');
-#endif
-			return 1;
-		}
-		read_from_px_regs(1);
-	}
-
-	/*
-	 * Altbank specified
-	 *
-	 * NOTE CHANGE IN BEHAVIOR: previous code would default
-	 * to enabling watchdog if altbank is specified.
-	 * Now the watchdog must be enabled explicitly using 'wd'.
-	 */
-	if (p_altbank) {
-		set_altbank();
-		read_from_px_regs_altbank(1);
-	}
-
-	/*
-	 * Reset with watchdog specified.
-	 */
-	if (p_wd)
-		set_px_go_with_watchdog();
-	else
-		set_px_go();
-
-	/*
-	 * Shouldn't be reached.
-	 */
-	return 0;
-}
-
-
-U_BOOT_CMD(
-	pixis_reset, CONFIG_SYS_MAXARGS, 1, pixis_reset_cmd,
-	"Reset the board using the FPGA sequencer",
-	"    pixis_reset\n"
-	"    pixis_reset [altbank]\n"
-	"    pixis_reset altbank wd\n"
-	"    pixis_reset altbank cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"
-	"    pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>"
-);
diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h
deleted file mode 100644
index f19e85cb1c9..00000000000
--- a/board/freescale/common/pixis.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2010 Freescale Semiconductor, Inc.
- */
-#ifndef __PIXIS_H_
-#define __PIXIS_H_	1
-
-/* PIXIS register set. */
-#if defined(CONFIG_TARGET_MPC8536DS)
-typedef struct pixis {
-	u8 id;
-	u8 ver;
-	u8 pver;
-	u8 csr;
-	u8 rst;
-	u8 rst2;
-	u8 aux1;
-	u8 spd;
-	u8 aux2;
-	u8 csr2;
-	u8 watch;
-	u8 led;
-	u8 pwr;
-	u8 res[3];
-	u8 vctl;
-	u8 vstat;
-	u8 vcfgen0;
-	u8 vcfgen1;
-	u8 vcore0;
-	u8 res1;
-	u8 vboot;
-	u8 vspeed[3];
-	u8 sclk[3];
-	u8 dclk[3];
-	u8 i2cdacr;
-	u8 vcoreacc[4];
-	u8 vcorecnt[3];
-	u8 vcoremax[2];
-	u8 vplatacc[4];
-	u8 vplatcnt[3];
-	u8 vplatmax[2];
-	u8 vtempacc[4];
-	u8 vtempcnt[3];
-	u8 vtempmax[2];
-	u8 res2[4];
-} __attribute__ ((packed)) pixis_t;
-#else
-#error Need to define pixis_t for this board
-#endif
-
-/* Pointer to the PIXIS register set */
-#define pixis ((pixis_t *)PIXIS_BASE)
-
-#endif	/* __PIXIS_H_ */
-- 
2.39.1.456.gfc5497dd1b-goog



More information about the U-Boot mailing list