diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-03 10:26:50 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-03 10:29:26 +0900 |
| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f (patch) | |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c /drivers/soc/imx/gpcv2.c | |
| parent | f6779e4e53b6177c319f05b61a5c447137d0ab70 (diff) | |
| parent | d0fbad0aec1df29717fab736eb24c8a49cf2c70b (diff) | |
| download | linux-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Simple overlapping changes in stmmac driver.
Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/soc/imx/gpcv2.c')
| -rw-r--r-- | drivers/soc/imx/gpcv2.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c index f4e3bd40c72e..6ef18cf8f243 100644 --- a/drivers/soc/imx/gpcv2.c +++ b/drivers/soc/imx/gpcv2.c @@ -39,10 +39,15 @@ #define GPC_M4_PU_PDN_FLG 0x1bc - -#define PGC_MIPI 4 -#define PGC_PCIE 5 -#define PGC_USB_HSIC 8 +/* + * The PGC offset values in Reference Manual + * (Rev. 1, 01/2018 and the older ones) GPC chapter's + * GPC_PGC memory map are incorrect, below offset + * values are from design RTL. + */ +#define PGC_MIPI 16 +#define PGC_PCIE 17 +#define PGC_USB_HSIC 20 #define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40) #define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc) |