Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / arch / arm / mach-keystone / include / mach / hardware.h

diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h
index 286c63aa9332a8425f1dc6e4acb1e40842a7b36d..8ca19bbcdbe914f31a913b48ea0102474e460ccd 100644 (file)
--- a/arch/arm/mach-keystone/include/mach/hardware.h
+++ b/arch/arm/mach-keystone/include/mach/hardware.h
@@ -125,8 +125,13 @@ typedef volatile unsigned int   *dv_reg_p;
 #define KS2_EDMA_PARAM_1(x)            (0x4020 + (4 * x))
 
 /* NETCP pktdma */
+#ifdef CONFIG_SOC_K2G
+#define KS2_NETCP_PDMA_RX_FREE_QUEUE   113
+#define KS2_NETCP_PDMA_RX_RCV_QUEUE    114
+#else
 #define KS2_NETCP_PDMA_RX_FREE_QUEUE   4001
 #define KS2_NETCP_PDMA_RX_RCV_QUEUE    4002
+#endif
 
 /* Chip Interrupt Controller */
 #define KS2_CIC2_BASE                  0x02608000
@@ -155,6 +160,7 @@ typedef volatile unsigned int   *dv_reg_p;
 #define KS2_LPSC_GEM_0                 15
 #define KS2_LPSC_TETRIS                        52
 #define KS2_TETRIS_PWR_DOMAIN          31
+#define KS2_GEM_0_PWR_DOMAIN           8
 
 /* Chip configuration unlock codes and registers */
 #define KS2_KICK0                      (KS2_DEVICE_STATE_CTRL_BASE + 0x38)