diff mbox series

drivers: video: rockchip: fix building eDP and LVDS drivers

Message ID 20200420181825.935797-1-pbrobinson@gmail.com
State Accepted
Commit 973e31fd476686e9bf7eee0e0ff51afdbbc8c61e
Headers show
Series drivers: video: rockchip: fix building eDP and LVDS drivers | expand

Commit Message

Peter Robinson April 20, 2020, 6:18 p.m. UTC
The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in
hardware.h so include it so the drivers build. Adjust rk_lvds.c so
includes are in alphabetical order while updating.

Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
---
 drivers/video/rockchip/rk_edp.c  | 1 +
 drivers/video/rockchip/rk_lvds.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Anatolij Gustschin April 20, 2020, 6:45 p.m. UTC | #1
On Mon, 20 Apr 2020 19:18:25 +0100
Peter Robinson pbrobinson at gmail.com wrote:

> The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in
> hardware.h so include it so the drivers build. Adjust rk_lvds.c so
> includes are in alphabetical order while updating.
> 
> Signed-off-by: Peter Robinson <pbrobinson at gmail.com>

Reviewed-by: Anatolij Gustschin <agust at denx.de>

--
Anatolij
Vagrant Cascadian April 21, 2020, 1:02 a.m. UTC | #2
On 2020-04-20, Peter Robinson wrote:
> The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in
> hardware.h so include it so the drivers build. Adjust rk_lvds.c so
> includes are in alphabetical order while updating.
>
> Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
> Reviewed-by: Anatolij Gustschin <agust at denx.de>

This fixed the build I was having with the pinebook pro patches when
applied to v2020.04, built on both Debian and GNU Guix.

Thanks!

Tested-by: Vagrant Cascadian <vagrant at debian.org>

> ---
>  drivers/video/rockchip/rk_edp.c  | 1 +
>  drivers/video/rockchip/rk_lvds.c | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
> index 8703df0ec0..cf84b886e7 100644
> --- a/drivers/video/rockchip/rk_edp.c
> +++ b/drivers/video/rockchip/rk_edp.c
> @@ -18,6 +18,7 @@
>  #include <asm/arch-rockchip/clock.h>
>  #include <asm/arch-rockchip/edp_rk3288.h>
>  #include <asm/arch-rockchip/grf_rk3288.h>
> +#include <asm/arch-rockchip/hardware.h>
>  #include <dt-bindings/clock/rk3288-cru.h>
>  
>  #define MAX_CR_LOOP 5
> diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
> index cf5c0439b1..79e24baf53 100644
> --- a/drivers/video/rockchip/rk_lvds.c
> +++ b/drivers/video/rockchip/rk_lvds.c
> @@ -13,8 +13,9 @@
>  #include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/clock.h>
> -#include <asm/arch-rockchip/lvds_rk3288.h>
>  #include <asm/arch-rockchip/grf_rk3288.h>
> +#include <asm/arch-rockchip/hardware.h>
> +#include <asm/arch-rockchip/lvds_rk3288.h>
>  #include <dt-bindings/clock/rk3288-cru.h>
>  #include <dt-bindings/video/rk3288.h>
>  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200420/cb9c018b/attachment-0001.sig>
Anatolij Gustschin April 26, 2020, 9:10 p.m. UTC | #3
On Mon, 20 Apr 2020 19:18:25 +0100
Peter Robinson pbrobinson at gmail.com wrote:

> The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in
> hardware.h so include it so the drivers build. Adjust rk_lvds.c so
> includes are in alphabetical order while updating.
> 
> Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
> ---
>  drivers/video/rockchip/rk_edp.c  | 1 +
>  drivers/video/rockchip/rk_lvds.c | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)

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

--
Anatolij
diff mbox series

Patch

diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 8703df0ec0..cf84b886e7 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -18,6 +18,7 @@ 
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/edp_rk3288.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
+#include <asm/arch-rockchip/hardware.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 
 #define MAX_CR_LOOP 5
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index cf5c0439b1..79e24baf53 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -13,8 +13,9 @@ 
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/lvds_rk3288.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
+#include <asm/arch-rockchip/hardware.h>
+#include <asm/arch-rockchip/lvds_rk3288.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <dt-bindings/video/rk3288.h>