Skip to content

Commit 197da80

Browse files
committed
Merge tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm
ARM: soc/omap updates for v7.1 * tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: omap2: dead code cleanup in kconfig for ARCH_OMAP4 ARM: OMAP1: Fix DEBUG_LL and earlyprintk on OMAP16XX ARM: omap: fix all kernel-doc warnings ARM: omap2: Replace scnprintf with strscpy in omap3_cpuinfo Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 13c4068 + 2c4059f commit 197da80

14 files changed

Lines changed: 1180 additions & 7 deletions

File tree

Documentation/devicetree/bindings/arm/ti/omap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ properties:
144144
- motorola,droid-bionic # Motorola Droid Bionic XT875
145145
- motorola,xyboard-mz609
146146
- motorola,xyboard-mz617
147+
- samsung,espresso7
148+
- samsung,espresso10
147149
- ti,omap4-panda
148150
- ti,omap4-sdp
149151
- const: ti,omap4430

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
oneOf:
3434
- items:
3535
- enum:
36+
- doestek,dtc34lm85am # For the Doestek DTC34LM85AM Flat Panel Display (FPD) Transmitter
3637
- onnn,fin3385 # OnSemi FIN3385
3738
- ti,ds90c185 # For the TI DS90C185 FPD-Link Serializer
3839
- ti,ds90c187 # For the TI DS90C187 FPD-Link Serializer

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ properties:
5858
- hydis,hv070wx2-1e0
5959
# Jenson Display BL-JT60050-01A 7" WSVGA (1024x600) color TFT LCD LVDS panel
6060
- jenson,bl-jt60050-01a
61+
# Samsung LTN070NL01 7.0" WSVGA (1024x600) TFT LCD LVDS panel
62+
- samsung,ltn070nl01
63+
# Samsung LTN101AL03 10.1" WXGA (800x1280) TFT LCD LVDS panel
64+
- samsung,ltn101al03
6165
- tbs,a711-panel
6266
# Winstar WF70A8SYJHLNGA 7" WSVGA (1024x600) color TFT LCD LVDS panel
6367
- winstar,wf70a8syjhlnga

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,8 @@ patternProperties:
441441
description: D-Link Corporation
442442
"^dmo,.*":
443443
description: Data Modul AG
444+
"^doestek,.*":
445+
description: Doestek Co., Ltd.
444446
"^domintech,.*":
445447
description: Domintech Co., Ltd.
446448
"^dongwoon,.*":

arch/arm/boot/dts/ti/omap/Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,14 @@ dtb-$(CONFIG_ARCH_OMAP4) += \
8080
omap4-sdp-es23plus.dtb \
8181
omap4-var-dvk-om44.dtb \
8282
omap4-var-stk-om44.dtb \
83+
omap4-samsung-espresso7.dtb \
84+
omap4-samsung-espresso10.dtb \
8385
omap4-xyboard-mz609.dtb \
8486
omap4-xyboard-mz617.dtb
87+
88+
am335x-bonegreen-hdmi-00a0-dtbs := am335x-bonegreen-eco.dtb \
89+
am335x-bone-hdmi-00a0.dtbo
90+
8591
dtb-$(CONFIG_SOC_AM33XX) += \
8692
am335x-baltos-ir2110.dtb \
8793
am335x-baltos-ir3220.dtb \
@@ -93,6 +99,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
9399
am335x-bonegreen.dtb \
94100
am335x-bonegreen-wireless.dtb \
95101
am335x-bonegreen-eco.dtb \
102+
am335x-bonegreen-hdmi-00a0.dtb \
96103
am335x-chiliboard.dtb \
97104
am335x-cm-t335.dtb \
98105
am335x-evm.dtb \
@@ -174,3 +181,11 @@ dtb-$(CONFIG_SOC_TI81XX) += \
174181
dm8148-t410.dtb \
175182
dm8168-evm.dtb \
176183
dra62x-j5eco-evm.dtb
184+
185+
# Enable support for device-tree overlays
186+
DTC_FLAGS_am335x-bone += -@
187+
DTC_FLAGS_am335x-boneblack += -@
188+
DTC_FLAGS_am335x-boneblack-wireless += -@
189+
DTC_FLAGS_am335x-bonegreen += -@
190+
DTC_FLAGS_am335x-bonegreen-wireless += -@
191+
DTC_FLAGS_am335x-bonegreen-eco += -@
Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* 2017 Copyright (c) Seeed Technology Inc. All right reserved.
4+
* Author: Baozhu Zuo <zuobaozhu@gmail.com>
5+
* Copyright (c) Bootlin 2026
6+
*
7+
* This device tree overlay is compatible with the BeagleBone Black, Green
8+
* and their subversions.
9+
*/
10+
11+
/dts-v1/;
12+
/plugin/;
13+
14+
#include <dt-bindings/pinctrl/am33xx.h>
15+
#include <dt-bindings/interrupt-controller/irq.h>
16+
17+
&{/} {
18+
hdmi0: connector-hdmi {
19+
compatible = "hdmi-connector";
20+
label = "hdmi";
21+
type = "a";
22+
port {
23+
hdmi_connector_in: endpoint {
24+
remote-endpoint = <&it66121_out>;
25+
};
26+
};
27+
};
28+
29+
clk_mcasp0_fixed: clk-mcasp0-fixed {
30+
#clock-cells = <0>;
31+
compatible = "fixed-clock";
32+
clock-frequency = <24576000>;
33+
};
34+
35+
clk_mcasp0: clk-mcasp0 {
36+
#clock-cells = <0>;
37+
compatible = "gpio-gate-clock";
38+
clocks = <&clk_mcasp0_fixed>;
39+
enable-gpios = <&gpio1 27 0>;
40+
};
41+
42+
sound {
43+
compatible = "simple-audio-card";
44+
simple-audio-card,name = "TI BeagleBone Green HDMI cape";
45+
simple-audio-card,format = "i2s";
46+
simple-audio-card,bitclock-master = <&sound_master>;
47+
simple-audio-card,frame-master = <&sound_master>;
48+
49+
sound_master: simple-audio-card,cpu {
50+
sound-dai = <&mcasp0>;
51+
clocks = <&clk_mcasp0>;
52+
};
53+
54+
simple-audio-card,codec {
55+
sound-dai = <&it66121>;
56+
};
57+
};
58+
};
59+
60+
&am33xx_pinmux {
61+
bb_lcd_pins: pinmux-bb-lcd-pins {
62+
pinctrl-single,pins = <
63+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
64+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
65+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0)
66+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA3, PIN_OUTPUT, MUX_MODE0)
67+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA4, PIN_OUTPUT, MUX_MODE0)
68+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA5, PIN_OUTPUT, MUX_MODE0)
69+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA6, PIN_OUTPUT, MUX_MODE0)
70+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA7, PIN_OUTPUT, MUX_MODE0)
71+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_OUTPUT, MUX_MODE0)
72+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_OUTPUT, MUX_MODE0)
73+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_OUTPUT, MUX_MODE0)
74+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE0)
75+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_OUTPUT, MUX_MODE0)
76+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE0)
77+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_OUTPUT, MUX_MODE0)
78+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT, MUX_MODE0)
79+
AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT, MUX_MODE0)
80+
AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_OUTPUT, MUX_MODE0)
81+
AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT, MUX_MODE0)
82+
AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT, MUX_MODE0)
83+
AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_OUTPUT_PULLDOWN, MUX_MODE7)
84+
AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_OUTPUT_PULLDOWN, MUX_MODE7)
85+
AM33XX_PADCONF(AM335X_PIN_GPMC_WEN, PIN_INPUT, MUX_MODE7)
86+
>;
87+
};
88+
mcasp0_pins: mcasp0-pins {
89+
pinctrl-single,pins = <
90+
AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0)
91+
AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE2)
92+
AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLUP, MUX_MODE0)
93+
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
94+
>;
95+
};
96+
};
97+
98+
&i2c2 {
99+
status = "okay";
100+
#address-cells = <1>;
101+
#size-cells = <0>;
102+
103+
it66121: it66121 {
104+
compatible = "ite,it66121";
105+
reg = <0x4d>;
106+
pinctrl-names = "default";
107+
pinctrl-0 = <&bb_lcd_pins>;
108+
109+
#sound-dai-cells = <0>;
110+
111+
interrupt-parent = <&gpio2>;
112+
interrupts = <4 IRQ_TYPE_EDGE_RISING>;
113+
ports {
114+
#address-cells = <1>;
115+
#size-cells = <0>;
116+
117+
port@0 {
118+
reg = <0>;
119+
it66121_in: endpoint {
120+
bus-width = <24>;
121+
remote-endpoint = <&lcdc_0>;
122+
};
123+
};
124+
125+
port@1 {
126+
reg = <1>;
127+
it66121_out: endpoint {
128+
remote-endpoint = <&hdmi_connector_in>;
129+
};
130+
};
131+
};
132+
};
133+
};
134+
135+
&lcdc {
136+
status = "okay";
137+
blue-and-red-wiring = "straight";
138+
port {
139+
lcdc_0: endpoint@0 {
140+
remote-endpoint = <&it66121_in>;
141+
};
142+
};
143+
};
144+
145+
146+
&mcasp0 {
147+
status = "okay";
148+
#sound-dai-cells = <0>;
149+
pinctrl-names = "default";
150+
pinctrl-0 = <&mcasp0_pins>;
151+
op-mode = <0>;
152+
tdm-slots = <2>;
153+
serial-dir = < 0 0 1 0 >;
154+
tx-num-evt = <32>;
155+
rx-num-evt = <32>;
156+
};
157+

arch/arm/boot/dts/ti/omap/dm816x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
#address-cells = <1>;
9595
#size-cells = <0>;
9696
#pinctrl-cells = <1>;
97-
pinctrl-single,register-width = <16>;
98-
pinctrl-single,function-mask = <0xf>;
97+
pinctrl-single,register-width = <32>;
98+
pinctrl-single,function-mask = <0x1f>;
9999
};
100100

101101
/* Device Configuration Registers */

arch/arm/boot/dts/ti/omap/dra7-l4.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
ranges = <0 0 0x8000>;
328328
reg = <0x0 0x20>;
329329

330-
pcie1_phy: pciephy@4000 {
330+
pcie1_phy: pcie-phy@4000 {
331331
compatible = "ti,phy-pipe3-pcie";
332332
reg = <0x4000 0x80>, /* phy_rx */
333333
<0x4400 0x64>; /* phy_tx */
@@ -347,7 +347,7 @@
347347
#phy-cells = <0>;
348348
};
349349

350-
pcie2_phy: pciephy@5000 {
350+
pcie2_phy: pcie-phy@5000 {
351351
compatible = "ti,phy-pipe3-pcie";
352352
reg = <0x5000 0x80>, /* phy_rx */
353353
<0x5400 0x64>; /* phy_tx */

arch/arm/boot/dts/ti/omap/omap4-l4.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@
7272
#size-cells = <1>;
7373
};
7474

75-
omap_control_usb2phy: control-phy@300 {
75+
omap_control_usb2phy: phy@300 {
7676
compatible = "ti,control-phy-usb2";
7777
reg = <0x300 0x4>;
7878
reg-names = "power";
7979
};
8080

81-
omap_control_usbotg: control-phy@33c {
81+
omap_control_usbotg: phy@33c {
8282
compatible = "ti,control-phy-otghs";
8383
reg = <0x33c 0x4>;
8484
reg-names = "otghs_control";

0 commit comments

Comments
 (0)