diff options
author | 2017-10-23 17:21:44 +0200 | |
---|---|---|
committer | 2017-10-23 17:21:44 +0200 | |
commit | 6fbf248a20d362a92de60beee9474faca0b54eee (patch) | |
tree | b5365be73b420be3b6036fb40aaf1b167c90b180 /arch/arm/boot/dts/at91-sama5d27_som1.dtsi | |
parent | genwqe: Take R/W permissions into account when dealing with memory pages (diff) | |
parent | Linux 4.14-rc6 (diff) | |
download | linux-dev-6fbf248a20d362a92de60beee9474faca0b54eee.tar.xz linux-dev-6fbf248a20d362a92de60beee9474faca0b54eee.zip |
Merge 4.14-rc6 into char-misc-next
We want the driver fixes in here and this resolves a merge issue with
the binder driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d27_som1.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi index 63a5af898165..cf0087b4c9e1 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi +++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi @@ -67,8 +67,8 @@ pinctrl-0 = <&pinctrl_macb0_default>; phy-mode = "rmii"; - ethernet-phy@1 { - reg = <0x1>; + ethernet-phy@0 { + reg = <0x0>; interrupt-parent = <&pioA>; interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; |