提交 3c883ef3 编写于 作者: A Arnd Bergmann

Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt

Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:

* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
  ARM: efm32: properly namespace i2c location property
  ARM: efm32: fix unit address part in USART2 device nodes' names
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
}; };
i2c@4000a000 { i2c@4000a000 {
location = <3>; efm32,location = <3>;
status = "ok"; status = "ok";
temp@48 { temp@48 {
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
status = "disabled"; status = "disabled";
}; };
spi2: spi@40x4000c800 { /* USART2 */ spi2: spi@4000c800 { /* USART2 */
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "efm32,spi"; compatible = "efm32,spi";
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
status = "disabled"; status = "disabled";
}; };
uart2: uart@40x4000c800 { /* USART2 */ uart2: uart@4000c800 { /* USART2 */
compatible = "efm32,uart"; compatible = "efm32,uart";
reg = <0x4000c800 0x400>; reg = <0x4000c800 0x400>;
interrupts = <18 19>; interrupts = <18 19>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册