diff mbox

[U-Boot,v2,2/4] sunxi: Add base address for TV encoder

Message ID 20170519154118.28651-3-jernej.skrabec@siol.net
State Accepted
Commit a8191dfec08f863b8f852324f2956e9dd7cc514d
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Jernej Škrabec May 19, 2017, 3:41 p.m. UTC 
This commit adds TVE base address for Allwinner H3 and H5 SoCs.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---

 arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Maxime Ripard May 22, 2017, 7:32 a.m. UTC | #1 
On Fri, May 19, 2017 at 05:41:15PM +0200, Jernej Skrabec wrote:
> This commit adds TVE base address for Allwinner H3 and H5 SoCs.
> 
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Maxime
Anatolij Gustschin June 2, 2017, 8:53 a.m. UTC | #2 
On Fri, 19 May 2017 17:41:15 +0200
Jernej Skrabec jernej.skrabec@siol.net wrote:

> This commit adds TVE base address for Allwinner H3 and H5 SoCs.
> 
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> ---
> 
>  arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 10 ++++++++++
>  1 file changed, 10 insertions(+)

applied to u-boot-video/master, thanks!

--
Anatolij
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
index 6aa5e91ada..2419062d45 100644
--- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
@@ -34,7 +34,9 @@ 
 #define SUNXI_MS_BASE			0x01c07000
 #define SUNXI_TVD_BASE			0x01c08000
 #define SUNXI_CSI0_BASE			0x01c09000
+#ifndef CONFIG_MACH_SUNXI_H3_H5
 #define SUNXI_TVE0_BASE			0x01c0a000
+#endif
 #define SUNXI_EMAC_BASE			0x01c0b000
 #define SUNXI_LCD0_BASE			0x01c0C000
 #define SUNXI_LCD1_BASE			0x01c0d000
@@ -161,10 +163,18 @@  defined(CONFIG_MACH_SUN50I)
 /* module sram */
 #define SUNXI_SRAM_C_BASE		0x01d00000
 
+#ifndef CONFIG_MACH_SUN8I_H3
 #define SUNXI_DE_FE0_BASE		0x01e00000
+#else
+#define SUNXI_TVE0_BASE			0x01e00000
+#endif
 #define SUNXI_DE_FE1_BASE		0x01e20000
 #define SUNXI_DE_BE0_BASE		0x01e60000
+#ifndef CONFIG_MACH_SUN50I_H5
 #define SUNXI_DE_BE1_BASE		0x01e40000
+#else
+#define SUNXI_TVE0_BASE			0x01e40000
+#endif
 #define SUNXI_MP_BASE			0x01e80000
 #define SUNXI_AVG_BASE			0x01ea0000