Skip to content

Commit 794f282

Browse files
nmenonnmenon
committed
Merge branches 'ti-k3-dts-next' and 'ti-k3-config-next' into ti-next
Batch #3 of the next merge window Signed-off-by: Nishanth Menon <[email protected]>
3 parents 4ca9c20 + d864bb5 + 8d8f28d commit 794f282

14 files changed

+1388
-27
lines changed

‎Documentation/devicetree/bindings/arm/ti/k3.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ properties:
140140
- ti,j721s2-evm
141141
- const: ti,j721s2
142142

143+
- description: K3 J721s2 SoC Phytec SoM based boards
144+
items:
145+
- enum:
146+
- phytec,am68-phyboard-izar
147+
- const: phytec,am68-phycore-som
148+
- const: ti,j721s2
149+
143150
- description: K3 J722S SoC and Boards
144151
items:
145152
- enum:

‎Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
compatible:
2727
items:
2828
- enum:
29+
- ti,am654-system-controller
2930
- ti,j7200-system-controller
3031
- ti,j721e-system-controller
3132
- ti,j721s2-system-controller
@@ -73,6 +74,18 @@ patternProperties:
7374
description:
7475
The node corresponding to PCIe control register.
7576

77+
"^clock@[0-9a-f]+$":
78+
type: object
79+
$ref: /schemas/soc/ti/ti,am654-serdes-ctrl.yaml#
80+
description:
81+
This is the Serdes Control region.
82+
83+
"^dss-oldi-io-ctrl@[0-9a-f]+$":
84+
type: object
85+
$ref: /schemas/mfd/syscon.yaml#
86+
description:
87+
This is the DSS OLDI CTRL region.
88+
7689
required:
7790
- compatible
7891
- reg

‎arch/arm64/boot/dts/ti/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
110110
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-dual-imx219.dtbo
111111

112112
# Boards with J721s2 SoC
113+
dtb-$(CONFIG_ARCH_K3) += k3-am68-phyboard-izar.dtb
113114
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
114115
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board-pcie1-ep.dtbo
115116
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb

‎arch/arm64/boot/dts/ti/k3-am62a7-sk.dts

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,25 @@
383383
AM62AX_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
384384
>;
385385
};
386+
387+
main_ecap0_pins_default: main-ecap0-default-pins {
388+
pinctrl-single,pins = <
389+
AM62AX_IOPAD(0x01b8, PIN_OUTPUT, 3) /* (C16) SPI0_CS1.ECAP0_IN_APWM_OUT */
390+
>;
391+
};
392+
393+
main_ecap2_pins_default: main-ecap2-default-pins {
394+
pinctrl-single,pins = <
395+
AM62AX_IOPAD(0x01a4, PIN_OUTPUT, 2) /* (A19) MCASP0_ACLKX.ECAP2_IN_APWM_OUT */
396+
>;
397+
};
398+
399+
main_epwm1_pins_default: main-epwm1-default-pins {
400+
pinctrl-single,pins = <
401+
AM62AX_IOPAD(0x019c, PIN_OUTPUT, 6) /* (B18) MCASP0_AXR1.EHRPWM1_A */
402+
AM62AX_IOPAD(0x01a0, PIN_OUTPUT, 6) /* (B20) MCASP0_AXR0.EHRPWM1_B */
403+
>;
404+
};
386405
};
387406

388407
&mcu_pmx0 {
@@ -741,3 +760,24 @@
741760
};
742761
};
743762
};
763+
764+
&ecap0 {
765+
/* P26 of J3 */
766+
pinctrl-names = "default";
767+
pinctrl-0 = <&main_ecap0_pins_default>;
768+
status = "okay";
769+
};
770+
771+
&ecap2 {
772+
/* P11 of J3 */
773+
pinctrl-names = "default";
774+
pinctrl-0 = <&main_ecap2_pins_default>;
775+
status = "okay";
776+
};
777+
778+
&epwm1 {
779+
/* P36/P33 of J3 */
780+
pinctrl-names = "default";
781+
pinctrl-0 = <&main_epwm1_pins_default>;
782+
status = "okay";
783+
};

‎arch/arm64/boot/dts/ti/k3-am62p5-sk.dts

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,32 @@
356356
AM62PX_IOPAD(0x0124, PIN_INPUT, 7) /* (J25) MMC2_SDCD.GPIO0_71 */
357357
>;
358358
};
359+
360+
main_ecap1_pins_default: main-ecap1-default-pins {
361+
pinctrl-single,pins = <
362+
AM62PX_IOPAD(0x019c, PIN_OUTPUT, 2) /* (E24) MCASP0_AXR1.ECAP1_IN_APWM_OUT */
363+
>;
364+
};
365+
366+
main_ecap2_pins_default: main-ecap2-default-pins {
367+
pinctrl-single,pins = <
368+
AM62PX_IOPAD(0x01a4, PIN_OUTPUT, 2) /* (F24) MCASP0_ACLKX.ECAP2_IN_APWM_OUT */
369+
>;
370+
};
371+
372+
main_epwm0_pins_default: main-epwm0-default-pins {
373+
pinctrl-single,pins = <
374+
AM62PX_IOPAD(0x01b4, PIN_OUTPUT, 2) /* (D20) SPI0_CS0.EHRPWM0_A */
375+
AM62PX_IOPAD(0x01b8, PIN_OUTPUT, 2) /* (E20) SPI0_CS1.EHRPWM0_B */
376+
>;
377+
};
378+
379+
main_epwm1_pins_default: main-epwm1-default-pins {
380+
pinctrl-single,pins = <
381+
AM62PX_IOPAD(0x01bc, PIN_OUTPUT, 2) /* (B21) SPI0_CLK.EHRPWM1_A */
382+
AM62PX_IOPAD(0x01c0, PIN_OUTPUT, 2) /* (B20) SPI0_D0.EHRPWM1_B */
383+
>;
384+
};
359385
};
360386

361387
&main_i2c0 {
@@ -683,3 +709,31 @@
683709
&mcu_gpio_intr {
684710
status = "reserved";
685711
};
712+
713+
&ecap1 {
714+
/* P36 of J4 */
715+
pinctrl-names = "default";
716+
pinctrl-0 = <&main_ecap1_pins_default>;
717+
status = "okay";
718+
};
719+
720+
&ecap2 {
721+
/* P11 of J4 */
722+
pinctrl-names = "default";
723+
pinctrl-0 = <&main_ecap2_pins_default>;
724+
status = "okay";
725+
};
726+
727+
&epwm0 {
728+
/* P24/P26 of J4 */
729+
pinctrl-names = "default";
730+
pinctrl-0 = <&main_epwm0_pins_default>;
731+
status = "okay";
732+
};
733+
734+
&epwm1 {
735+
/* P23/P19 of J4 */
736+
pinctrl-names = "default";
737+
pinctrl-0 = <&main_epwm1_pins_default>;
738+
status = "okay";
739+
};

‎arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,25 @@
303303
AM62X_IOPAD(0x078, PIN_OUTPUT, 1) /* (U24) GPMC0_AD15.VOUT0_DATA23 */
304304
>;
305305
};
306+
307+
main_ecap0_pins_default: main-ecap0-default-pins {
308+
pinctrl-single,pins = <
309+
AM62X_IOPAD(0x01b8, PIN_OUTPUT, 3) /* (C13) SPI0_CS1.ECAP0_IN_APWM_OUT */
310+
>;
311+
};
312+
313+
main_ecap2_pins_default: main-ecap2-default-pins {
314+
pinctrl-single,pins = <
315+
AM62X_IOPAD(0x01a4, PIN_OUTPUT, 2) /* (B20) MCASP0_ACLKX.ECAP2_IN_APWM_OUT */
316+
>;
317+
};
318+
319+
main_epwm1_pins_default: main-epwm1-default-pins {
320+
pinctrl-single,pins = <
321+
AM62X_IOPAD(0x019c, PIN_OUTPUT, 6) /* (B18) MCASP0_AXR1.EHRPWM1_A */
322+
AM62X_IOPAD(0x01a0, PIN_OUTPUT, 6) /* (E18) MCASP0_AXR0.EHRPWM1_B */
323+
>;
324+
};
306325
};
307326

308327
&mcu_pmx0 {
@@ -560,3 +579,24 @@
560579
&mcu_gpio_intr {
561580
status = "reserved";
562581
};
582+
583+
&ecap0 {
584+
/* P26 of J3 */
585+
pinctrl-names = "default";
586+
pinctrl-0 = <&main_ecap0_pins_default>;
587+
status = "okay";
588+
};
589+
590+
&ecap2 {
591+
/* P11 of J3 */
592+
pinctrl-names = "default";
593+
pinctrl-0 = <&main_ecap2_pins_default>;
594+
status = "okay";
595+
};
596+
597+
&epwm1 {
598+
/* P36/P33 of J3 */
599+
pinctrl-names = "default";
600+
pinctrl-0 = <&main_epwm1_pins_default>;
601+
status = "okay";
602+
};

‎arch/arm64/boot/dts/ti/k3-am65-main.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
};
480480

481481
scm_conf: scm-conf@100000 {
482-
compatible = "syscon", "simple-mfd";
482+
compatible = "ti,am654-system-controller", "syscon", "simple-mfd";
483483
reg = <0 0x00100000 0 0x1c000>;
484484
#address-cells = <1>;
485485
#size-cells = <1>;

‎arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,20 @@
1515
#include <dt-bindings/interrupt-controller/irq.h>
1616

1717
&{/} {
18+
vcc_5v0: lcd-regulator {
19+
/* Output of LM5140 */
20+
compatible = "regulator-fixed";
21+
regulator-name = "vcc_5v0";
22+
regulator-min-microvolt = <5000000>;
23+
regulator-max-microvolt = <5000000>;
24+
regulator-always-on;
25+
regulator-boot-on;
26+
vin-supply = <&evm_12v0>;
27+
};
28+
1829
display0 {
1930
compatible = "rocktech,rk101ii01d-ct";
31+
power-supply = <&vcc_5v0>;
2032
backlight = <&lcd_bl>;
2133
enable-gpios = <&pca9555 8 GPIO_ACTIVE_HIGH>;
2234
port {

0 commit comments

Comments
 (0)