diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
commit | 0a986ea81e1aa8ac17e82cda53cc95158217956e (patch) | |
tree | a054b0ef413b7f327c04137c5768b2da6488511d /arch/arm/boot/dts/imx7d-zii-rmu2.dts | |
parent | kprobes: Replace rp->free_instance with freelist (diff) | |
parent | kprobes: Init kprobes in early_initcall (diff) | |
download | linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.tar.xz linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.zip |
Merge branch 'linus' into perf/kprobes
Merge recent kprobes updates into perf/kprobes that came from -mm.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-zii-rmu2.dts')
-rw-r--r-- | arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-zii-rmu2.dts b/arch/arm/boot/dts/imx7d-zii-rmu2.dts index e5e20b07f184..7cb6153fc650 100644 --- a/arch/arm/boot/dts/imx7d-zii-rmu2.dts +++ b/arch/arm/boot/dts/imx7d-zii-rmu2.dts @@ -58,7 +58,7 @@ <&clks IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <&fec1_phy>; status = "okay"; |