diff mbox series

[1/2] arm: dts: khadas-vim3: include meson-g12-common-u-boot.dtsi to enable HDMI output

Message ID 20200511131728.5570-1-narmstrong@baylibre.com
State Accepted
Commit 21981c105996b10d62f7038e5eca59218c854050
Headers show
Series [1/2] arm: dts: khadas-vim3: include meson-g12-common-u-boot.dtsi to enable HDMI output | expand

Commit Message

Neil Armstrong May 11, 2020, 1:17 p.m. UTC
Include the common g12 u-boot tweaks to permit enabling video output tweaks
on Khadas VIM3 boards.

Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
---
 arch/arm/dts/meson-khadas-vim3-u-boot.dtsi | 2 ++
 1 file changed, 2 insertions(+)

Comments

Neil Armstrong May 13, 2020, 9:01 a.m. UTC | #1
On 11/05/2020 15:17, Neil Armstrong wrote:
> Include the common g12 u-boot tweaks to permit enabling video output tweaks
> on Khadas VIM3 boards.
> 
> Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
> ---
>  arch/arm/dts/meson-khadas-vim3-u-boot.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
> index 81fd5be378..b5da4fdfc3 100644
> --- a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
> +++ b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
> @@ -4,6 +4,8 @@
>   * Author: Neil Armstrong <narmstrong at baylibre.com>
>   */
>  
> +#include "meson-g12-common-u-boot.dtsi"
> +
>  / {
>  	aliases {
>  		spi0 = &spifc;
> 

Applied to u-boot-amlogic

Neil
Neil Armstrong May 13, 2020, 9:01 a.m. UTC | #2
On 11/05/2020 15:17, Neil Armstrong via groups.io wrote:
> Enable options to permit HDMI output on Khadas VIM3 & VIM3L boards.
> 
> Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
> ---
>  configs/khadas-vim3_defconfig  | 9 +++++++++
>  configs/khadas-vim3l_defconfig | 4 ++++
>  2 files changed, 13 insertions(+)
> 
> diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig
> index 692138eb11..4aeab0e35d 100644
> --- a/configs/khadas-vim3_defconfig
> +++ b/configs/khadas-vim3_defconfig
> @@ -40,6 +40,8 @@ CONFIG_ETH_DESIGNWARE=y
>  CONFIG_MESON_G12A_USB_PHY=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_MESON_G12A=y
> +CONFIG_POWER_DOMAIN=y
> +CONFIG_MESON_EE_POWER_DOMAIN=y
>  CONFIG_DM_REGULATOR=y
>  CONFIG_DM_REGULATOR_FIXED=y
>  CONFIG_DM_RESET=y
> @@ -55,6 +57,7 @@ CONFIG_DM_USB=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_DWC3=y
>  CONFIG_USB_DWC3=y
> +CONFIG_USB_KEYBOARD=y
>  # CONFIG_USB_DWC3_GADGET is not set
>  CONFIG_USB_DWC3_MESON_G12A=y
>  CONFIG_USB_GADGET=y
> @@ -63,4 +66,10 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
>  CONFIG_USB_GADGET_DWC2_OTG=y
>  CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_DM_VIDEO=y
> +# CONFIG_VIDEO_BPP8 is not set
> +# CONFIG_VIDEO_BPP16 is not set
> +CONFIG_SYS_WHITE_ON_BLACK=y
> +CONFIG_VIDEO_MESON=y
> +CONFIG_VIDEO_DT_SIMPLEFB=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig
> index 28c20c0d6d..887885f329 100644
> --- a/configs/khadas-vim3l_defconfig
> +++ b/configs/khadas-vim3l_defconfig
> @@ -57,6 +57,7 @@ CONFIG_DM_USB=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_DWC3=y
>  CONFIG_USB_DWC3=y
> +CONFIG_USB_KEYBOARD=y
>  # CONFIG_USB_DWC3_GADGET is not set
>  CONFIG_USB_DWC3_MESON_G12A=y
>  CONFIG_USB_GADGET=y
> @@ -66,6 +67,9 @@ CONFIG_USB_GADGET_DWC2_OTG=y
>  CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_DM_VIDEO=y
> +# CONFIG_VIDEO_BPP8 is not set
> +# CONFIG_VIDEO_BPP16 is not set
> +CONFIG_SYS_WHITE_ON_BLACK=y
>  CONFIG_VIDEO_MESON=y
>  CONFIG_VIDEO_DT_SIMPLEFB=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
>
Applied to u-boot-amlogic

Neil
diff mbox series

Patch

diff --git a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
index 81fd5be378..b5da4fdfc3 100644
--- a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
+++ b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi
@@ -4,6 +4,8 @@ 
  * Author: Neil Armstrong <narmstrong at baylibre.com>
  */
 
+#include "meson-g12-common-u-boot.dtsi"
+
 / {
 	aliases {
 		spi0 = &spifc;