X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=board%2Fzipitz2%2Fzipitz2.c;h=d3ca939238831c0b442bc2fa528a7bf2f3c9b765;hb=6121a54d603d03da2da87b10881a30a61a8614a3;hp=e72a5d9bd05d4c6e1975486d8e50e71b019ed606;hpb=4438a45f4d6abd4b65998dd76528c4705b93b4b5;p=people%2Fms%2Fu-boot.git

diff --git a/board/zipitz2/zipitz2.c b/board/zipitz2/zipitz2.c
index e72a5d9bd0..d3ca939238 100644
--- a/board/zipitz2/zipitz2.c
+++ b/board/zipitz2/zipitz2.c
@@ -4,23 +4,7 @@
  *
  * Heavily based on pxa255_idp platform
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -28,8 +12,10 @@
 #include <serial.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa.h>
+#include <asm/arch/regs-mmc.h>
 #include <spi.h>
 #include <asm/io.h>
+#include <usb.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -42,13 +28,8 @@ inline void lcd_start(void) {};
 /*
  * Miscelaneous platform dependent initialisations
  */
-
-int board_init (void)
+int board_init(void)
 {
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
 	/* arch number of Z2 */
 	gd->bd->bi_arch_number = MACH_TYPE_ZIPIT2;
 
@@ -61,24 +42,47 @@ int board_init (void)
 	return 0;
 }
 
-struct serial_device *default_serial_console (void)
+int dram_init(void)
 {
-	return &serial_stuart_device;
+	pxa2xx_dram_init();
+	gd->ram_size = PHYS_SDRAM_1_SIZE;
+	return 0;
 }
 
-int dram_init(void)
+#ifdef	CONFIG_CMD_USB
+int board_usb_init(int index, enum usb_init_type init)
 {
-	pxa_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
+	/* enable port 2 */
+	writel(readl(UP2OCR) | UP2OCR_HXOE | UP2OCR_HXS |
+		UP2OCR_DMPDE | UP2OCR_DPPDE, UP2OCR);
+
 	return 0;
 }
 
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	return 0;
+}
+
+void usb_board_stop(void)
+{
+}
+#endif
+
 void dram_init_banksize(void)
 {
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
 	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 }
 
+#ifdef	CONFIG_CMD_MMC
+int board_mmc_init(bd_t *bis)
+{
+	pxa_mmc_register(0);
+	return 0;
+}
+#endif
+
 #ifdef	CONFIG_CMD_SPI
 
 struct {
@@ -166,7 +170,6 @@ void spi_cs_deactivate(struct spi_slave *slave)
 {
 	/* GPIO 88 high */
 	writel((1 << 24), GPSR2);
-
 }
 
 void lcd_start(void)