github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

efm32 cleanups for 4.4-rc1

Browse Source 
These are just two followup cleanups for commits that are in v3.17-rc1 and
 waited in my private tree for application since that time.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABCgAGBQJWCtIwAAoJEMH8FHityuwJFPYH/2LJpi0yUhI01s0D9U5rZgjl
 8mLP70utAMaqXiGqP/O0ndH+za5TrrUTwDJE5jhAHru1Q6q62Ld2BfOR5+K8zlrP
 4UDGBDj3ePJgEtbSsJYJIRT+AKque2GONbeGpJh2arPrNamWChKIz8HoGSgwdRlx
 TvQuVFEa6C3ujP0ATM8x54f0vR4bYm9WmBS522DwZQY4JpGZC005A3Quw6fmFxPJ
 vJRo1fE1d2OZ3Cuxb15m8PLtZw6sbMdMwgyirAFGrJsN9u/V6BzsSzH0s8suT7IP
 WIohnmYtFSUfkQjaGrMl2wIpJSsIzettiXf9GrQDXSGZsQ4k7sW3U+qrcZ7ZUR4=
 =ngv1
 -----END PGP SIGNATURE-----

Merge tag 'efm32-for-4.4-rc1' of git://git.pengutronix.de/git/ukl/linux into next/cleanup

Merge "efm32 cleanups for 4.4-rc1" from Uwe Kleine-Koenig:

These are just two followup cleanups for commits that are in v3.17-rc1 and
waited in my private tree for application since that time.

* tag 'efm32-for-4.4-rc1' of git://git.pengutronix.de/git/ukl/linux:
  ARM: efm32: switch to vendor,device compatible strings
  ARM: efm32: switch to properly namespaced location property
This commit is contained in:
Arnd Bergmann 2015-10-06 15:59:16 +02:00
commit 064ca93f7a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ adc@40002000 {
};
i2c@4000a000 {
efm32,location = <3>;
energymicro,location = <3>;
status = "ok";
temp@48 {
@ -43,7 +43,7 @@ eeprom@50 {
spi0: spi@4000c000 { /* USART0 */
cs-gpios = <&gpio 68 1>; // E4
location = <1>;
energymicro,location = <1>;
status = "ok";
microsd@0 {
@ -57,7 +57,7 @@ microsd@0 {
spi1: spi@4000c400 { /* USART1 */
cs-gpios = <&gpio 51 1>; // D3
location = <1>;
energymicro,location = <1>;
status = "ok";
ks8851@0 {
@ -70,7 +70,7 @@ ks8851@0 {
};
uart4: uart@4000e400 { /* UART1 */
location = <2>;
energymicro,location = <2>;
status = "ok";
};

32
arch/arm/boot/dts/efm32gg.dtsi
View File

@ -23,7 +23,7 @@ aliases {
soc {
adc: adc@40002000 {
compatible = "efm32,adc";
compatible = "energymicro,efm32-adc";
reg = <0x40002000 0x400>;
interrupts = <7>;
clocks = <&cmu clk_HFPERCLKADC0>;
@ -31,7 +31,7 @@ adc: adc@40002000 {
};
gpio: gpio@40006000 {
compatible = "efm32,gpio";
compatible = "energymicro,efm32-gpio";
reg = <0x40006000 0x1000>;
interrupts = <1 11>;
gpio-controller;
@ -45,7 +45,7 @@ gpio: gpio@40006000 {
i2c0: i2c@4000a000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,i2c";
compatible = "energymicro,efm32-i2c";
reg = <0x4000a000 0x400>;
interrupts = <9>;
clocks = <&cmu clk_HFPERCLKI2C0>;
@ -56,7 +56,7 @@ i2c0: i2c@4000a000 {
i2c1: i2c@4000a400 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,i2c";
compatible = "energymicro,efm32-i2c";
reg = <0x4000a400 0x400>;
interrupts = <10>;
clocks = <&cmu clk_HFPERCLKI2C1>;
@ -67,7 +67,7 @@ i2c1: i2c@4000a400 {
spi0: spi@4000c000 { /* USART0 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,spi";
compatible = "energymicro,efm32-spi";
reg = <0x4000c000 0x400>;
interrupts = <3 4>;
clocks = <&cmu clk_HFPERCLKUSART0>;
@ -77,7 +77,7 @@ spi0: spi@4000c000 { /* USART0 */
spi1: spi@4000c400 { /* USART1 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,spi";
compatible = "energymicro,efm32-spi";
reg = <0x4000c400 0x400>;
interrupts = <15 16>;
clocks = <&cmu clk_HFPERCLKUSART1>;
@ -87,7 +87,7 @@ spi1: spi@4000c400 { /* USART1 */
spi2: spi@4000c800 { /* USART2 */
#address-cells = <1>;
#size-cells = <0>;
compatible = "efm32,spi";
compatible = "energymicro,efm32-spi";
reg = <0x4000c800 0x400>;
interrupts = <18 19>;
clocks = <&cmu clk_HFPERCLKUSART2>;
@ -95,7 +95,7 @@ spi2: spi@4000c800 { /* USART2 */
};
uart0: uart@4000c000 { /* USART0 */
compatible = "efm32,uart";
compatible = "energymicro,efm32-uart";
reg = <0x4000c000 0x400>;
interrupts = <3 4>;
clocks = <&cmu clk_HFPERCLKUSART0>;
@ -103,7 +103,7 @@ uart0: uart@4000c000 { /* USART0 */
};
uart1: uart@4000c400 { /* USART1 */
compatible = "efm32,uart";
compatible = "energymicro,efm32-uart";
reg = <0x4000c400 0x400>;
interrupts = <15 16>;
clocks = <&cmu clk_HFPERCLKUSART1>;
@ -111,7 +111,7 @@ uart1: uart@4000c400 { /* USART1 */
};
uart2: uart@4000c800 { /* USART2 */
compatible = "efm32,uart";
compatible = "energymicro,efm32-uart";
reg = <0x4000c800 0x400>;
interrupts = <18 19>;
clocks = <&cmu clk_HFPERCLKUSART2>;
@ -119,7 +119,7 @@ uart2: uart@4000c800 { /* USART2 */
};
uart3: uart@4000e000 { /* UART0 */
compatible = "efm32,uart";
compatible = "energymicro,efm32-uart";
reg = <0x4000e000 0x400>;
interrupts = <20 21>;
clocks = <&cmu clk_HFPERCLKUART0>;
@ -127,7 +127,7 @@ uart3: uart@4000e000 { /* UART0 */
};
uart4: uart@4000e400 { /* UART1 */
compatible = "efm32,uart";
compatible = "energymicro,efm32-uart";
reg = <0x4000e400 0x400>;
interrupts = <22 23>;
clocks = <&cmu clk_HFPERCLKUART1>;
@ -135,28 +135,28 @@ uart4: uart@4000e400 { /* UART1 */
};
timer0: timer@40010000 {
compatible = "efm32,timer";
compatible = "energymicro,efm32-timer";
reg = <0x40010000 0x400>;
interrupts = <2>;
clocks = <&cmu clk_HFPERCLKTIMER0>;
};
timer1: timer@40010400 {
compatible = "efm32,timer";
compatible = "energymicro,efm32-timer";
reg = <0x40010400 0x400>;
interrupts = <12>;
clocks = <&cmu clk_HFPERCLKTIMER1>;
};
timer2: timer@40010800 {
compatible = "efm32,timer";
compatible = "energymicro,efm32-timer";
reg = <0x40010800 0x400>;
interrupts = <13>;
clocks = <&cmu clk_HFPERCLKTIMER2>;
};
timer3: timer@40010c00 {
compatible = "efm32,timer";
compatible = "energymicro,efm32-timer";
reg = <0x40010c00 0x400>;
interrupts = <14>;
clocks = <&cmu clk_HFPERCLKTIMER3>;