Commit b6dad517 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux 

Pull NIOS2 dts fix from Dinh Nguyen:

 - Fix tse_mac "max-frame-size" property

* tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  nios2: dts: Fix tse_mac "max-frame-size" property
parents 15adb51c 85041e12

arch/nios2/boot/dts/10m50_devboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
			rx-fifo-depth = <8192>;

			tx-fifo-depth = <8192>;

			address-bits = <48>;

			max-frame-size = <1518>;

			max-frame-size = <1500>;

			local-mac-address = [00 00 00 00 00 00];

			altr,has-supplementary-unicast;

			altr,enable-sup-addr = <1>;

arch/nios2/boot/dts/3c120_devboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
				interrupt-names = "rx_irq", "tx_irq";

				rx-fifo-depth = <8192>;

				tx-fifo-depth = <8192>;

				max-frame-size = <1518>;

				max-frame-size = <1500>;

				local-mac-address = [ 00 00 00 00 00 00 ];

				phy-mode = "rgmii-id";

				phy-handle = <&phy0>;