On 28/05/2020 15:47, Neil Armstrong wrote:
> The khadas-vim, khadas-vim2, libretech-ac & libretech-*-pc boards were missing
> DT tweak to enable USB gadget.
> Add them to their -u-boot.dtsi files and include the right gxl-u-boot.dtsi.
>
> Fixes: a19e8a0f03 ("arm: dts: meson-gxl: Add USB Gadget nodes for U-Boot")
> Reported-by: Jerome Brunet <jbru...@baylibre.com>
> Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
> ---
> arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi | 6 +++++-
> arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi | 6 +++++-
> arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi | 4 ++++
> arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 6 +++++-
> arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi | 6 +++++-
> 5 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
> b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
> index c35158d7e9..474a3e1604 100644
> --- a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi
> @@ -4,4 +4,8 @@
> * Author: Neil Armstrong <narmstr...@baylibre.com>
> */
>
> -#include "meson-gx-u-boot.dtsi"
> +#include "meson-gxl-u-boot.dtsi"
> +
> +&dwc2 {
> + status = "okay";
> +};
> diff --git a/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi
> b/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi
> index c35158d7e9..474a3e1604 100644
> --- a/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi
> @@ -4,4 +4,8 @@
> * Author: Neil Armstrong <narmstr...@baylibre.com>
> */
>
> -#include "meson-gx-u-boot.dtsi"
> +#include "meson-gxl-u-boot.dtsi"
> +
> +&dwc2 {
> + status = "okay";
> +};
> diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi
> b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi
> index 39270ea71c..474a3e1604 100644
> --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi
> @@ -5,3 +5,7 @@
> */
>
> #include "meson-gxl-u-boot.dtsi"
> +
> +&dwc2 {
> + status = "okay";
> +};
> diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi
> b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi
> index bec9e05b09..7aecf2696b 100644
> --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi
> @@ -4,7 +4,7 @@
> * Author: Neil Armstrong <narmstr...@baylibre.com>
> */
>
> -#include "meson-gx-u-boot.dtsi"
> +#include "meson-gxl-u-boot.dtsi"
>
> / {
> aliases {
> @@ -12,6 +12,10 @@
> };
> };
>
> +&dwc2 {
> + status = "okay";
> +};
> +
> &sd_emmc_c {
> status = "okay";
> pinctrl-0 = <&emmc_pins>;
> diff --git a/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi
> b/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi
> index c35158d7e9..474a3e1604 100644
> --- a/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi
> @@ -4,4 +4,8 @@
> * Author: Neil Armstrong <narmstr...@baylibre.com>
> */
>
> -#include "meson-gx-u-boot.dtsi"
> +#include "meson-gxl-u-boot.dtsi"
> +
> +&dwc2 {
> + status = "okay";
> +};
>
Applied to u-boot-amlogic
