diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2020-03-05 12:12:38 +0100 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2020-04-06 09:56:35 +0200 |
| commit | dd5f2351e99aad8fcbedbc1305b8b51b09952336 (patch) | |
| tree | 727bfd4c1de1adc8af73e5d0538876818cb9ea6f /arch/arm/dts/meson-khadas-vim3.dtsi | |
| parent | b3d69aa596599c7c940f7ad463c04b693589ff9a (diff) | |
| download | u-boot-dd5f2351e99aad8fcbedbc1305b8b51b09952336.tar.gz | |
arm64: dts: meson: sync dt and bindings from v5.6-rc2
Sync the device tree and dt-bindings from Linux v5.6-rc2
11a48a5a18c6 ("Linux 5.6-rc2")
The only exception to this is the mmc pinctrl pin bias of gxl SoC family.
This is a fix which found its way to u-boot but not Linux yet.
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'arch/arm/dts/meson-khadas-vim3.dtsi')
| -rw-r--r-- | arch/arm/dts/meson-khadas-vim3.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/dts/meson-khadas-vim3.dtsi b/arch/arm/dts/meson-khadas-vim3.dtsi index 8647da7d66..90815fa25e 100644 --- a/arch/arm/dts/meson-khadas-vim3.dtsi +++ b/arch/arm/dts/meson-khadas-vim3.dtsi @@ -246,6 +246,10 @@ linux,rc-map-name = "rc-khadas"; }; +&pcie { + reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; +}; + &pwm_ef { status = "okay"; pinctrl-0 = <&pwm_e_pins>; @@ -274,6 +278,9 @@ non-removable; disable-wp; + /* WiFi firmware requires power to be kept while in suspend */ + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; vmmc-supply = <&vsys_3v3>; |