Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

6 files changed, 61 insertions, 220 deletions

diff --git a/arch/arm/include/asm/arch-zynq/clk.h b/arch/arm/include/asm/arch-zynq/clk.h
deleted file mode 100644
index 250c5bc..0000000
--- a/arch/arm/include/asm/arch-zynq/clk.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2013 Xilinx Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _ZYNQ_CLK_H_
-#define _ZYNQ_CLK_H_
-
-enum zynq_clk {
-	armpll_clk, ddrpll_clk, iopll_clk,
-	cpu_6or4x_clk, cpu_3or2x_clk, cpu_2x_clk, cpu_1x_clk,
-	ddr2x_clk, ddr3x_clk, dci_clk,
-	lqspi_clk, smc_clk, pcap_clk, gem0_clk, gem1_clk,
-	fclk0_clk, fclk1_clk, fclk2_clk, fclk3_clk, can0_clk, can1_clk,
-	sdio0_clk, sdio1_clk, uart0_clk, uart1_clk, spi0_clk, spi1_clk, dma_clk,
-	usb0_aper_clk, usb1_aper_clk, gem0_aper_clk, gem1_aper_clk,
-	sdio0_aper_clk, sdio1_aper_clk, spi0_aper_clk, spi1_aper_clk,
-	can0_aper_clk, can1_aper_clk, i2c0_aper_clk, i2c1_aper_clk,
-	uart0_aper_clk, uart1_aper_clk, gpio_aper_clk, lqspi_aper_clk,
-	smc_aper_clk, swdt_clk, dbg_trc_clk, dbg_apb_clk, clk_max};
-
-void zynq_clk_early_init(void);
-int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate);
-unsigned long zynq_clk_get_rate(enum zynq_clk clk);
-const char *zynq_clk_get_name(enum zynq_clk clk);
-unsigned long get_uart_clk(int dev_id);
-
-#endif
diff --git a/arch/arm/include/asm/arch-zynq/gpio.h b/arch/arm/include/asm/arch-zynq/gpio.h
deleted file mode 100644
index a26ae87..0000000
--- a/arch/arm/include/asm/arch-zynq/gpio.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _ZYNQ_GPIO_H
-#define _ZYNQ_GPIO_H
-
-#endif /* _ZYNQ_GPIO_H */
diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h
deleted file mode 100644
index e2e0b73..0000000
--- a/arch/arm/include/asm/arch-zynq/hardware.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2013 Xilinx Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _ASM_ARCH_HARDWARE_H
-#define _ASM_ARCH_HARDWARE_H
-
-#define ZYNQ_SERIAL_BASEADDR0		0xE0000000
-#define ZYNQ_SERIAL_BASEADDR1		0xE0001000
-#define ZYNQ_SYS_CTRL_BASEADDR		0xF8000000
-#define ZYNQ_DEV_CFG_APB_BASEADDR	0xF8007000
-#define ZYNQ_SCU_BASEADDR		0xF8F00000
-#define ZYNQ_SCUTIMER_BASEADDR		0xF8F00600
-#define ZYNQ_GEM_BASEADDR0		0xE000B000
-#define ZYNQ_GEM_BASEADDR1		0xE000C000
-#define ZYNQ_SDHCI_BASEADDR0		0xE0100000
-#define ZYNQ_SDHCI_BASEADDR1		0xE0101000
-#define ZYNQ_I2C_BASEADDR0		0xE0004000
-#define ZYNQ_I2C_BASEADDR1		0xE0005000
-#define ZYNQ_SPI_BASEADDR0		0xE0006000
-#define ZYNQ_SPI_BASEADDR1		0xE0007000
-#define ZYNQ_QSPI_BASEADDR		0xE000D000
-#define ZYNQ_SMC_BASEADDR		0xE000E000
-#define ZYNQ_NAND_BASEADDR		0xE1000000
-#define ZYNQ_DDRC_BASEADDR		0xF8006000
-#define ZYNQ_EFUSE_BASEADDR		0xF800D000
-#define ZYNQ_USB_BASEADDR0		0xE0002000
-#define ZYNQ_USB_BASEADDR1		0xE0003000
-
-/* Bootmode setting values */
-#define ZYNQ_BM_MASK		0x7
-#define ZYNQ_BM_QSPI		0x1
-#define ZYNQ_BM_NOR		0x2
-#define ZYNQ_BM_NAND		0x4
-#define ZYNQ_BM_SD		0x5
-#define ZYNQ_BM_JTAG		0x0
-
-/* Reflect slcr offsets */
-struct slcr_regs {
-	u32 scl; /* 0x0 */
-	u32 slcr_lock; /* 0x4 */
-	u32 slcr_unlock; /* 0x8 */
-	u32 reserved0_1[61];
-	u32 arm_pll_ctrl; /* 0x100 */
-	u32 ddr_pll_ctrl; /* 0x104 */
-	u32 io_pll_ctrl; /* 0x108 */
-	u32 reserved0_2[5];
-	u32 arm_clk_ctrl; /* 0x120 */
-	u32 ddr_clk_ctrl; /* 0x124 */
-	u32 dci_clk_ctrl; /* 0x128 */
-	u32 aper_clk_ctrl; /* 0x12c */
-	u32 reserved0_3[2];
-	u32 gem0_rclk_ctrl; /* 0x138 */
-	u32 gem1_rclk_ctrl; /* 0x13c */
-	u32 gem0_clk_ctrl; /* 0x140 */
-	u32 gem1_clk_ctrl; /* 0x144 */
-	u32 smc_clk_ctrl; /* 0x148 */
-	u32 lqspi_clk_ctrl; /* 0x14c */
-	u32 sdio_clk_ctrl; /* 0x150 */
-	u32 uart_clk_ctrl; /* 0x154 */
-	u32 spi_clk_ctrl; /* 0x158 */
-	u32 can_clk_ctrl; /* 0x15c */
-	u32 can_mioclk_ctrl; /* 0x160 */
-	u32 dbg_clk_ctrl; /* 0x164 */
-	u32 pcap_clk_ctrl; /* 0x168 */
-	u32 reserved0_4[1];
-	u32 fpga0_clk_ctrl; /* 0x170 */
-	u32 reserved0_5[3];
-	u32 fpga1_clk_ctrl; /* 0x180 */
-	u32 reserved0_6[3];
-	u32 fpga2_clk_ctrl; /* 0x190 */
-	u32 reserved0_7[3];
-	u32 fpga3_clk_ctrl; /* 0x1a0 */
-	u32 reserved0_8[8];
-	u32 clk_621_true; /* 0x1c4 */
-	u32 reserved1[14];
-	u32 pss_rst_ctrl; /* 0x200 */
-	u32 reserved2[15];
-	u32 fpga_rst_ctrl; /* 0x240 */
-	u32 reserved3[5];
-	u32 reboot_status; /* 0x258 */
-	u32 boot_mode; /* 0x25c */
-	u32 reserved4[116];
-	u32 trust_zone; /* 0x430 */ /* FIXME */
-	u32 reserved5_1[63];
-	u32 pss_idcode; /* 0x530 */
-	u32 reserved5_2[51];
-	u32 ddr_urgent; /* 0x600 */
-	u32 reserved6[6];
-	u32 ddr_urgent_sel; /* 0x61c */
-	u32 reserved7[56];
-	u32 mio_pin[54]; /* 0x700 - 0x7D4 */
-	u32 reserved8[74];
-	u32 lvl_shftr_en; /* 0x900 */
-	u32 reserved9[3];
-	u32 ocm_cfg; /* 0x910 */
-};
-
-#define slcr_base ((struct slcr_regs *)ZYNQ_SYS_CTRL_BASEADDR)
-
-struct devcfg_regs {
-	u32 ctrl; /* 0x0 */
-	u32 lock; /* 0x4 */
-	u32 cfg; /* 0x8 */
-	u32 int_sts; /* 0xc */
-	u32 int_mask; /* 0x10 */
-	u32 status; /* 0x14 */
-	u32 dma_src_addr; /* 0x18 */
-	u32 dma_dst_addr; /* 0x1c */
-	u32 dma_src_len; /* 0x20 */
-	u32 dma_dst_len; /* 0x24 */
-	u32 rom_shadow; /* 0x28 */
-	u32 reserved1[2];
-	u32 unlock; /* 0x34 */
-	u32 reserved2[18];
-	u32 mctrl; /* 0x80 */
-	u32 reserved3;
-	u32 write_count; /* 0x88 */
-	u32 read_count; /* 0x8c */
-};
-
-#define devcfg_base ((struct devcfg_regs *)ZYNQ_DEV_CFG_APB_BASEADDR)
-
-struct scu_regs {
-	u32 reserved1[16];
-	u32 filter_start; /* 0x40 */
-	u32 filter_end; /* 0x44 */
-};
-
-#define scu_base ((struct scu_regs *)ZYNQ_SCU_BASEADDR)
-
-struct ddrc_regs {
-	u32 ddrc_ctrl; /* 0x0 */
-	u32 reserved[60];
-	u32 ecc_scrub; /* 0xF4 */
-};
-#define ddrc_base ((struct ddrc_regs *)ZYNQ_DDRC_BASEADDR)
-
-struct efuse_reg {
-	u32 reserved1[4];
-	u32 status;
-	u32 reserved2[3];
-};
-
-#define efuse_base ((struct efuse_reg *)ZYNQ_EFUSE_BASEADDR)
-
-#endif /* _ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
deleted file mode 100644
index 9d50e24..0000000
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013 Xilinx Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
-
-extern void zynq_slcr_lock(void);
-extern void zynq_slcr_unlock(void);
-extern void zynq_slcr_cpu_reset(void);
-extern void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate);
-extern void zynq_slcr_devcfg_disable(void);
-extern void zynq_slcr_devcfg_enable(void);
-extern u32 zynq_slcr_get_boot_mode(void);
-extern u32 zynq_slcr_get_idcode(void);
-extern int zynq_slcr_get_mio_pin_status(const char *periph);
-extern void zynq_ddrc_init(void);
-extern unsigned int zynq_get_silicon_version(void);
-
-/* Driver extern functions */
-extern int zynq_sdhci_init(phys_addr_t regbase);
-extern int zynq_sdhci_of_init(const void *blob);
-
-extern void ps7_init(void);
-
-#endif /* _SYS_PROTO_H_ */
diff --git a/arch/arm/include/asm/arch-zynqmp/gpio.h b/arch/arm/include/asm/arch-zynqmp/gpio.h
new file mode 100644
index 0000000..098bbde
--- /dev/null
+++ b/arch/arm/include/asm/arch-zynqmp/gpio.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2015 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:      GPL-2.0+
+ */
+
+#ifndef __ARCH_ZYNQMP_GPIO_H
+#define __ARCH_ZYNQMP_GPIO_H
+
+/* Empty file - sdhci requires this. */
+
+#endif
diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index 97fb49a..c9dc49d 100644
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -11,6 +11,12 @@
 #define ZYNQ_SERIAL_BASEADDR0	0xFF000000
 #define ZYNQ_SERIAL_BASEADDR1	0xFF001000
 
+#define ZYNQ_SPI_BASEADDR0	0xFF040000
+#define ZYNQ_SPI_BASEADDR1	0xFF050000
+
+#define ZYNQ_I2C_BASEADDR0	0xFF020000
+#define ZYNQ_I2C_BASEADDR1	0xFF030000
+
 #define ZYNQ_SDHCI_BASEADDR0	0xFF160000
 #define ZYNQ_SDHCI_BASEADDR1	0xFF170000
 
@@ -18,11 +24,15 @@
 #define ZYNQMP_CRL_APB_TIMESTAMP_REF_CTRL_CLKACT	0x1000000
 
 struct crlapb_regs {
-	u32 reserved0[74];
+	u32 reserved0[36];
+	u32 cpu_r5_ctrl; /* 0x90 */
+	u32 reserved1[37];
 	u32 timestamp_ref_ctrl; /* 0x128 */
-	u32 reserved0_1[53];
+	u32 reserved2[53];
 	u32 boot_mode; /* 0x200 */
-	u32 reserved1[26];
+	u32 reserved3[14];
+	u32 rst_lpd_top; /* 0x23C */
+	u32 reserved4[26];
 };
 
 #define crlapb_base ((struct crlapb_regs *)ZYNQMP_CRL_APB_BASEADDR)
@@ -41,12 +51,47 @@ struct iou_scntr {
 
 /* Bootmode setting values */
 #define BOOT_MODES_MASK	0x0000000F
-#define SD_MODE		0x00000005
+#define SD_MODE		0x00000003
+#define EMMC_MODE	0x00000006
 #define JTAG_MODE	0x00000000
 
+#define ZYNQMP_RPU_BASEADDR	0xFF9A0000
+
+struct rpu_regs {
+	u32 rpu_glbl_ctrl;
+	u32 reserved0[63];
+	u32 rpu0_cfg; /* 0x100 */
+	u32 reserved1[63];
+	u32 rpu1_cfg; /* 0x200 */
+};
+
+#define rpu_base ((struct rpu_regs *)ZYNQMP_RPU_BASEADDR)
+
+#define ZYNQMP_CRF_APB_BASEADDR	0xFD1A0000
+
+struct crfapb_regs {
+	u32 reserved0[65];
+	u32 rst_fpd_apu; /* 0x104 */
+	u32 reserved1;
+};
+
+#define crfapb_base ((struct crfapb_regs *)ZYNQMP_CRF_APB_BASEADDR)
+
+#define ZYNQMP_APU_BASEADDR	0xFD5C0000
+
+struct apu_regs {
+	u32 reserved0[16];
+	u32 rvbar_addr0_l; /* 0x40 */
+	u32 rvbar_addr0_h; /* 0x44 */
+	u32 reserved1[20];
+};
+
+#define apu_base ((struct apu_regs *)ZYNQMP_APU_BASEADDR)
+
 /* Board version value */
 #define ZYNQMP_CSU_VERSION_SILICON	0x0
 #define ZYNQMP_CSU_VERSION_EP108	0x1
+#define ZYNQMP_CSU_VERSION_VELOCE	0x2
 #define ZYNQMP_CSU_VERSION_QEMU		0x3
 
 #endif /* _ASM_ARCH_HARDWARE_H */