diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:41:53 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:41:53 +0100 |
commit | 9a2dd570591ea1d53284208ab8838c0ab2a08340 (patch) | |
tree | 19bdbaded0ca8717198067911a1a91c3d7731a3b /arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | |
parent | 9211f0a6a91ada1ee28b3fb5f30d79c8a67c73b1 (diff) | |
parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) |
Merge 5.6-rc5 into driver-core-next
We need the driver core and debugfs changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi index 978dc1c2ff1b..4d18952658f8 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi @@ -192,7 +192,6 @@ pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <8>; non-removable; - vmmc-supply = <&vdd_emmc_1p8>; status = "disabled"; }; |