Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / arm / include / asm / arch-mx6 / sys_proto.h

diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index bfdfd2911d05b10773ffcd53b93ae2de90899866..b22a7a0f8b76dcc41f7bc8d8565a6eb57b75954e 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -5,39 +5,14 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
+#include <asm/mach-imx/sys_proto.h>
 
-#include <asm/imx-common/regs-common.h>
+#define USBPHY_PWD             0x00000000
 
-#define MXC_CPU_MX51           0x51
-#define MXC_CPU_MX53           0x53
-#define MXC_CPU_MX6SL          0x60
-#define MXC_CPU_MX6DL          0x61
-#define MXC_CPU_MX6SOLO                0x62
-#define MXC_CPU_MX6Q           0x63
+#define USBPHY_PWD_RXPWDRX     (1 << 20) /* receiver block power down */
 
-#define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
-u32 get_cpu_rev(void);
-const char *get_imx_type(u32 imxtype);
-unsigned imx_ddr_size(void);
+#define is_usbotg_phy_active(void) (!(readl(USB_PHY0_BASE_ADDR + USBPHY_PWD) & \
+                                  USBPHY_PWD_RXPWDRX))
 
-void set_vddsoc(u32 mv);
-
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-
-int fecmxc_initialize(bd_t *bis);
-u32 get_ahb_clk(void);
-u32 get_periph_clk(void);
-
-int mxs_reset_block(struct mxs_register_32 *reg);
-int mxs_wait_mask_set(struct mxs_register_32 *reg,
-                      uint32_t mask,
-                      unsigned int timeout);
-int mxs_wait_mask_clr(struct mxs_register_32 *reg,
-                      uint32_t mask,
-                      unsigned int timeout);
-#endif
+int imx6_pcie_toggle_power(void);
+int imx6_pcie_toggle_reset(void);