diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2020-04-20 15:44:41 +0200 |
---|---|---|
committer | Neil Armstrong <narmstrong@baylibre.com> | 2020-04-28 10:23:10 +0200 |
commit | 3a7d6a9c8f90cf260c7fe4abf921028c8775233b (patch) | |
tree | 2db49f1a4d656d02379d2bb4b86bc0c202c970e5 /arch/arm/dts/meson-sm1-khadas-vim3l.dts | |
parent | df42f321390411285dac3df603f6eb583d593481 (diff) |
arm64: dts: meson: sync dt and bindings from v5.7-rc1
Sync the device tree and dt-bindings from Linux v5.7-rc1 8f3d9f354286
("Linux 5.7-rc1").
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'arch/arm/dts/meson-sm1-khadas-vim3l.dts')
-rw-r--r-- | arch/arm/dts/meson-sm1-khadas-vim3l.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l.dts b/arch/arm/dts/meson-sm1-khadas-vim3l.dts index 1001b376ca..dbbf29a0db 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l.dts +++ b/arch/arm/dts/meson-sm1-khadas-vim3l.dts @@ -72,9 +72,10 @@ /* * The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between - * an USB3.0 Type A connector and a M.2 Key M slot. The PHY driving - * these differential lines is shared between the USB3.0 controller - * and the PCIe Controller, thus only a single controller can use it. + * an USB3.0 Type A connector and a M.2 Key M slot. + * The PHY driving these differential lines is shared between + * the USB3.0 controller and the PCIe Controller, thus only + * a single controller can use it. * If the MCU is configured to mux the PCIe/USB3.0 differential lines * to the M.2 Key M slot, uncomment the following block to disable * USB3.0 from the USB Complex and enable the PCIe controller. @@ -82,7 +83,6 @@ * testing purposes, but instead rely on the firmware/bootloader to * update these nodes accordingly if PCIe mode is selected by the MCU. */ - /* &pcie { status = "okay"; |