aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-01-05 02:06:32 -0500
committerOlof Johansson <olof@lixom.net>2018-01-05 02:06:32 -0500
commit38b45e518655f8334b395ebe0be4ac238f598e3d (patch)
tree34d671cb38c6d2ea8b81eea2ed7022d6b63bc580
parent8db4e1faac7462e371364978dbe357c1c22e9e40 (diff)
parent1cadb0c341079785182a8d00d12ecb0bbef935fb (diff)
Merge tag 'omap-for-v4.16/dt-pt2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Second set of device tree changes for omaps for v4.16 merge window This branch mostly configures more hardware support: - Clean-up dts files to remove leading 0x and 0s from binding notation to remove more dtc compiler warnings - A series of am437x updates for backlight, to fix inverted pad pull macro, and to configure power management related OPPs - Configure n950 and droid 4 command mode LCD panels - Updates to pandora and gta04 LCD panels - Add support for am574x-idk - A series of changes to configure more dra7 related PCIe features - A series of fixes for am335x-boneblue for WLAN, UARTs and CAN configuration - A series of changes to configure dra7 OPPs and VDD supplies * tag 'omap-for-v4.16/dt-pt2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (29 commits) Revert "ARM: dts: dra7: Add properties to enable PCIe x2 lane mode" ARM: dts: am572x-idk: Add cpu0 vdd supply ARM: dts: am571x-idk: Add cpu0 vdd supply ARM: dts: dra72-evm-tps65917: Add cpu0 vdd supply ARM: dts: dra7-evm: Add cpu0 vdd supply ARM: dts: am57xx-beagle-x15-common: Add cpu0 vdd supply ARM: dts: dra7: Enable 1.5 GHz operation for the CPU ARM: dts: dra7: Add MPU OPP supply node ARM: dts: dra7: Add vbb-supply to cpu and additional voltages ARM: dts: am335x-boneblue: enable can ARM: dts: am335x-boneblue: enable usarts ARM: dts: am335x-boneblue: fix wl1835 IRQ pin ARM: dts: dra7: Remove deprecated PCI compatible string ARM: dts: dra76-evm: Enable x2 PCIe lanes ARM: dts: DRA72x: Use PCIe compatible specific to dra72 ARM: dts: DRA74x: Use PCIe compatible specific to dra74 ARM: dts: dra7: Add properties to enable PCIe x2 lane mode ARM: dts: am57xx: Add support for am574x-idk ARM: dts: am43x-epos-evm: Hook dcdc2 as the cpu0-supply ARM: dts: am437x-idk-evm: Disable OPP50 for MPU ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/am335x-boneblue.dts79
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi4
-rw-r--r--arch/arm/boot/dts/am3517.dtsi4
-rw-r--r--arch/arm/boot/dts/am4372.dtsi4
-rw-r--r--arch/arm/boot/dts/am437x-gp-evm.dts4
-rw-r--r--arch/arm/boot/dts/am437x-idk-evm.dts14
-rw-r--r--arch/arm/boot/dts/am437x-sk-evm.dts4
-rw-r--r--arch/arm/boot/dts/am43x-epos-evm.dts8
-rw-r--r--arch/arm/boot/dts/am571x-idk.dts4
-rw-r--r--arch/arm/boot/dts/am572x-idk-common.dtsi100
-rw-r--r--arch/arm/boot/dts/am572x-idk.dts93
-rw-r--r--arch/arm/boot/dts/am574x-idk.dts22
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi2
-rw-r--r--arch/arm/boot/dts/dra62x-j5eco-evm.dts8
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts2
-rw-r--r--arch/arm/boot/dts/dra7.dtsi36
-rw-r--r--arch/arm/boot/dts/dra72-evm-tps65917.dtsi4
-rw-r--r--arch/arm/boot/dts/dra72x.dtsi12
-rw-r--r--arch/arm/boot/dts/dra74x.dtsi12
-rw-r--r--arch/arm/boot/dts/dra76-evm.dts16
-rw-r--r--arch/arm/boot/dts/omap3-cm-t3x.dtsi8
-rw-r--r--arch/arm/boot/dts/omap3-evm-37xx.dts8
-rw-r--r--arch/arm/boot/dts/omap3-gta04.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-lilly-a83x.dtsi8
-rw-r--r--arch/arm/boot/dts/omap3-n950.dts88
-rw-r--r--arch/arm/boot/dts/omap3-pandora-common.dtsi2
-rw-r--r--arch/arm/boot/dts/omap4-droid4-xt894.dts6
-rw-r--r--include/dt-bindings/pinctrl/am43xx.h3
29 files changed, 428 insertions, 130 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 032138d9c60b..a5d8dcc4b2b6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -688,6 +688,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
688 am57xx-sbc-am57x.dtb \ 688 am57xx-sbc-am57x.dtb \
689 am572x-idk.dtb \ 689 am572x-idk.dtb \
690 am571x-idk.dtb \ 690 am571x-idk.dtb \
691 am574x-idk.dtb \
691 dra7-evm.dtb \ 692 dra7-evm.dtb \
692 dra72-evm.dtb \ 693 dra72-evm.dtb \
693 dra72-evm-revc.dtb \ 694 dra72-evm-revc.dtb \
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
index d5be9fc4f416..3f2480d05a3b 100644
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -159,6 +159,7 @@
159 >; 159 >;
160 }; 160 };
161 161
162 /* UT0 */
162 uart0_pins: pinmux_uart0_pins { 163 uart0_pins: pinmux_uart0_pins {
163 pinctrl-single,pins = < 164 pinctrl-single,pins = <
164 AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* (E15) uart0_rxd.uart0_rxd */ 165 AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* (E15) uart0_rxd.uart0_rxd */
@@ -166,6 +167,37 @@
166 >; 167 >;
167 }; 168 };
168 169
170 /* UT1 */
171 uart1_pins: pinmux_uart1_pins {
172 pinctrl-single,pins = <
173 AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0) /* (D16) uart1_rxd.uart1_rxd */
174 AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* (D15) uart1_txd.uart1_txd */
175 >;
176 };
177
178 /* GPS */
179 uart2_pins: pinmux_uart2_pins {
180 pinctrl-single,pins = <
181 AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE1) /* (A17) spi0_sclk.uart2_rxd */
182 AM33XX_IOPAD(0x954, PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* (B17) spi0_d0.uart2_txd */
183 >;
184 };
185
186 /* DSM2 */
187 uart4_pins: pinmux_uart4_pins {
188 pinctrl-single,pins = <
189 AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE6) /* (T17) gpmc_wait0.uart4_rxd */
190 >;
191 };
192
193 /* UT5 */
194 uart5_pins: pinmux_uart5_pins {
195 pinctrl-single,pins = <
196 AM33XX_IOPAD(0x8C4, PIN_INPUT_PULLUP | MUX_MODE4) /* (U2) lcd_data9.uart5_rxd */
197 AM33XX_IOPAD(0x8C0, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* (U1) lcd_data8.uart5_txd */
198 >;
199 };
200
169 mmc1_pins: pinmux_mmc1_pins { 201 mmc1_pins: pinmux_mmc1_pins {
170 pinctrl-single,pins = < 202 pinctrl-single,pins = <
171 AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* (C15) spi0_cs1.gpio0[6] */ 203 AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* (C15) spi0_cs1.gpio0[6] */
@@ -216,10 +248,19 @@
216 wl18xx_pins: pinmux_wl18xx_pins { 248 wl18xx_pins: pinmux_wl18xx_pins {
217 pinctrl-single,pins = < 249 pinctrl-single,pins = <
218 AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* (K18) gmii1_txclk.gpio3[9] - WL_EN */ 250 AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* (K18) gmii1_txclk.gpio3[9] - WL_EN */
219 AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7) /* (H18) rmii1_refclk.gpio0[29] - WL_IRQ */ 251 AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7) /* (K16) gmii1_txd1.gpio0[21] - WL_IRQ */
220 AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7) /* (L18) gmii1_rxclk.gpio3[10] - LS_BUF_EN */ 252 AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7) /* (L18) gmii1_rxclk.gpio3[10] - LS_BUF_EN */
221 >; 253 >;
222 }; 254 };
255
256 /* DCAN */
257 dcan1_pins: pinmux_dcan1_pins {
258 pinctrl-single,pins = <
259 AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE2) /* (E17) uart0_rtsn.dcan1_rx */
260 AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE2) /* (E18) uart0_ctsn.dcan1_tx */
261 AM33XX_IOPAD(0x940, PIN_OUTPUT | MUX_MODE7) /* (M16) gmii1_rxd0.gpio2[21] */
262 >;
263 };
223}; 264};
224 265
225&uart0 { 266&uart0 {
@@ -229,6 +270,34 @@
229 status = "okay"; 270 status = "okay";
230}; 271};
231 272
273&uart1 {
274 pinctrl-names = "default";
275 pinctrl-0 = <&uart1_pins>;
276
277 status = "okay";
278};
279
280&uart2 {
281 pinctrl-names = "default";
282 pinctrl-0 = <&uart2_pins>;
283
284 status = "okay";
285};
286
287&uart4 {
288 pinctrl-names = "default";
289 pinctrl-0 = <&uart4_pins>;
290
291 status = "okay";
292};
293
294&uart5 {
295 pinctrl-names = "default";
296 pinctrl-0 = <&uart5_pins>;
297
298 status = "okay";
299};
300
232&usb { 301&usb {
233 status = "okay"; 302 status = "okay";
234}; 303};
@@ -414,7 +483,7 @@
414 compatible = "ti,wl1835"; 483 compatible = "ti,wl1835";
415 reg = <2>; 484 reg = <2>;
416 interrupt-parent = <&gpio0>; 485 interrupt-parent = <&gpio0>;
417 interrupts = <29 IRQ_TYPE_EDGE_RISING>; 486 interrupts = <21 IRQ_TYPE_EDGE_RISING>;
418 }; 487 };
419}; 488};
420 489
@@ -450,6 +519,12 @@
450 clock-names = "ext-clk", "int-clk"; 519 clock-names = "ext-clk", "int-clk";
451}; 520};
452 521
522&dcan1 {
523 pinctrl-names = "default";
524 pinctrl-0 = <&dcan1_pins>;
525 status = "okay";
526};
527
453&gpio3 { 528&gpio3 {
454 ls_buf_en { 529 ls_buf_en {
455 gpio-hog; 530 gpio-hog;
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index ca7400c20ed4..628c77b0b386 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -500,7 +500,7 @@
500 status = "disabled"; 500 status = "disabled";
501 }; 501 };
502 502
503 mailbox: mailbox@480C8000 { 503 mailbox: mailbox@480c8000 {
504 compatible = "ti,omap4-mailbox"; 504 compatible = "ti,omap4-mailbox";
505 reg = <0x480C8000 0x200>; 505 reg = <0x480C8000 0x200>;
506 interrupts = <77>; 506 interrupts = <77>;
@@ -999,7 +999,7 @@
999 dma-names = "tx", "rx"; 999 dma-names = "tx", "rx";
1000 }; 1000 };
1001 1001
1002 mcasp1: mcasp@4803C000 { 1002 mcasp1: mcasp@4803c000 {
1003 compatible = "ti,am33xx-mcasp-audio"; 1003 compatible = "ti,am33xx-mcasp-audio";
1004 ti,hwmods = "mcasp1"; 1004 ti,hwmods = "mcasp1";
1005 reg = <0x4803C000 0x2000>, 1005 reg = <0x4803C000 0x2000>,
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index 00da3f2c4072..76994165fb3a 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -26,7 +26,7 @@
26 interrupt-names = "mc"; 26 interrupt-names = "mc";
27 }; 27 };
28 28
29 davinci_emac: ethernet@0x5c000000 { 29 davinci_emac: ethernet@5c000000 {
30 compatible = "ti,am3517-emac"; 30 compatible = "ti,am3517-emac";
31 ti,hwmods = "davinci_emac"; 31 ti,hwmods = "davinci_emac";
32 status = "disabled"; 32 status = "disabled";
@@ -41,7 +41,7 @@
41 local-mac-address = [ 00 00 00 00 00 00 ]; 41 local-mac-address = [ 00 00 00 00 00 00 ];
42 }; 42 };
43 43
44 davinci_mdio: ethernet@0x5c030000 { 44 davinci_mdio: ethernet@5c030000 {
45 compatible = "ti,davinci_mdio"; 45 compatible = "ti,davinci_mdio";
46 ti,hwmods = "davinci_mdio"; 46 ti,hwmods = "davinci_mdio";
47 status = "disabled"; 47 status = "disabled";
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 2f2984db1c26..964f3ef79728 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -329,7 +329,7 @@
329 status = "disabled"; 329 status = "disabled";
330 }; 330 };
331 331
332 mailbox: mailbox@480C8000 { 332 mailbox: mailbox@480c8000 {
333 compatible = "ti,omap4-mailbox"; 333 compatible = "ti,omap4-mailbox";
334 reg = <0x480C8000 0x200>; 334 reg = <0x480C8000 0x200>;
335 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; 335 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -944,7 +944,7 @@
944 dma-names = "tx", "rx"; 944 dma-names = "tx", "rx";
945 }; 945 };
946 946
947 mcasp1: mcasp@4803C000 { 947 mcasp1: mcasp@4803c000 {
948 compatible = "ti,am33xx-mcasp-audio"; 948 compatible = "ti,am33xx-mcasp-audio";
949 ti,hwmods = "mcasp1"; 949 ti,hwmods = "mcasp1";
950 reg = <0x4803C000 0x2000>, 950 reg = <0x4803C000 0x2000>,
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index afb8eb0a0a16..c3b1a3fb5a2e 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -55,7 +55,7 @@
55 enable-active-high; 55 enable-active-high;
56 }; 56 };
57 57
58 backlight { 58 lcd_bl: backlight {
59 compatible = "pwm-backlight"; 59 compatible = "pwm-backlight";
60 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>; 60 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>;
61 brightness-levels = <0 51 53 56 62 75 101 152 255>; 61 brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -86,6 +86,8 @@
86 compatible = "osddisplays,osd057T0559-34ts", "panel-dpi"; 86 compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
87 label = "lcd"; 87 label = "lcd";
88 88
89 backlight = <&lcd_bl>;
90
89 panel-timing { 91 panel-timing {
90 clock-frequency = <33000000>; 92 clock-frequency = <33000000>;
91 hactive = <800>; 93 hactive = <800>;
diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
index 5e364473067f..20132477a871 100644
--- a/arch/arm/boot/dts/am437x-idk-evm.dts
+++ b/arch/arm/boot/dts/am437x-idk-evm.dts
@@ -519,3 +519,17 @@
519&cpu { 519&cpu {
520 cpu0-supply = <&tps>; 520 cpu0-supply = <&tps>;
521}; 521};
522
523&cpu0_opp_table {
524 /*
525 * Supply voltage supervisor on board will not allow opp50 so
526 * disable it and set opp100 as suspend OPP.
527 */
528 opp50@300000000 {
529 status = "disabled";
530 };
531
532 opp100@600000000 {
533 opp-suspend;
534 };
535};
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 2c6bf0684f50..3fa3b226995d 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -35,7 +35,7 @@
35 clock-frequency = <32768>; 35 clock-frequency = <32768>;
36 }; 36 };
37 37
38 backlight { 38 lcd_bl: backlight {
39 compatible = "pwm-backlight"; 39 compatible = "pwm-backlight";
40 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>; 40 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>;
41 brightness-levels = <0 51 53 56 62 75 101 152 255>; 41 brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -132,6 +132,8 @@
132 pinctrl-names = "default"; 132 pinctrl-names = "default";
133 pinctrl-0 = <&lcd_pins>; 133 pinctrl-0 = <&lcd_pins>;
134 134
135 backlight = <&lcd_bl>;
136
135 enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; 137 enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
136 138
137 panel-timing { 139 panel-timing {
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index d3363fbe4240..00c3d1de384f 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -48,6 +48,8 @@
48 compatible = "osddisplays,osd057T0559-34ts", "panel-dpi"; 48 compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
49 label = "lcd"; 49 label = "lcd";
50 50
51 backlight = <&lcd_bl>;
52
51 panel-timing { 53 panel-timing {
52 clock-frequency = <33000000>; 54 clock-frequency = <33000000>;
53 hactive = <800>; 55 hactive = <800>;
@@ -107,7 +109,7 @@
107 0x03030069>; /* LEFT */ 109 0x03030069>; /* LEFT */
108 }; 110 };
109 111
110 backlight { 112 lcd_bl: backlight {
111 compatible = "pwm-backlight"; 113 compatible = "pwm-backlight";
112 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>; 114 pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>;
113 brightness-levels = <0 51 53 56 62 75 101 152 255>; 115 brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -989,3 +991,7 @@
989 assigned-clocks = <&mux_synctimer32k_ck>; 991 assigned-clocks = <&mux_synctimer32k_ck>;
990 assigned-clock-parents = <&clkdiv32k_ick>; 992 assigned-clock-parents = <&clkdiv32k_ick>;
991}; 993};
994
995&cpu {
996 cpu0-supply = <&dcdc2>;
997};
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index debf9464403e..6d3c83743156 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -117,3 +117,7 @@
117 pinctrl-1 = <&mmc2_pins_hs>; 117 pinctrl-1 = <&mmc2_pins_hs>;
118 pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>; 118 pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
119}; 119};
120
121&cpu0 {
122 vdd-supply = <&smps12_reg>;
123};
diff --git a/arch/arm/boot/dts/am572x-idk-common.dtsi b/arch/arm/boot/dts/am572x-idk-common.dtsi
new file mode 100644
index 000000000000..c6d858b31011
--- /dev/null
+++ b/arch/arm/boot/dts/am572x-idk-common.dtsi
@@ -0,0 +1,100 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
4 */
5
6#include <dt-bindings/gpio/gpio.h>
7#include <dt-bindings/interrupt-controller/irq.h>
8#include "am57xx-idk-common.dtsi"
9
10/ {
11 memory@0 {
12 device_type = "memory";
13 reg = <0x0 0x80000000 0x0 0x80000000>;
14 };
15
16 status-leds {
17 compatible = "gpio-leds";
18 cpu0-led {
19 label = "status0:red:cpu0";
20 gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>;
21 default-state = "off";
22 linux,default-trigger = "cpu0";
23 };
24
25 usr0-led {
26 label = "status0:green:usr";
27 gpios = <&gpio3 11 GPIO_ACTIVE_HIGH>;
28 default-state = "off";
29 };
30
31 heartbeat-led {
32 label = "status0:blue:heartbeat";
33 gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
34 default-state = "off";
35 linux,default-trigger = "heartbeat";
36 };
37
38 cpu1-led {
39 label = "status1:red:cpu1";
40 gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
41 default-state = "off";
42 linux,default-trigger = "cpu1";
43 };
44
45 usr1-led {
46 label = "status1:green:usr";
47 gpios = <&gpio7 23 GPIO_ACTIVE_HIGH>;
48 default-state = "off";
49 };
50
51 mmc0-led {
52 label = "status1:blue:mmc0";
53 gpios = <&gpio7 22 GPIO_ACTIVE_HIGH>;
54 default-state = "off";
55 linux,default-trigger = "mmc0";
56 };
57 };
58};
59
60&omap_dwc3_2 {
61 extcon = <&extcon_usb2>;
62};
63
64&extcon_usb2 {
65 id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
66 vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
67};
68
69&sn65hvs882 {
70 load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
71};
72
73&pcie1_rc {
74 status = "okay";
75 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
76};
77
78&pcie1_ep {
79 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
80};
81
82&mailbox5 {
83 status = "okay";
84 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
85 status = "okay";
86 };
87 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
88 status = "okay";
89 };
90};
91
92&mailbox6 {
93 status = "okay";
94 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
95 status = "okay";
96 };
97 mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
98 status = "okay";
99 };
100};
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index a578fe97ba3b..9ab0af5017df 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -9,8 +9,7 @@
9/dts-v1/; 9/dts-v1/;
10 10
11#include "dra74x.dtsi" 11#include "dra74x.dtsi"
12#include <dt-bindings/gpio/gpio.h> 12#include "am572x-idk-common.dtsi"
13#include <dt-bindings/interrupt-controller/irq.h>
14#include "am57xx-idk-common.dtsi" 13#include "am57xx-idk-common.dtsi"
15#include "dra74x-mmc-iodelay.dtsi" 14#include "dra74x-mmc-iodelay.dtsi"
16 15
@@ -18,54 +17,6 @@
18 model = "TI AM5728 IDK"; 17 model = "TI AM5728 IDK";
19 compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", 18 compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74",
20 "ti,dra7"; 19 "ti,dra7";
21
22 memory@0 {
23 device_type = "memory";
24 reg = <0x0 0x80000000 0x0 0x80000000>;
25 };
26
27 status-leds {
28 compatible = "gpio-leds";
29 cpu0-led {
30 label = "status0:red:cpu0";
31 gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>;
32 default-state = "off";
33 linux,default-trigger = "cpu0";
34 };
35
36 usr0-led {
37 label = "status0:green:usr";
38 gpios = <&gpio3 11 GPIO_ACTIVE_HIGH>;
39 default-state = "off";
40 };
41
42 heartbeat-led {
43 label = "status0:blue:heartbeat";
44 gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
45 default-state = "off";
46 linux,default-trigger = "heartbeat";
47 };
48
49 cpu1-led {
50 label = "status1:red:cpu1";
51 gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
52 default-state = "off";
53 linux,default-trigger = "cpu1";
54 };
55
56 usr1-led {
57 label = "status1:green:usr";
58 gpios = <&gpio7 23 GPIO_ACTIVE_HIGH>;
59 default-state = "off";
60 };
61
62 mmc0-led {
63 label = "status1:blue:mmc0";
64 gpios = <&gpio7 22 GPIO_ACTIVE_HIGH>;
65 default-state = "off";
66 linux,default-trigger = "mmc0";
67 };
68 };
69}; 20};
70 21
71&mmc1 { 22&mmc1 {
@@ -86,44 +37,6 @@
86 pinctrl-2 = <&mmc2_pins_ddr_rev20>; 37 pinctrl-2 = <&mmc2_pins_ddr_rev20>;
87}; 38};
88 39
89&omap_dwc3_2 { 40&cpu0 {
90 extcon = <&extcon_usb2>; 41 vdd-supply = <&smps12_reg>;
91};
92
93&extcon_usb2 {
94 id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
95 vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
96};
97
98&sn65hvs882 {
99 load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
100};
101
102&pcie1_rc {
103 status = "okay";
104 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
105};
106
107&pcie1_ep {
108 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
109};
110
111&mailbox5 {
112 status = "okay";
113 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
114 status = "okay";
115 };
116 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
117 status = "okay";
118 };
119};
120
121&mailbox6 {
122 status = "okay";
123 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
124 status = "okay";
125 };
126 mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
127 status = "okay";
128 };
129}; 42};
diff --git a/arch/arm/boot/dts/am574x-idk.dts b/arch/arm/boot/dts/am574x-idk.dts
new file mode 100644
index 000000000000..41e12a382d2f
--- /dev/null
+++ b/arch/arm/boot/dts/am574x-idk.dts
@@ -0,0 +1,22 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
4 */
5
6
7/dts-v1/;
8
9#include "dra76x.dtsi"
10#include "am572x-idk-common.dtsi"
11
12/ {
13 model = "TI AM5748 IDK";
14 compatible = "ti,am5728-idk", "ti,dra762", "ti,dra7";
15};
16
17&qspi {
18 spi-max-frequency = <96000000>;
19 m25p80@0 {
20 spi-max-frequency = <96000000>;
21 };
22};
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 74d1d0dab336..ab60035bc50c 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -388,7 +388,7 @@
388}; 388};
389 389
390&cpu0 { 390&cpu0 {
391 cpu0-supply = <&smps12_reg>; 391 vdd-supply = <&smps12_reg>;
392 voltage-tolerance = <1>; 392 voltage-tolerance = <1>;
393}; 393};
394 394
diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index 155eb32ee213..fee0547f7302 100644
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -74,19 +74,19 @@
74 label = "X-Loader"; 74 label = "X-Loader";
75 reg = <0 0x80000>; 75 reg = <0 0x80000>;
76 }; 76 };
77 partition@0x80000 { 77 partition@80000 {
78 label = "U-Boot"; 78 label = "U-Boot";
79 reg = <0x80000 0x1c0000>; 79 reg = <0x80000 0x1c0000>;
80 }; 80 };
81 partition@0x1c0000 { 81 partition@1c0000 {
82 label = "Environment"; 82 label = "Environment";
83 reg = <0x240000 0x40000>; 83 reg = <0x240000 0x40000>;
84 }; 84 };
85 partition@0x280000 { 85 partition@280000 {
86 label = "Kernel"; 86 label = "Kernel";
87 reg = <0x280000 0x500000>; 87 reg = <0x280000 0x500000>;
88 }; 88 };
89 partition@0x780000 { 89 partition@780000 {
90 label = "Filesystem"; 90 label = "Filesystem";
91 reg = <0x780000 0xf880000>; 91 reg = <0x780000 0xf880000>;
92 }; 92 };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index ef9c90daa74b..a7385c338ee9 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -361,7 +361,7 @@
361}; 361};
362 362
363&cpu0 { 363&cpu0 {
364 cpu0-supply = <&smps123_reg>; 364 vdd-supply = <&smps123_reg>;
365}; 365};
366 366
367&omap_dwc3_2 { 367&omap_dwc3_2 {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 3c8c0d743dd0..aabb86663f11 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -93,6 +93,8 @@
93 cooling-min-level = <0>; 93 cooling-min-level = <0>;
94 cooling-max-level = <2>; 94 cooling-max-level = <2>;
95 #cooling-cells = <2>; /* min followed by max */ 95 #cooling-cells = <2>; /* min followed by max */
96
97 vbb-supply = <&abb_mpu>;
96 }; 98 };
97 }; 99 };
98 100
@@ -102,16 +104,26 @@
102 104
103 opp_nom-1000000000 { 105 opp_nom-1000000000 {
104 opp-hz = /bits/ 64 <1000000000>; 106 opp-hz = /bits/ 64 <1000000000>;
105 opp-microvolt = <1060000 850000 1150000>; 107 opp-microvolt = <1060000 850000 1150000>,
108 <1060000 850000 1150000>;
106 opp-supported-hw = <0xFF 0x01>; 109 opp-supported-hw = <0xFF 0x01>;
107 opp-suspend; 110 opp-suspend;
108 }; 111 };
109 112
110 opp_od-1176000000 { 113 opp_od-1176000000 {
111 opp-hz = /bits/ 64 <1176000000>; 114 opp-hz = /bits/ 64 <1176000000>;
112 opp-microvolt = <1160000 885000 1160000>; 115 opp-microvolt = <1160000 885000 1160000>,
116 <1160000 885000 1160000>;
117
113 opp-supported-hw = <0xFF 0x02>; 118 opp-supported-hw = <0xFF 0x02>;
114 }; 119 };
120
121 opp_high@1500000000 {
122 opp-hz = /bits/ 64 <1500000000>;
123 opp-microvolt = <1210000 950000 1250000>,
124 <1210000 950000 1250000>;
125 opp-supported-hw = <0xFF 0x04>;
126 };
115 }; 127 };
116 128
117 /* 129 /*
@@ -304,7 +316,6 @@
304 * node and enable pcie1_ep mode. 316 * node and enable pcie1_ep mode.
305 */ 317 */
306 pcie1_rc: pcie@51000000 { 318 pcie1_rc: pcie@51000000 {
307 compatible = "ti,dra7-pcie";
308 reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>; 319 reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>;
309 reg-names = "rc_dbics", "ti_conf", "config"; 320 reg-names = "rc_dbics", "ti_conf", "config";
310 interrupts = <0 232 0x4>, <0 233 0x4>; 321 interrupts = <0 232 0x4>, <0 233 0x4>;
@@ -334,7 +345,6 @@
334 }; 345 };
335 346
336 pcie1_ep: pcie_ep@51000000 { 347 pcie1_ep: pcie_ep@51000000 {
337 compatible = "ti,dra7-pcie-ep";
338 reg = <0x51000000 0x28>, <0x51002000 0x14c>, <0x51001000 0x28>, <0x1000 0x10000000>; 348 reg = <0x51000000 0x28>, <0x51002000 0x14c>, <0x51001000 0x28>, <0x1000 0x10000000>;
339 reg-names = "ep_dbics", "ti_conf", "ep_dbics2", "addr_space"; 349 reg-names = "ep_dbics", "ti_conf", "ep_dbics2", "addr_space";
340 interrupts = <0 232 0x4>; 350 interrupts = <0 232 0x4>;
@@ -356,8 +366,7 @@
356 ranges = <0x51800000 0x51800000 0x3000 366 ranges = <0x51800000 0x51800000 0x3000
357 0x0 0x30000000 0x10000000>; 367 0x0 0x30000000 0x10000000>;
358 status = "disabled"; 368 status = "disabled";
359 pcie@51800000 { 369 pcie2_rc: pcie@51800000 {
360 compatible = "ti,dra7-pcie";
361 reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>; 370 reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
362 reg-names = "rc_dbics", "ti_conf", "config"; 371 reg-names = "rc_dbics", "ti_conf", "config";
363 interrupts = <0 355 0x4>, <0 356 0x4>; 372 interrupts = <0 355 0x4>, <0 356 0x4>;
@@ -1386,7 +1395,7 @@
1386 ranges; 1395 ranges;
1387 reg = <0x4a090000 0x20>; 1396 reg = <0x4a090000 0x20>;
1388 ti,hwmods = "ocp2scp3"; 1397 ti,hwmods = "ocp2scp3";
1389 sata_phy: phy@4A096000 { 1398 sata_phy: phy@4a096000 {
1390 compatible = "ti,phy-pipe3-sata"; 1399 compatible = "ti,phy-pipe3-sata";
1391 reg = <0x4A096000 0x80>, /* phy_rx */ 1400 reg = <0x4A096000 0x80>, /* phy_rx */
1392 <0x4A096400 0x64>, /* phy_tx */ 1401 <0x4A096400 0x64>, /* phy_tx */
@@ -2077,6 +2086,19 @@
2077 clocks = <&l3_iclk_div>; 2086 clocks = <&l3_iclk_div>;
2078 clock-names = "fck"; 2087 clock-names = "fck";
2079 }; 2088 };
2089
2090 opp_supply_mpu: opp-supply@4a003b20 {
2091 compatible = "ti,omap5-opp-supply";
2092 reg = <0x4a003b20 0xc>;
2093 ti,efuse-settings = <
2094 /* uV offset */
2095 1060000 0x0
2096 1160000 0x4
2097 1210000 0x8
2098 >;
2099 ti,absolute-max-voltage-uv = <1500000>;
2100 };
2101
2080 }; 2102 };
2081 2103
2082 thermal_zones: thermal-zones { 2104 thermal_zones: thermal-zones {
diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
index 57bfe5caf5e4..47bb90f41f3f 100644
--- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
@@ -148,3 +148,7 @@
148&mmc1 { 148&mmc1 {
149 vqmmc-supply = <&ldo1_reg>; 149 vqmmc-supply = <&ldo1_reg>;
150}; 150};
151
152&cpu0 {
153 vdd-supply = <&smps1_reg>;
154};
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index a06d39919bf4..c011d2e64fef 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -50,3 +50,15 @@
50 status = "disabled"; 50 status = "disabled";
51 }; 51 };
52}; 52};
53
54&pcie1_rc {
55 compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
56};
57
58&pcie1_ep {
59 compatible = "ti,dra726-pcie-ep", "ti,dra7-pcie-ep";
60};
61
62&pcie2_rc {
63 compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
64};
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 24ff17bae4c6..91e93ab588ca 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -124,3 +124,15 @@
124 status = "disabled"; 124 status = "disabled";
125 }; 125 };
126}; 126};
127
128&pcie1_rc {
129 compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
130};
131
132&pcie1_ep {
133 compatible = "ti,dra746-pcie-ep", "ti,dra7-pcie-ep";
134};
135
136&pcie2_rc {
137 compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
138};
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index f64aab450315..c4fe7f8ef72a 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -422,3 +422,19 @@
422 spi-max-frequency = <96000000>; 422 spi-max-frequency = <96000000>;
423 }; 423 };
424}; 424};
425
426&pcie2_phy {
427 status = "okay";
428};
429
430&pcie1_rc {
431 num-lanes = <2>;
432 phys = <&pcie1_phy>, <&pcie2_phy>;
433 phy-names = "pcie-phy0", "pcie-phy1";
434};
435
436&pcie1_ep {
437 num-lanes = <2>;
438 phys = <&pcie1_phy>, <&pcie2_phy>;
439 phy-names = "pcie-phy0", "pcie-phy1";
440};
diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index ab6003fe5a43..9dcb18d22cde 100644
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -306,19 +306,19 @@
306 label = "xloader"; 306 label = "xloader";
307 reg = <0 0x80000>; 307 reg = <0 0x80000>;
308 }; 308 };
309 partition@0x80000 { 309 partition@80000 {
310 label = "uboot"; 310 label = "uboot";
311 reg = <0x80000 0x1e0000>; 311 reg = <0x80000 0x1e0000>;
312 }; 312 };
313 partition@0x260000 { 313 partition@260000 {
314 label = "uboot environment"; 314 label = "uboot environment";
315 reg = <0x260000 0x40000>; 315 reg = <0x260000 0x40000>;
316 }; 316 };
317 partition@0x2a0000 { 317 partition@2a0000 {
318 label = "linux"; 318 label = "linux";
319 reg = <0x2a0000 0x400000>; 319 reg = <0x2a0000 0x400000>;
320 }; 320 };
321 partition@0x6a0000 { 321 partition@6a0000 {
322 label = "rootfs"; 322 label = "rootfs";
323 reg = <0x6a0000 0x1f880000>; 323 reg = <0x6a0000 0x1f880000>;
324 }; 324 };
diff --git a/arch/arm/boot/dts/omap3-evm-37xx.dts b/arch/arm/boot/dts/omap3-evm-37xx.dts
index 5a4ba0aea447..a14303b09ae2 100644
--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -90,19 +90,19 @@
90 label = "X-Loader"; 90 label = "X-Loader";
91 reg = <0 0x80000>; 91 reg = <0 0x80000>;
92 }; 92 };
93 partition@0x80000 { 93 partition@80000 {
94 label = "U-Boot"; 94 label = "U-Boot";
95 reg = <0x80000 0x1c0000>; 95 reg = <0x80000 0x1c0000>;
96 }; 96 };
97 partition@0x1c0000 { 97 partition@1c0000 {
98 label = "Environment"; 98 label = "Environment";
99 reg = <0x240000 0x40000>; 99 reg = <0x240000 0x40000>;
100 }; 100 };
101 partition@0x280000 { 101 partition@280000 {
102 label = "Kernel"; 102 label = "Kernel";
103 reg = <0x280000 0x500000>; 103 reg = <0x280000 0x500000>;
104 }; 104 };
105 partition@0x780000 { 105 partition@780000 {
106 label = "Filesystem"; 106 label = "Filesystem";
107 reg = <0x780000 0x1f880000>; 107 reg = <0x780000 0x1f880000>;
108 }; 108 };
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 3dc56fb156b7..4170be70460e 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -86,7 +86,7 @@
86 86
87 /* lcd panel */ 87 /* lcd panel */
88 lcd: td028ttec1@0 { 88 lcd: td028ttec1@0 {
89 compatible = "toppoly,td028ttec1"; 89 compatible = "tpo,td028ttec1";
90 reg = <0>; 90 reg = <0>;
91 spi-max-frequency = <100000>; 91 spi-max-frequency = <100000>;
92 spi-cpol; 92 spi-cpol;
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index 7ada1e93e166..cf7a2a72348d 100644
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -405,22 +405,22 @@
405 reg = <0 0x80000>; 405 reg = <0 0x80000>;
406 }; 406 };
407 407
408 partition@0x80000 { 408 partition@80000 {
409 label = "u-boot"; 409 label = "u-boot";
410 reg = <0x80000 0x1e0000>; 410 reg = <0x80000 0x1e0000>;
411 }; 411 };
412 412
413 partition@0x260000 { 413 partition@260000 {
414 label = "u-boot-environment"; 414 label = "u-boot-environment";
415 reg = <0x260000 0x20000>; 415 reg = <0x260000 0x20000>;
416 }; 416 };
417 417
418 partition@0x280000 { 418 partition@280000 {
419 label = "kernel"; 419 label = "kernel";
420 reg = <0x280000 0x500000>; 420 reg = <0x280000 0x500000>;
421 }; 421 };
422 422
423 partition@0x780000 { 423 partition@780000 {
424 label = "filesystem"; 424 label = "filesystem";
425 reg = <0x780000 0xf880000>; 425 reg = <0x780000 0xf880000>;
426 }; 426 };
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index c354a1ed1e70..2354e09343f3 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -51,6 +51,26 @@
51 }; 51 };
52}; 52};
53 53
54&omap3_pmx_core {
55 dsi_pins: pinmux_dsi_pins {
56 pinctrl-single,pins = <
57 OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE1) /* dsi_dx0 - data0+ */
58 OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE1) /* dsi_dy0 - data0- */
59 OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE1) /* dsi_dx1 - clk+ */
60 OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE1) /* dsi_dy1 - clk- */
61 OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE1) /* dsi_dx2 - data1+ */
62 OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE1) /* dsi_dy2 - data1- */
63 >;
64 };
65
66 display_pins: pinmux_display_pins {
67 pinctrl-single,pins = <
68 OMAP3_CORE1_IOPAD(0x20ca, PIN_INPUT | MUX_MODE4) /* gpio 62 - display te */
69 OMAP3_CORE1_IOPAD(0x20fe, PIN_OUTPUT | MUX_MODE4) /* gpio 87 - display reset */
70 >;
71 };
72};
73
54&i2c2 { 74&i2c2 {
55 smia_1: camera@10 { 75 smia_1: camera@10 {
56 compatible = "nokia,smia"; 76 compatible = "nokia,smia";
@@ -186,3 +206,71 @@
186 st,max-limit-y = <32>; 206 st,max-limit-y = <32>;
187 st,max-limit-z = <32>; 207 st,max-limit-z = <32>;
188}; 208};
209
210&dss {
211 status = "ok";
212
213 vdda_video-supply = <&vdac>;
214};
215
216&dsi {
217 status = "ok";
218
219 pinctrl-names = "default";
220 pinctrl-0 = <&dsi_pins>;
221
222 vdd-supply = <&vpll2>;
223
224 port {
225 dsi_out_ep: endpoint {
226 remote-endpoint = <&lcd0_in>;
227 lanes = <2 3 0 1 4 5>;
228 };
229 };
230
231 lcd0: display {
232 compatible = "nokia,himalaya", "panel-dsi-cm";
233 label = "lcd0";
234
235 pinctrl-names = "default";
236 pinctrl-0 = <&display_pins>;
237
238 vpnl-supply = <&vmmc2>;
239 vddi-supply = <&vio>;
240
241 reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
242 te-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>; /* 62 */
243
244 width-mm = <49>; /* 48.960 mm */
245 height-mm = <88>; /* 88.128 mm */
246
247 /* TODO:
248 * - panel is upside-down
249 * - top + bottom 5px are not visible
250 */
251 panel-timing {
252 clock-frequency = <0>; /* Calculated by dsi */
253
254 hback-porch = <2>;
255 hactive = <480>;
256 hfront-porch = <0>;
257 hsync-len = <2>;
258
259 vback-porch = <1>;
260 vactive = <864>;
261 vfront-porch = <0>;
262 vsync-len = <1>;
263
264 hsync-active = <0>;
265 vsync-active = <0>;
266 de-active = <1>;
267 pixelclk-active = <1>;
268 };
269
270 port {
271 lcd0_in: endpoint {
272 remote-endpoint = <&dsi_out_ep>;
273 };
274 };
275 };
276};
diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index cd53dc6c0051..f83b1029b3b7 100644
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -627,7 +627,7 @@
627 627
628 lcd: lcd@1 { 628 lcd: lcd@1 {
629 reg = <1>; /* CS1 */ 629 reg = <1>; /* CS1 */
630 compatible = "omapdss,tpo,td043mtea1"; 630 compatible = "tpo,td043mtea1";
631 spi-max-frequency = <100000>; 631 spi-max-frequency = <100000>;
632 spi-cpol; 632 spi-cpol;
633 spi-cpha; 633 spi-cpha;
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 24a463f8641f..b21084da490b 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -177,6 +177,10 @@
177 vddi-supply = <&lcd_regulator>; 177 vddi-supply = <&lcd_regulator>;
178 reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */ 178 reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
179 179
180 width-mm = <50>;
181 height-mm = <89>;
182 backlight = <&lcd_backlight>;
183
180 panel-timing { 184 panel-timing {
181 clock-frequency = <0>; /* Calculated by dsi */ 185 clock-frequency = <0>; /* Calculated by dsi */
182 186
@@ -346,7 +350,7 @@
346 350
347 enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>; 351 enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
348 352
349 backlight { 353 lcd_backlight: backlight {
350 compatible = "ti,lm3532-backlight"; 354 compatible = "ti,lm3532-backlight";
351 355
352 lcd { 356 lcd {
diff --git a/include/dt-bindings/pinctrl/am43xx.h b/include/dt-bindings/pinctrl/am43xx.h
index a69e310789c5..6ce4a32f77d4 100644
--- a/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
@@ -25,7 +25,8 @@
25#define DS0_FORCE_OFF_MODE (1 << 24) 25#define DS0_FORCE_OFF_MODE (1 << 24)
26#define DS0_INPUT (1 << 25) 26#define DS0_INPUT (1 << 25)
27#define DS0_FORCE_OUT_HIGH (1 << 26) 27#define DS0_FORCE_OUT_HIGH (1 << 26)
28#define DS0_PULL_UP_DOWN_EN (1 << 27) 28#define DS0_PULL_UP_DOWN_EN (0 << 27)
29#define DS0_PULL_UP_DOWN_DIS (1 << 27)
29#define DS0_PULL_UP_SEL (1 << 28) 30#define DS0_PULL_UP_SEL (1 << 28)
30#define WAKEUP_ENABLE (1 << 29) 31#define WAKEUP_ENABLE (1 << 29)
31 32
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 10:17:34 -0400