leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two more dt related efm32 fixes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJTI2uWAAoJEOLc3ZEyZpvWwWMP/1Ctb7sYvk3NDSQf4/TCI7sy
 stb4nfuIn6/uDFAFHRbMDnTZbt+sF9w+mNkb7lPHoiXu7MAXW1agHjdP/o46RuWd
 4a+4eL24VSZiJ2h8FryowQ9YGMusJRngZKAZ/nVXFQ1J7kc+vNl2b2tkV7KD44JI
 CPwMTVUHeyb4a48hDfPo+O+bpqen0FP2I3Yo0XPFhi1s8Je2qMEb18K7JSKNHvXg
 TLMfbNCpW+hiicQoBx4aDLQilRxpy7/VrGOU4x+fHax8co8qpRNFFX7r+bguhmYE
 fQULZKfCybdynBi5puxccuaZCbxWFjVhHSIJvbhF/qY15Gg8Q4AJVmqsazpa71Jc
 bC/TAXb+R5bNlqNBO3rhAR2j8ZDRLHbdn1NHF8S34Ck4JeI9NUNH6gJ22Bess/wi
 A91B0SADHRibzTL6iKVff8f2zf9jsWUmX4pVI5eI7N7p4Lj8/eUmb7YT56Wy5YP2
 8OQ09JWezd5Il7kPRxW+OJbMgxyVFm9LIqtoVUO5cbQabS42c4nXEzQtBXDa7QvY
 Ouh9jp/+yFXoqA1FbpBwbr6pe52Dc27byJ1QAg3zBNnB1eJ2M5pYqXREAbF2weWb
 PzvsxgU3WGM0OIzeYmSmptd0K5LHE6Tva6L0ofOd4UMMQTVB8MVSXsgW9OAgQw5B
 6VrZOQJFIM+B8sk9Nq7m
 =vy3D
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-03-17 10:14:40 +01:00
commit 3c883ef345
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/efm32gg-dk3750.dts
View File

@ -26,7 +26,7 @@
};
i2c@4000a000 {
location = <3>;
efm32,location = <3>;
status = "ok";
temp@48 {

4
arch/arm/boot/dts/efm32gg.dtsi
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>;