diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-12-12 13:25:54 +0100 |
commit | 76523de61993d015f7895d06deacd3fd454574a1 (patch) | |
tree | 7b2890ac9733c55ff73c72bba7b6b5c788ba925b /arch/arm/boot/dts/omap5-board-common.dtsi | |
parent | uprobes/x86: Emulate push insns for uprobe on x86 (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | linux-76523de61993d015f7895d06deacd3fd454574a1.tar.xz linux-76523de61993d015f7895d06deacd3fd454574a1.zip |
Merge tag 'v4.15-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/omap5-board-common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap5-board-common.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi index 575ecffb0e9e..1b20838bb9a4 100644 --- a/arch/arm/boot/dts/omap5-board-common.dtsi +++ b/arch/arm/boot/dts/omap5-board-common.dtsi @@ -73,12 +73,14 @@ clocks = <&auxclk1_ck>; clock-names = "main_clk"; clock-frequency = <19200000>; + #phy-cells = <0>; }; /* HS USB Host PHY on PORT 3 */ hsusb3_phy: hsusb3_phy { compatible = "usb-nop-xceiv"; reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; /* gpio3_79 ETH_NRESET */ + #phy-cells = <0>; }; tpd12s015: encoder { |