瀏覽代碼

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: Olof Johansson <olof@lixom.net>
Olof Johansson 9 年之前
父節點
當前提交
0b24f7a8d6
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/arm/boot/dts/armada-385-linksys.dtsi
  2. 1 1
      drivers/bus/mvebu-mbus.c

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

@@ -117,7 +117,7 @@
 			};
 			};
 
 
 			/* USB part of the eSATA/USB 2.0 port */
 			/* USB part of the eSATA/USB 2.0 port */
-			usb@50000 {
+			usb@58000 {
 				status = "okay";
 				status = "okay";
 			};
 			};
 
 

+ 1 - 1
drivers/bus/mvebu-mbus.c

@@ -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;
 	return -EINVAL;
 }
 }
 EXPORT_SYMBOL_GPL(mvebu_mbus_get_dram_win_info);
 EXPORT_SYMBOL_GPL(mvebu_mbus_get_dram_win_info);