Skip to content

Commit 3abb0c6

Browse files
arndbarndb
committed
Merge tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "DTS related changes for omaps for v4.9 merge window" from Tony Lindgren: - Update elm phandle for am335x - Fix overo NAND gpmc ranges, this has always been broken so it can wait for the merge window - Fix NAND and use NAND ready pin for logicpd gpmc, this can wait too as it's been using the older configration since the dts got added - A series of dtc warning fixes for unit names - Keep dcdc3, 5 and 6 enabled during suspend on am347x boards - Disable DDR regulator during rtc-only/poweroff mode for am437x boards - Remove redundant regulator compatibles for am437x boards - Increas QSPI max frequency for dra7 boards - Enable QSPI for am57xx-idk-common - Enable am335x-wega audio support - Workaround for i845 for dra7 - Update binding for logicpd boards - Add gpio-decoder nodes for am335x-icev2 board - Add linux,pci-domain property for dra7 - Fix dra7 clock data gmac_gmii_ref_clk_div and related clock tree entries, these can wait for merge window as Ethernet works on dra7 - A series of changes to drop skeleton.dtsi because of dtc warnings * tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (54 commits) ARM: dts: dra7: Add missing unit name to memory nodes ARM: dts: dra62x: Add missing unit name to memory nodes ARM: dts: dm8168: Add missing unit name to memory nodes ARM: dts: dm8148: Add missing unit name to memory nodes ARM: dts: am572x: Add missing unit name to memory nodes ARM: dts: am4372: Add missing unit name to memory nodes ARM: dts: am3517: Add missing unit name to memory nodes ARM: dts: am335x: Add missing unit name to memory nodes ARM: dts: omap5: Add missing unit name to memory nodes ARM: dts: omap4: Add missing unit name to memory nodes ARM: dts: omap3: Add missing unit name to memory nodes ARM: dts: omap2: Add missing unit name to memory nodes ARM: dts: am4372: Remove skeleton.dtsi usage ARM: dts: dra7: Remove skeleton.dtsi usage ARM: dts: dm816x: Remove skeleton.dtsi usage ARM: dts: dm814x: Remove skeleton.dtsi usage ARM: dts: am33xx: Remove skeleton.dtsi usage ARM: dts: omap5: Remove skeleton.dtsi usage ARM: dts: omap4: Remove skeleton.dtsi usage ARM: dts: omap3: Remove skeleton.dtsi usage ...
2 parents cbd1d63 + 5c4d9f0 commit 3abb0c6

File tree

92 files changed

+415
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+415
-248
lines changed

‎Documentation/devicetree/bindings/arm/omap/omap.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,9 @@ Boards:
180180

181181
- DRA722 EVM: Software Development Board for DRA722
182182
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"
183+
184+
- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth
185+
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"
186+
187+
- DM3730 Logic PD SOM-LV: Commercial System on Module with WiFi and Bluetooth
188+
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3"

‎arch/arm/boot/dts/am335x-baltos.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@
2424
};
2525
};
2626

27-
memory {
27+
memory@80000000 {
2828
device_type = "memory";
2929
reg = <0x80000000 0x10000000>; /* 256 MB */
3030
};
3131

32-
vbat: fixedregulator@0 {
32+
vbat: fixedregulator0 {
3333
compatible = "regulator-fixed";
3434
regulator-name = "vbat";
3535
regulator-min-microvolt = <5000000>;
3636
regulator-max-microvolt = <5000000>;
3737
regulator-boot-on;
3838
};
3939

40-
wl12xx_vmmc: fixedregulator@2 {
40+
wl12xx_vmmc: fixedregulator2 {
4141
pinctrl-names = "default";
4242
pinctrl-0 = <&wl12xx_gpio>;
4343
compatible = "regulator-fixed";
@@ -226,7 +226,7 @@
226226

227227
#address-cells = <1>;
228228
#size-cells = <1>;
229-
elm_id = <&elm>;
229+
ti,elm-id = <&elm>;
230230
};
231231
};
232232

‎arch/arm/boot/dts/am335x-base0033.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
compatible = "gpio-leds";
3131

32-
led@0 {
32+
led0 {
3333
label = "base:red:user";
3434
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; /* gpio1_21 */
3535
default-state = "off";
3636
};
3737

38-
led@1 {
38+
led1 {
3939
label = "base:green:user";
4040
gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; /* gpio2_0 */
4141
default-state = "off";

‎arch/arm/boot/dts/am335x-bone-common.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
};
1414
};
1515

16-
memory {
16+
memory@80000000 {
1717
device_type = "memory";
1818
reg = <0x80000000 0x10000000>; /* 256 MB */
1919
};
@@ -28,36 +28,36 @@
2828

2929
compatible = "gpio-leds";
3030

31-
led@2 {
31+
led2 {
3232
label = "beaglebone:green:heartbeat";
3333
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
3434
linux,default-trigger = "heartbeat";
3535
default-state = "off";
3636
};
3737

38-
led@3 {
38+
led3 {
3939
label = "beaglebone:green:mmc0";
4040
gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
4141
linux,default-trigger = "mmc0";
4242
default-state = "off";
4343
};
4444

45-
led@4 {
45+
led4 {
4646
label = "beaglebone:green:usr2";
4747
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
4848
linux,default-trigger = "cpu0";
4949
default-state = "off";
5050
};
5151

52-
led@5 {
52+
led5 {
5353
label = "beaglebone:green:usr3";
5454
gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
5555
linux,default-trigger = "mmc1";
5656
default-state = "off";
5757
};
5858
};
5959

60-
vmmcsd_fixed: fixedregulator@0 {
60+
vmmcsd_fixed: fixedregulator0 {
6161
compatible = "regulator-fixed";
6262
regulator-name = "vmmcsd_fixed";
6363
regulator-min-microvolt = <3300000>;

‎arch/arm/boot/dts/am335x-chilisom.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
};
2020
};
2121

22-
memory {
22+
memory@80000000 {
2323
device_type = "memory";
2424
reg = <0x80000000 0x20000000>; /* 512 MB */
2525
};

‎arch/arm/boot/dts/am335x-cm-t335.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
model = "CompuLab CM-T335";
1818
compatible = "compulab,cm-t335", "ti,am33xx";
1919

20-
memory {
20+
memory@80000000 {
2121
device_type = "memory";
2222
reg = <0x80000000 0x8000000>; /* 128 MB */
2323
};
@@ -26,23 +26,23 @@
2626
compatible = "gpio-leds";
2727
pinctrl-names = "default";
2828
pinctrl-0 = <&gpio_led_pins>;
29-
led@0 {
29+
led0 {
3030
label = "cm_t335:green";
3131
gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* gpio2_0 */
3232
linux,default-trigger = "heartbeat";
3333
};
3434
};
3535

3636
/* regulator for mmc */
37-
vmmc_fixed: fixedregulator@0 {
37+
vmmc_fixed: fixedregulator0 {
3838
compatible = "regulator-fixed";
3939
regulator-name = "vmmc_fixed";
4040
regulator-min-microvolt = <3300000>;
4141
regulator-max-microvolt = <3300000>;
4242
};
4343

4444
/* Regulator for WiFi */
45-
vwlan_fixed: fixedregulator@2 {
45+
vwlan_fixed: fixedregulator2 {
4646
compatible = "regulator-fixed";
4747
regulator-name = "vwlan_fixed";
4848
gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */

‎arch/arm/boot/dts/am335x-evm.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
};
2121
};
2222

23-
memory {
23+
memory@80000000 {
2424
device_type = "memory";
2525
reg = <0x80000000 0x10000000>; /* 256 MB */
2626
};
2727

28-
vbat: fixedregulator@0 {
28+
vbat: fixedregulator0 {
2929
compatible = "regulator-fixed";
3030
regulator-name = "vbat";
3131
regulator-min-microvolt = <5000000>;
3232
regulator-max-microvolt = <5000000>;
3333
regulator-boot-on;
3434
};
3535

36-
lis3_reg: fixedregulator@1 {
36+
lis3_reg: fixedregulator1 {
3737
compatible = "regulator-fixed";
3838
regulator-name = "lis3_reg";
3939
regulator-boot-on;
4040
};
4141

42-
wlan_en_reg: fixedregulator@2 {
42+
wlan_en_reg: fixedregulator2 {
4343
compatible = "regulator-fixed";
4444
regulator-name = "wlan-en-regulator";
4545
regulator-min-microvolt = <1800000>;
@@ -53,7 +53,7 @@
5353
enable-active-high;
5454
};
5555

56-
matrix_keypad: matrix_keypad@0 {
56+
matrix_keypad: matrix_keypad0 {
5757
compatible = "gpio-matrix-keypad";
5858
debounce-delay-ms = <5>;
5959
col-scan-delay-us = <2>;
@@ -73,20 +73,20 @@
7373
0x0201006c>; /* DOWN */
7474
};
7575

76-
gpio_keys: volume_keys@0 {
76+
gpio_keys: volume_keys0 {
7777
compatible = "gpio-keys";
7878
#address-cells = <1>;
7979
#size-cells = <0>;
8080
autorepeat;
8181

82-
switch@9 {
82+
switch9 {
8383
label = "volume-up";
8484
linux,code = <115>;
8585
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
8686
wakeup-source;
8787
};
8888

89-
switch@10 {
89+
switch10 {
9090
label = "volume-down";
9191
linux,code = <114>;
9292
gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;

‎arch/arm/boot/dts/am335x-evmsk.dts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
};
2828
};
2929

30-
memory {
30+
memory@80000000 {
3131
device_type = "memory";
3232
reg = <0x80000000 0x10000000>; /* 256 MB */
3333
};
3434

35-
vbat: fixedregulator@0 {
35+
vbat: fixedregulator0 {
3636
compatible = "regulator-fixed";
3737
regulator-name = "vbat";
3838
regulator-min-microvolt = <5000000>;
3939
regulator-max-microvolt = <5000000>;
4040
regulator-boot-on;
4141
};
4242

43-
lis3_reg: fixedregulator@1 {
43+
lis3_reg: fixedregulator1 {
4444
compatible = "regulator-fixed";
4545
regulator-name = "lis3_reg";
4646
regulator-boot-on;
4747
};
4848

49-
wl12xx_vmmc: fixedregulator@2 {
49+
wl12xx_vmmc: fixedregulator2 {
5050
pinctrl-names = "default";
5151
pinctrl-0 = <&wl12xx_gpio>;
5252
compatible = "regulator-fixed";
@@ -58,7 +58,7 @@
5858
enable-active-high;
5959
};
6060

61-
vtt_fixed: fixedregulator@3 {
61+
vtt_fixed: fixedregulator3 {
6262
compatible = "regulator-fixed";
6363
regulator-name = "vtt";
6464
regulator-min-microvolt = <1500000>;
@@ -75,58 +75,58 @@
7575

7676
compatible = "gpio-leds";
7777

78-
led@1 {
78+
led1 {
7979
label = "evmsk:green:usr0";
8080
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
8181
default-state = "off";
8282
};
8383

84-
led@2 {
84+
led2 {
8585
label = "evmsk:green:usr1";
8686
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
8787
default-state = "off";
8888
};
8989

90-
led@3 {
90+
led3 {
9191
label = "evmsk:green:mmc0";
9292
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
9393
linux,default-trigger = "mmc0";
9494
default-state = "off";
9595
};
9696

97-
led@4 {
97+
led4 {
9898
label = "evmsk:green:heartbeat";
9999
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
100100
linux,default-trigger = "heartbeat";
101101
default-state = "off";
102102
};
103103
};
104104

105-
gpio_buttons: gpio_buttons@0 {
105+
gpio_buttons: gpio_buttons0 {
106106
compatible = "gpio-keys";
107107
#address-cells = <1>;
108108
#size-cells = <0>;
109109

110-
switch@1 {
110+
switch1 {
111111
label = "button0";
112112
linux,code = <0x100>;
113113
gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
114114
};
115115

116-
switch@2 {
116+
switch2 {
117117
label = "button1";
118118
linux,code = <0x101>;
119119
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
120120
};
121121

122-
switch@3 {
122+
switch3 {
123123
label = "button2";
124124
linux,code = <0x102>;
125125
gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
126126
wakeup-source;
127127
};
128128

129-
switch@4 {
129+
switch4 {
130130
label = "button3";
131131
linux,code = <0x103>;
132132
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;

0 commit comments

Comments
 (0)