Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b24f7a8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu into fixes 

mvebu fixes for 4.6 (part 1)

- fix USB adress register for Linksys Armada 388 based boards
- fix build warning in mvebu-mbus

* tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: Correct unit address for linksys
  bus: mvebu-mbus: use %pa to print phys_addr_t

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 452a31fd 199831c7

arch/arm/boot/dts/armada-385-linksys.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
			};



			/* USB part of the eSATA/USB 2.0 port */

			usb@50000 {

			usb@58000 {

				status = "okay";

			};

drivers/bus/mvebu-mbus.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr) 
		}

	}



	pr_err("invalid dram address 0x%x\n", phyaddr);

	pr_err("invalid dram address %pa\n", &phyaddr);

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(mvebu_mbus_get_dram_win_info);