Skip to content

Commit cdfb418

Browse files
committed
Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next
Batch #1 for v6.15-rc1 Signed-off-by: Nishanth Menon <[email protected]>
2 parents 17bff22 + 92d8c02 commit cdfb418

26 files changed

+683
-29
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ properties:
4646
- description: K3 AM625 SoC
4747
items:
4848
- enum:
49+
- beagle,am62-pocketbeagle2
4950
- beagle,am625-beagleplay
5051
- ti,am625-sk
5152
- ti,am62-lp-sk

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ patternProperties:
6868
description:
6969
The node corresponding to SoC chip identification.
7070

71+
"^pcie-ctrl@[0-9a-f]+$":
72+
type: object
73+
description:
74+
The node corresponding to PCIe control register.
75+
7176
required:
7277
- compatible
7378
- reg
@@ -110,5 +115,10 @@ examples:
110115
compatible = "ti,am654-chipid";
111116
reg = <0x14 0x4>;
112117
};
118+
119+
pcie0_ctrl: pcie-ctrl@4070 {
120+
compatible = "ti,j784s4-pcie-ctrl", "syscon";
121+
reg = <0x4070 0x4>;
122+
};
113123
};
114124
...

arch/arm64/boot/dts/ti/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
2727
dtb-$(CONFIG_ARCH_K3) += k3-am62x-phyboard-lyra-gpio-fan.dtbo
2828
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
2929
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-nand.dtbo
30+
dtb-$(CONFIG_ARCH_K3) += k3-am62-pocketbeagle2.dtb
3031

3132
# Boards with AM62Ax SoC
3233
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb

0 commit comments

Comments
 (0)