tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2014-03-17 10:14:40 +01:00
parent 8d445234dc 35c3a9c807
commit 3c883ef345
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/efm32gg-dk3750.dts
+1 -1
View File
@@ -26,7 +26,7 @@
};
i2c@4000a000 {
location = <3>;
efm32,location = <3>;
status = "ok"
temp@48 {
arch/arm/boot/dts/efm32gg.dtsi
+2 -2
View File
@@ -84,7 +84,7 @@
status = "disabled";
};
spi2: spi@40x4000c800 { /* USART2 */
spi2: spi@4000c800 { /* USART2 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,spi";
@@ -110,7 +110,7 @@
status = "disabled";
};
uart2: uart@40x4000c800 { /* USART2 */
uart2: uart@4000c800 { /* USART2 */
compatible = "efm32,uart";
reg = <0x4000c800 0x400>;
interrupts = <18 19>;