diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:27 +0100 |
| commit | 0d9d05e51baccd2ce0924183abd3712f7c906365 (patch) | |
| tree | b28237a11965d6b92f7f02941f7ae6faec0438b2 /arch | |
| parent | 326157bf8fa15512fd01d815177caa1acd12e07d (diff) | |
| parent | 20df11b6d06664c1333abdc4d7e8123bf62664e3 (diff) | |
| download | linux-next-0d9d05e51baccd2ce0924183abd3712f7c906365.tar.gz linux-next-0d9d05e51baccd2ce0924183abd3712f7c906365.zip | |
Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/xilinx/zynq-parallella.dts | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi index 153b8d93cbee..715299f5d860 100644 --- a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi +++ b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi @@ -380,10 +380,10 @@ * "dma4", "dma5", "dma6", "dma7"; */ interrupts = <0 13 4>, - <0 14 4>, <0 15 4>, - <0 16 4>, <0 17 4>, - <0 40 4>, <0 41 4>, - <0 42 4>, <0 43 4>; + <0 14 4>, <0 15 4>, + <0 16 4>, <0 17 4>, + <0 40 4>, <0 41 4>, + <0 42 4>, <0 43 4>; #dma-cells = <1>; clocks = <&clkc 27>; clock-names = "apb_pclk"; diff --git a/arch/arm/boot/dts/xilinx/zynq-parallella.dts b/arch/arm/boot/dts/xilinx/zynq-parallella.dts index 366af4fcf8d9..b4651540935a 100644 --- a/arch/arm/boot/dts/xilinx/zynq-parallella.dts +++ b/arch/arm/boot/dts/xilinx/zynq-parallella.dts @@ -44,10 +44,10 @@ ethernet_phy: ethernet-phy@0 { /* Marvell 88E1318 */ compatible = "ethernet-phy-id0141.0e90", - "ethernet-phy-ieee802.3-c22"; + "ethernet-phy-ieee802.3-c22"; reg = <0>; marvell,reg-init = <0x3 0x10 0xff00 0x1e>, - <0x3 0x11 0xfff0 0xa>; + <0x3 0x11 0xfff0 0xa>; }; }; |