[U-Boot,v3,03/20] rockchip: grf_rv1108.h: Fix the grf offsets

Message ID 1515822853-52036-4-git-send-email-david.wu@rock-chips.com
State Accepted
Delegated to: Philipp Tomsich
Headers show
Series
  • Add gmac support for rk3399-evb rv1108-evb rk3328-evb and rk3229-evb
Related show

Commit Message

David Wu Jan. 13, 2018, 5:53 a.m.
The last 4 grf registers offset of rv1108 are wrong, fix them
for correct usage.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v3:
- None

Changes in v2:
- New patch

 arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Dr. Philipp Tomsich Jan. 25, 2018, 9:42 a.m. | #1
> The last 4 grf registers offset of rv1108 are wrong, fix them
> for correct usage.
> 
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - New patch
> 
>  arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Dr. Philipp Tomsich Jan. 25, 2018, 9:46 a.m. | #2
> The last 4 grf registers offset of rv1108 are wrong, fix them
> for correct usage.
> 
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - New patch
> 
>  arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Dr. Philipp Tomsich Jan. 28, 2018, 4:12 p.m. | #3
> The last 4 grf registers offset of rv1108 are wrong, fix them
> for correct usage.
> 
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3:
> - None
> 
> Changes in v2:
> - New patch
> 
>  arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 

Applied to u-boot-rockchip, thanks!

Patch

diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
index c816a5b..428cf6a 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
@@ -100,13 +100,17 @@  struct rv1108_grf {
 	u32 reserved14[2];
 	u32 dma_con0;
 	u32 dma_con1;
-	u32 reserved15[539];
+	u32 reserved15[59];
 	u32 uoc_status;
+	u32 reserved16[2];
 	u32 host_status;
+	u32 reserved17[59];
 	u32 gmac_con0;
+	u32 reserved18[191];
 	u32 chip_id;
 };
-check_member(rv1108_grf, chip_id, 0xf90);
+
+check_member(rv1108_grf, chip_id, 0x0c00);
 
 /* GRF_GPIO1B_IOMUX */
 enum {