Skip to content

Commit 79d0162

Browse files
arndbarndb
committed
Merge tag 'v6.6-next-dts64.3' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/dt
MediaTek ARM64 DTS updates for v6.7 - Add support for SMI/IOMMU/LARBs, power domains and multimedia related subsystems for the MT8365 SoC - Add support for MediaTek Genio 1200 IoT evaluation board - Add support for newer revisions of MT8192 Chromebooks - Add support for internal eDP display on MT8195 Cherry Chromebooks - Add display and display backlight support for the Helio X10 SoC and for the Sony Xperia M5 smartphone * tag 'v6.6-next-dts64.3' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (21 commits) arm64: dts: mediatek: cherry: Configure eDP and internal display arm64: dts: mediatek: mt6795-xperia-m5: Add DSI Display and its vregs arm64: dts: mediatek: mt6795-xperia-m5: Add display backlight support arm64: dts: mediatek: mt6795: Add support for display blocks and DPI/DSI arm64: dts: mediatek: Add spherion-rev4 arm64: dts: mediatek: Add hayato-rev5-sku2 arm64: dts: mediatek: Remove asurada-audio dtsi files dt-bindings: arm64: dts: mediatek: Add rev4 of spherion dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato arm64: dts: mediatek: add iommu support for mt8365 SoC arm64: dts: mediatek: add larb support for mt8365 SoC arm64: dts: mediatek: add smi support for mt8365 SoC arm64: dts: mediatek: add power domain support for mt8365 SoC arm64: dts: mediatek: add apu support for mt8365 SoC arm64: dts: mediatek: add camsys support for mt8365 SoC arm64: dts: mediatek: add mmsys support for mt8365 SoC arm64: dts: mediatek: mt8183-kukui: Add PMIC regulator supplies arm64: dts: mediatek: add device-tree for Genio 1200 EVK board dt-bindings: arm64: mediatek: add mt8395-evk board dt-bindings: power: Add MT8365 power domains ... Link: https://lore.kernel.org/r/298f159c-f80d-3ba8-fde9-b11b59e5a58e@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a8eddbe + 4055758 commit 79d0162

19 files changed

Lines changed: 1775 additions & 69 deletions

‎Documentation/devicetree/bindings/arm/mediatek.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,22 @@ properties:
133133
- enum:
134134
- mediatek,mt8183-evb
135135
- const: mediatek,mt8183
136+
- description: Google Hayato rev5
137+
items:
138+
- const: google,hayato-rev5-sku2
139+
- const: google,hayato-sku2
140+
- const: google,hayato
141+
- const: mediatek,mt8192
136142
- description: Google Hayato
137143
items:
138144
- const: google,hayato-rev1
139145
- const: google,hayato
140146
- const: mediatek,mt8192
147+
- description: Google Spherion rev4 (Acer Chromebook 514)
148+
items:
149+
- const: google,spherion-rev4
150+
- const: google,spherion
151+
- const: mediatek,mt8192
141152
- description: Google Spherion (Acer Chromebook 514)
142153
items:
143154
- const: google,spherion-rev3
@@ -248,6 +259,11 @@ properties:
248259
- enum:
249260
- mediatek,mt8365-evk
250261
- const: mediatek,mt8365
262+
- items:
263+
- enum:
264+
- mediatek,mt8395-evk
265+
- const: mediatek,mt8395
266+
- const: mediatek,mt8195
251267
- items:
252268
- enum:
253269
- mediatek,mt8516-pumpkin

‎Documentation/devicetree/bindings/power/mediatek,power-controller.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ properties:
3131
- mediatek,mt8188-power-controller
3232
- mediatek,mt8192-power-controller
3333
- mediatek,mt8195-power-controller
34+
- mediatek,mt8365-power-controller
3435

3536
'#power-domain-cells':
3637
const: 1
@@ -88,6 +89,7 @@ $defs:
8889
"include/dt-bindings/power/mediatek,mt8188-power.h" - for MT8188 type power domain.
8990
"include/dt-bindings/power/mt8192-power.h" - for MT8192 type power domain.
9091
"include/dt-bindings/power/mt8195-power.h" - for MT8195 type power domain.
92+
"include/dt-bindings/power/mediatek,mt8365-power.h" - for MT8365 type power domain.
9193
maxItems: 1
9294

9395
clocks:
@@ -115,6 +117,10 @@ $defs:
115117
$ref: /schemas/types.yaml#/definitions/phandle
116118
description: phandle to the device containing the INFRACFG register range.
117119

120+
mediatek,infracfg-nao:
121+
$ref: /schemas/types.yaml#/definitions/phandle
122+
description: phandle to the device containing the INFRACFG-NAO register range.
123+
118124
mediatek,smi:
119125
$ref: /schemas/types.yaml#/definitions/phandle
120126
description: phandle to the device containing the SMI register range.

‎Documentation/devicetree/bindings/power/qcom,rpmpd.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ properties:
4646
- qcom,sm6125-rpmpd
4747
- qcom,sm6350-rpmhpd
4848
- qcom,sm6375-rpmpd
49+
- qcom,sm7150-rpmhpd
4950
- qcom,sm8150-rpmhpd
5051
- qcom,sm8250-rpmhpd
5152
- qcom,sm8350-rpmhpd

‎arch/arm64/boot/dts/mediatek/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb
4545
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb
4646
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-evb.dtb
4747
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r1.dtb
48+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r5-sku2.dtb
4849
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r0.dtb
50+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r4.dtb
4951
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb
5052
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r1.dtb
5153
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r2.dtb
5254
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r3.dtb
5355
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-demo.dtb
5456
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-evb.dtb
5557
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8365-evk.dtb
58+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-genio-1200-evk.dtb
5659
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb

‎arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,23 @@
2222
serial1 = &uart1;
2323
};
2424

25+
backlight_lcd0: backlight {
26+
compatible = "led-backlight";
27+
leds = <&disp_led_pwm>, <&pmic_bl_led>;
28+
29+
default-brightness-level = <300>;
30+
};
31+
32+
led-controller-display {
33+
compatible = "pwm-leds";
34+
35+
disp_led_pwm: led-0 {
36+
label = "backlight-pwm";
37+
pwms = <&pwm0 0 500000>;
38+
max-brightness = <1024>;
39+
};
40+
};
41+
2542
memory@40000000 {
2643
device_type = "memory";
2744
reg = <0 0x40000000 0 0x1e800000>;
@@ -49,6 +66,65 @@
4966
no-map;
5067
};
5168
};
69+
70+
vreg_disp_avdd: regulator-disp-avdd {
71+
compatible = "regulator-fixed";
72+
regulator-name = "disp_avdd";
73+
regulator-min-microvolt = <5000000>;
74+
regulator-max-microvolt = <5000000>;
75+
gpio = <&pio 138 GPIO_ACTIVE_HIGH>;
76+
enable-active-high;
77+
};
78+
79+
vreg_disp_avee: regulator-disp-avee {
80+
compatible = "regulator-fixed";
81+
regulator-name = "disp_avee";
82+
regulator-min-microvolt = <5000000>;
83+
regulator-max-microvolt = <5000000>;
84+
gpio = <&pio 139 GPIO_ACTIVE_HIGH>;
85+
enable-active-high;
86+
};
87+
88+
vreg_disp_vddh: regulator-disp-vddh {
89+
compatible = "regulator-fixed";
90+
regulator-name = "disp_vddh";
91+
regulator-min-microvolt = <1800000>;
92+
regulator-max-microvolt = <1800000>;
93+
regulator-always-on;
94+
regulator-boot-on;
95+
};
96+
};
97+
98+
&dsi0 {
99+
status = "okay";
100+
#address-cells = <1>;
101+
#size-cells = <0>;
102+
103+
panel: panel@0 {
104+
compatible = "sharp,ls060t1sx01";
105+
reg = <0>;
106+
avdd-supply = <&vreg_disp_avdd>;
107+
avee-supply = <&vreg_disp_avee>;
108+
vddi-supply = <&mt6331_vgp3_reg>;
109+
vddh-supply = <&vreg_disp_vddh>;
110+
reset-gpios = <&pio 106 GPIO_ACTIVE_LOW>;
111+
backlight = <&backlight_lcd0>;
112+
113+
pinctrl-0 = <&disp_rst_pins>;
114+
pinctrl-names = "default";
115+
116+
port {
117+
panel_in: endpoint {
118+
remote-endpoint = <&dsi0_out>;
119+
};
120+
};
121+
};
122+
123+
port {
124+
dsi0_out: endpoint {
125+
remote-endpoint = <&panel_in>;
126+
};
127+
};
52128
};
53129

54130
&fhctl {
@@ -163,7 +239,17 @@
163239
status = "okay";
164240
};
165241

242+
&mt6331_vgp3_reg {
243+
regulator-min-microvolt = <1800000>;
244+
};
245+
166246
&pio {
247+
disp_rst_pins: lcm-pins {
248+
pins-rst {
249+
pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;
250+
};
251+
};
252+
167253
mmc0_pins_default: emmc-sdr-pins {
168254
pins-cmd-dat {
169255
pinmux = <PINMUX_GPIO154__FUNC_MSDC0_DAT0>,
@@ -338,6 +424,21 @@
338424
* an interrupt on the companion, so we use the MT6332 IRQ GPIO.
339425
*/
340426
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
427+
428+
mt6332-led {
429+
compatible = "mediatek,mt6332-led";
430+
#address-cells = <1>;
431+
#size-cells = <0>;
432+
433+
pmic_bl_led: led@0 {
434+
reg = <0>;
435+
label = "backlight-pmic";
436+
};
437+
};
438+
};
439+
440+
&pwm0 {
441+
status = "okay";
341442
};
342443

343444
&uart0 {

0 commit comments

Comments
 (0)