Skip to content

Commit 19d52e9

Browse files
olofjolofj
committed
Merge tag 'omap-for-v5.6/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late
Late omap dts changes for v5.6 merge window This series of changes mostly configures the cameras for dra7 and am437x that have been pending for few months now because of waiting for clock dependencies to clear. So these changes are based on earlier dts changes with with Tero Kristo's for-5.6-ti-clk branch merged in. Then there's a series of changes to configure powervr sgx target module for am335x, am437x and dra7 that have been waiting to have the rstctrl reset driver dependencies to clear. Also included are few minor patches to configure 1-wire and coulomb counter calibration interrupt for droid4. * tag 'omap-for-v5.6/dt-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits) ARM: dts: omap4-droid4: Enable hdq for droid4 ds250x 1-wire battery nvmem ARM: dts: motorola-cpcap-mapphone: Configure calibration interrupt ARM: dts: Configure interconnect target module for am437x sgx ARM: dts: Configure sgx for dra7 ARM: dts: Configure rstctrl reset for am335x SGX ARM: dts: dra7: Add ti-sysc node for VPE ARM: dts: dra7: add vpe clkctrl node ARM: dts: am43x-epos-evm: Add VPFE and OV2659 entries ARM: dts: am437x-sk-evm: Add VPFE and OV2659 entries ARM: dts: am43xx: add support for clkout1 clock arm: dts: dra76-evm: Add CAL and OV5640 nodes arm: dtsi: dra76x: Add CAL dtsi node arm: dts: dra72-evm-common: Add entries for the CSI2 cameras ARM: dts: DRA72: Add CAL dtsi node ARM: dts: dra7-l4: Add ti-sysc node for CAM ARM: OMAP: DRA7xx: Make CAM clock domain SWSUP only ARM: dts: dra7: add cam clkctrl node ARM: dts: Add omap3-echo ARM: dts: Add dtsi files for AM3703, AM3715 and DM3725 ARM: dts: am335x-icev2: Add support for OSD9616P0899-10 at i2c0 ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 955d8f3 + 2256e6f commit 19d52e9

25 files changed

+1085
-70
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
691691
omap3-devkit8000.dtb \
692692
omap3-devkit8000-lcd43.dtb \
693693
omap3-devkit8000-lcd70.dtb \
694+
omap3-echo.dtb \
694695
omap3-evm.dtb \
695696
omap3-evm-37xx.dtb \
696697
omap3-gta04a3.dtb \

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

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -113,43 +113,23 @@
113113
};
114114
};
115115

116-
backlight {
116+
backlight: backlight {
117117
compatible = "pwm-backlight";
118118
pwms = <&ecap0 0 50000 0>;
119119
brightness-levels = <0 51 53 56 62 75 101 152 255>;
120120
default-brightness-level = <8>;
121121
};
122122

123123
panel {
124-
compatible = "ti,tilcdc,panel";
125-
status = "okay";
124+
compatible = "tfc,s9700rtwv43tr-01b";
125+
126126
pinctrl-names = "default";
127127
pinctrl-0 = <&lcd_pins_s0>;
128-
panel-info {
129-
ac-bias = <255>;
130-
ac-bias-intrpt = <0>;
131-
dma-burst-sz = <16>;
132-
bpp = <32>;
133-
fdd = <0x80>;
134-
sync-edge = <0>;
135-
sync-ctrl = <1>;
136-
raster-order = <0>;
137-
fifo-th = <0>;
138-
};
128+
backlight = <&backlight>;
139129

140-
display-timings {
141-
800x480p62 {
142-
clock-frequency = <30000000>;
143-
hactive = <800>;
144-
vactive = <480>;
145-
hfront-porch = <39>;
146-
hback-porch = <39>;
147-
hsync-len = <47>;
148-
vback-porch = <29>;
149-
vfront-porch = <13>;
150-
vsync-len = <2>;
151-
hsync-active = <1>;
152-
vsync-active = <1>;
130+
port {
131+
panel_0: endpoint@0 {
132+
remote-endpoint = <&lcdc_0>;
153133
};
154134
};
155135
};
@@ -500,6 +480,12 @@
500480
status = "okay";
501481

502482
blue-and-red-wiring = "crossed";
483+
484+
port {
485+
lcdc_0: endpoint@0 {
486+
remote-endpoint = <&panel_0>;
487+
};
488+
};
503489
};
504490

505491
&elm {

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -183,36 +183,16 @@
183183
};
184184

185185
panel {
186-
compatible = "ti,tilcdc,panel";
186+
compatible = "newhaven,nhd-4.3-480272ef-atxl";
187+
187188
pinctrl-names = "default", "sleep";
188189
pinctrl-0 = <&lcd_pins_default>;
189190
pinctrl-1 = <&lcd_pins_sleep>;
190191
backlight = <&lcd_bl>;
191-
status = "okay";
192-
panel-info {
193-
ac-bias = <255>;
194-
ac-bias-intrpt = <0>;
195-
dma-burst-sz = <16>;
196-
bpp = <32>;
197-
fdd = <0x80>;
198-
sync-edge = <0>;
199-
sync-ctrl = <1>;
200-
raster-order = <0>;
201-
fifo-th = <0>;
202-
};
203-
display-timings {
204-
480x272 {
205-
hactive = <480>;
206-
vactive = <272>;
207-
hback-porch = <43>;
208-
hfront-porch = <8>;
209-
hsync-len = <4>;
210-
vback-porch = <12>;
211-
vfront-porch = <4>;
212-
vsync-len = <10>;
213-
clock-frequency = <9000000>;
214-
hsync-active = <0>;
215-
vsync-active = <0>;
192+
193+
port {
194+
panel_0: endpoint@0 {
195+
remote-endpoint = <&lcdc_0>;
216196
};
217197
};
218198
};
@@ -725,6 +705,12 @@
725705
status = "okay";
726706

727707
blue-and-red-wiring = "crossed";
708+
709+
port {
710+
lcdc_0: endpoint@0 {
711+
remote-endpoint = <&panel_0>;
712+
};
713+
};
728714
};
729715

730716
&rtc {

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,19 @@
287287
gpio-controller;
288288
#gpio-cells = <2>;
289289
};
290+
291+
/* osd9616p0899-10 */
292+
display@3c {
293+
compatible = "solomon,ssd1306fb-i2c";
294+
reg = <0x3c>;
295+
solomon,height = <16>;
296+
solomon,width = <96>;
297+
solomon,com-seq;
298+
solomon,com-invdir;
299+
solomon,page-offset = <0>;
300+
solomon,prechargep1 = <2>;
301+
solomon,prechargep2 = <13>;
302+
};
290303
};
291304

292305
&spi0 {

‎arch/arm/boot/dts/am33xx.dtsi

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,31 @@
496496
dma-names = "tx", "rx";
497497
};
498498
};
499+
500+
target-module@56000000 {
501+
compatible = "ti,sysc-omap4", "ti,sysc";
502+
reg = <0x5600fe00 0x4>,
503+
<0x5600fe10 0x4>;
504+
reg-names = "rev", "sysc";
505+
ti,sysc-midle = <SYSC_IDLE_FORCE>,
506+
<SYSC_IDLE_NO>,
507+
<SYSC_IDLE_SMART>;
508+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
509+
<SYSC_IDLE_NO>,
510+
<SYSC_IDLE_SMART>;
511+
clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;
512+
clock-names = "fck";
513+
resets = <&prm_gfx 0>;
514+
reset-names = "rstctrl";
515+
#address-cells = <1>;
516+
#size-cells = <1>;
517+
ranges = <0 0x56000000 0x1000000>;
518+
519+
/*
520+
* Closed source PowerVR driver, no child device
521+
* binding or driver in mainline
522+
*/
523+
};
499524
};
500525
};
501526

‎arch/arm/boot/dts/am3517.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
clock-names = "ick";
7575
};
7676

77-
davinci_mdio: ethernet@5c030000 {
77+
davinci_mdio: mdio@5c030000 {
7878
compatible = "ti,davinci_mdio";
7979
ti,hwmods = "davinci_mdio";
8080
status = "disabled";

‎arch/arm/boot/dts/am3703.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Copyright (C) 2020 André Hentschel <[email protected]>
4+
*/
5+
6+
#include "omap36xx.dtsi"
7+
8+
&iva {
9+
status = "disabled";
10+
};
11+
12+
&sgx_module {
13+
status = "disabled";
14+
};

‎arch/arm/boot/dts/am3715.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Copyright (C) 2020 André Hentschel <[email protected]>
4+
*/
5+
6+
#include "omap36xx.dtsi"
7+
8+
&iva {
9+
status = "disabled";
10+
};

‎arch/arm/boot/dts/am4372.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,26 @@
445445
pool;
446446
};
447447
};
448+
449+
target-module@56000000 {
450+
compatible = "ti,sysc-omap4", "ti,sysc";
451+
reg = <0x5600fe00 0x4>,
452+
<0x5600fe10 0x4>;
453+
reg-names = "rev", "sysc";
454+
ti,sysc-midle = <SYSC_IDLE_FORCE>,
455+
<SYSC_IDLE_NO>,
456+
<SYSC_IDLE_SMART>;
457+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
458+
<SYSC_IDLE_NO>,
459+
<SYSC_IDLE_SMART>;
460+
clocks = <&gfx_l3_clkctrl AM4_GFX_L3_GFX_CLKCTRL 0>;
461+
clock-names = "fck";
462+
resets = <&prm_gfx 0>;
463+
reset-names = "rstctrl";
464+
#address-cells = <1>;
465+
#size-cells = <1>;
466+
ranges = <0 0x56000000 0x1000000>;
467+
};
448468
};
449469
};
450470

‎arch/arm/boot/dts/am437x-sk-evm.dts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,12 @@
272272
>;
273273
};
274274

275+
clkout1_pin: pinmux_clkout1_pin {
276+
pinctrl-single,pins = <
277+
0x270 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* XDMA_EVENT_INTR0/CLKOUT1 */
278+
>;
279+
};
280+
275281
cpsw_default: cpsw_default {
276282
pinctrl-single,pins = <
277283
/* Slave 1 */
@@ -593,6 +599,25 @@
593599
pinctrl-0 = <&i2c1_pins>;
594600
clock-frequency = <400000>;
595601

602+
ov2659@30 {
603+
compatible = "ovti,ov2659";
604+
reg = <0x30>;
605+
pinctrl-names = "default";
606+
pinctrl-0 = <&clkout1_pin>;
607+
608+
clocks = <&clkout1_mux_ck>;
609+
clock-names = "xvclk";
610+
assigned-clocks = <&clkout1_mux_ck>;
611+
assigned-clock-parents = <&clkout1_osc_div_ck>;
612+
613+
port {
614+
ov2659_1: endpoint {
615+
remote-endpoint = <&vpfe0_ep>;
616+
link-frequencies = /bits/ 64 <70000000>;
617+
};
618+
};
619+
};
620+
596621
edt-ft5306@38 {
597622
status = "okay";
598623
compatible = "edt,edt-ft5306", "edt,edt-ft5x06";
@@ -877,7 +902,7 @@
877902
/* Camera port */
878903
port {
879904
vpfe0_ep: endpoint {
880-
/* remote-endpoint = <&sensor>; add once we have it */
905+
remote-endpoint = <&ov2659_1>;
881906
ti,am437x-vpfe-interface = <0>;
882907
bus-width = <8>;
883908
hsync-active = <0>;

0 commit comments

Comments
 (0)