Skip to content

Commit

Permalink
Merge tag 'soc-dt-6.13' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/soc/soc

Pull SoC devicetree updates from Arnd Bergmann:
 "This release adds the devicetree files for an impressive number of new
  SoC variants, though as expected these are all related to others we
  already support:

   - The microchip sam9x7 devicetree is now added, after the device
     driver and platform code has already made it in. This is likely the
     last ARMv5 (!) platform to ever get added, updating the 20+ year
     old at91/sam9 platform with DDR3 memory and gigabit ethernet.

   - On the Apple platform, there are now devicetree files for a number
     of A-series SoCs in addition to the M-series ones, these are used
     primarily in phones and tablets, but are closely related to the
     already supported chips.

   - Samsung Exynos 8895 and Exynos 990 are more phone SoCs used in
     older Samsung Galaxy phones.

   - Qualcomm Snapdragon 778G (SM7325) is another phone SoC, closely
     related to the Snapdragon 7c+ Gen 3 (SC7280) used in low-end
     laptops.

   - Rockchip RK3528 and RK3576 are new variants of their TV box and
     Tablet chips, still using the older ARMv8.0 cores from
     RK3328/RK3399 but with a newer process and other improvements from
     the RK35xx (otherwise ARMv8.2) chips. RK3566T and RK3399-S are also
     added, these are just lower-cost versions of their normal
     counterparts.

   - TI J742S2 is a feature-reduced version of the J784s4
     industrial/automotive SoC, with fewer CPU cores.

   - Sophgo SG2002 is an embedded SoC with one RISC-V (C906) and one ARM
     (Cortex-A53) core, at this point support is only added for running
     on the RISC-V side on the LicheeRV Nano board.

  A total of 92 new .dts files describing individual machines is added,
  which must be a new record. The majority of these is for the newly
  added chips above, notably all the Apple phones and tablets. The other
  new machines include nine industrial/embedded boards with NXP i.MX6 or
  i.MX8 SoCs, eight for Rockchips RK35XX and one or two each for
  Rockchips RV1109, RK3308, Allwinner A33, Tegra 234, Qualcomm
  qcs9100/sc8280xp/x1e80100, TI AM625 and Starfive JH7110.

  As usual there are also many newly added features in existing boards
  as well as cleanups and minor bugfixes"

* tag 'soc-dt-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (718 commits)
  arm64: dts: apm: Remove unused and undocumented "bus_num" property
  arm: dts: spear13xx: Remove unused and undocumented "pl022,slave-tx-disable" property
  arm64: dts: amd: Remove unused and undocumented "amd,zlib-support" property
  arm64: dts: lg131x: Update spi clock properties
  arm64: dts: seattle: Update spi clock properties
  arm64: dts: rockchip: use less broad pinctrl for pcie3x1 on Radxa E25
  arm64: dts: rockchip: add Radxa ROCK 5C
  dt-bindings: arm: rockchip: add Radxa ROCK 5C
  arm64: dts: rockchip: orangepi-5-plus: Enable GPU
  arm64: dts: rockchip: enable USB3 on NanoPC-T6
  arm64: dts: rockchip: adapt regulator nodenames to preferred form
  arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi GenBook
  arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi 4B
  arm64: dts: rockchip: Enable HDMI0 for rk3588 Cool Pi CM5 EVB
  arm64: dts: rockchip: Enable HDMI on NanoPi R6C/R6S
  arm64: dts: rockchip: Enable GPU on NanoPi R6C/R6S
  arm64: dts: rockchip: Enable HDMI on Hardkernel ODROID-M2
  arm64: dts: rockchip: Remove non-removable flag from sdmmc on rk3576-sige5
  arm64: dts: allwinner: a100: perf1: Add eMMC and MMC node
  arm64: dts: allwinner: pinephone: Add mount matrix to accelerometer
  ...
  • Loading branch information
torvalds committed Nov 20, 2024
2 parents 79caa6c + 9f5cbda commit 9c39d5a
Show file tree
Hide file tree
Showing 1,015 changed files with 64,209 additions and 19,687 deletions.
160 changes: 159 additions & 1 deletion Documentation/devicetree/bindings/arm/apple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,58 @@ maintainers:
description: |
ARM platforms using SoCs designed by Apple Inc., branded "Apple Silicon".
This currently includes devices based on the "M1" SoC:
This currently includes devices based on the "A7" SoC:
- iPhone 5s
- iPad Air (1)
- iPad mini 2
- iPad mini 3
Devices based on the "A8" SoC:
- iPhone 6
- iPhone 6 Plus
- iPad mini 4
- iPod touch 6
- Apple TV HD
Device based on the "A8X" SoC:
- iPad Air 2
Devices based on the "A9" SoC:
- iPhone 6s
- iPhone 6s Plus
- iPhone SE (2016)
- iPad 5
Devices based on the "A9X" SoC:
- iPad Pro (9.7-inch)
- iPad Pro (12.9-inch)
Devices based on the "A10" SoC:
- iPhone 7
- iPhone 7 Plus
- iPod touch 7
- iPad 6
- iPad 7
Devices based on the "A10X" SoC:
- Apple TV 4K (1st generation)
- iPad Pro (2nd Generation) (10.5 Inch)
- iPad Pro (2nd Generation) (12.9 Inch)
Devices based on the "A11" SoC:
- iPhone 8
- iPhone 8 Plus
- iPhone X
Devices based on the "M1" SoC:
- Mac mini (M1, 2020)
- MacBook Pro (13-inch, M1, 2020)
Expand Down Expand Up @@ -65,6 +116,113 @@ properties:
const: "/"
compatible:
oneOf:
- description: Apple A7 SoC based platforms
items:
- enum:
- apple,j71 # iPad Air (Wi-Fi)
- apple,j72 # iPad Air (Cellular)
- apple,j73 # iPad Air (Cellular, China)
- apple,j85 # iPad mini 2 (Wi-Fi)
- apple,j85m # iPad mini 3 (Wi-Fi)
- apple,j86 # iPad mini 2 (Cellular)
- apple,j86m # iPad mini 3 (Cellular)
- apple,j87 # iPad mini 2 (Cellular, China)
- apple,j87m # iPad mini 3 (Cellular, China)
- apple,n51 # iPhone 5s (GSM)
- apple,n53 # iPhone 5s (LTE)
- const: apple,s5l8960x
- const: apple,arm-platform

- description: Apple A8 SoC based platforms
items:
- enum:
- apple,j42d # Apple TV HD
- apple,j96 # iPad mini 4 (Wi-Fi)
- apple,j97 # iPad mini 4 (Cellular)
- apple,n56 # iPhone 6 Plus
- apple,n61 # iPhone 6
- apple,n102 # iPod touch 6
- const: apple,t7000
- const: apple,arm-platform

- description: Apple A8X SoC based platforms
items:
- enum:
- apple,j81 # iPad Air 2 (Wi-Fi)
- apple,j82 # iPad Air 2 (Cellular)
- const: apple,t7001
- const: apple,arm-platform

- description: Apple Samsung A9 SoC based platforms
items:
- enum:
- apple,j71s # iPad 5 (Wi-Fi) (S8000)
- apple,j72s # iPad 5 (Cellular) (S8000)
- apple,n66 # iPhone 6s Plus (S8000)
- apple,n69u # iPhone SE (S8000)
- apple,n71 # iPhone 6S (S8000)
- const: apple,s8000
- const: apple,arm-platform

- description: Apple TSMC A9 SoC based platforms
items:
- enum:
- apple,j71t # iPad 5 (Wi-Fi) (S8003)
- apple,j72t # iPad 5 (Cellular) (S8003)
- apple,n66m # iPhone 6s Plus (S8003)
- apple,n69 # iPhone SE (S8003)
- apple,n71m # iPhone 6S (S8003)
- const: apple,s8003
- const: apple,arm-platform

- description: Apple A9X SoC based platforms
items:
- enum:
- apple,j127 # iPad Pro (9.7-inch) (Wi-Fi)
- apple,j128 # iPad Pro (9.7-inch) (Cellular)
- apple,j98a # iPad Pro (12.9-inch) (Wi-Fi)
- apple,j99a # iPad Pro (12.9-inch) (Cellular)
- const: apple,s8001
- const: apple,arm-platform

- description: Apple A10 SoC based platforms
items:
- enum:
- apple,d10 # iPhone 7 (Qualcomm)
- apple,d11 # iPhone 7 (Intel)
- apple,d101 # iPhone 7 Plus (Qualcomm)
- apple,d111 # iPhone 7 Plus (Intel)
- apple,j71b # iPad 6 (Wi-Fi)
- apple,j72b # iPad 6 (Cellular)
- apple,j171 # iPad 7 (Wi-Fi)
- apple,j172 # iPad 7 (Cellular)
- apple,n112 # iPod touch 7
- const: apple,t8010
- const: apple,arm-platform

- description: Apple A10X SoC based platforms
items:
- enum:
- apple,j105a # Apple TV 4K (1st Generation)
- apple,j120 # iPad Pro 2 (12.9-inch) (Wi-Fi)
- apple,j121 # iPad Pro 2 (12.9-inch) (Cellular)
- apple,j207 # iPad Pro 2 (10.5-inch) (Wi-Fi)
- apple,j208 # iPad Pro 2 (10.5-inch) (Cellular)
- const: apple,t8011
- const: apple,arm-platform

- description: Apple A11 SoC based platforms
items:
- enum:
- apple,d20 # iPhone 8 (Global)
- apple,d21 # iPhone 8 Plus (Global)
- apple,d22 # iPhone X (Global)
- apple,d201 # iPhone 8 (GSM)
- apple,d211 # iPhone 8 Plus (GSM)
- apple,d221 # iPhone X (GSM)
- const: apple,t8015
- const: apple,arm-platform

- description: Apple M1 SoC based platforms
items:
- enum:
Expand Down
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/arm/atmel-at91.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ properties:
- const: microchip,sam9x60
- const: atmel,at91sam9

- description: Microchip SAM9X7 Evaluation Boards
items:
- const: microchip,sam9x75-curiosity
- const: microchip,sam9x7
- const: atmel,at91sam9

- description: Nattis v2 board with Natte v2 power board
items:
- const: axentia,nattis-2
Expand Down
12 changes: 11 additions & 1 deletion Documentation/devicetree/bindings/arm/cpus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,14 @@ properties:
enum:
- apple,avalanche
- apple,blizzard
- apple,icestorm
- apple,cyclone
- apple,firestorm
- apple,hurricane-zephyr
- apple,icestorm
- apple,mistral
- apple,monsoon
- apple,twister
- apple,typhoon
- arm,arm710t
- arm,arm720t
- arm,arm740t
Expand Down Expand Up @@ -202,10 +208,14 @@ properties:
- qcom,kryo560
- qcom,kryo570
- qcom,kryo660
- qcom,kryo670
- qcom,kryo685
- qcom,kryo780
- qcom,oryon
- qcom,scorpion
- samsung,mongoose-m2
- samsung,mongoose-m3
- samsung,mongoose-m5

enable-method:
$ref: /schemas/types.yaml#/definitions/string
Expand Down
45 changes: 42 additions & 3 deletions Documentation/devicetree/bindings/arm/fsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,9 @@ properties:

- description: i.MX6Q PHYTEC phyFLEX-i.MX6
items:
- const: phytec,imx6q-pbab01 # PHYTEC phyFLEX carrier board
- enum:
- comvetia,imx6q-lxr # Comvetia LXR board
- phytec,imx6q-pbab01 # PHYTEC phyFLEX carrier board
- const: phytec,imx6q-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
- const: fsl,imx6q

Expand Down Expand Up @@ -523,9 +525,11 @@ properties:
- const: dfi,fs700e-m60
- const: fsl,imx6dl

- description: i.MX6DL DHCOM PicoITX Board
- description: i.MX6DL DHCOM based Boards
items:
- const: dh,imx6dl-dhcom-picoitx
- enum:
- dh,imx6dl-dhcom-pdk2 # i.MX6DL DHCOM SoM on PDK2 board
- dh,imx6dl-dhcom-picoitx # i.MX6DL DHCOM SoM on PicoITX board
- const: dh,imx6dl-dhcom-som
- const: fsl,imx6dl

Expand Down Expand Up @@ -620,6 +624,14 @@ properties:
- kobo,librah2o
- const: fsl,imx6sll

- description: i.MX6SLL Kobo Clara 2e Rev. A/B
items:
- enum:
- kobo,clara2e-a
- kobo,clara2e-b
- const: kobo,clara2e
- const: fsl,imx6sll

- description: i.MX6SX based Boards
items:
- enum:
Expand Down Expand Up @@ -995,6 +1007,7 @@ properties:
- menlo,mx8menlo # Verdin iMX8M Mini Module on i.MX8MM Menlo board
- toradex,verdin-imx8mm-nonwifi-dahlia # Verdin iMX8M Mini Module on Dahlia
- toradex,verdin-imx8mm-nonwifi-dev # Verdin iMX8M Mini Module on Verdin Development Board
- toradex,verdin-imx8mm-nonwifi-ivy # Verdin iMX8M Mini Module on Ivy
- toradex,verdin-imx8mm-nonwifi-mallow # Verdin iMX8M Mini Module on Mallow
- toradex,verdin-imx8mm-nonwifi-yavia # Verdin iMX8M Mini Module on Yavia
- const: toradex,verdin-imx8mm-nonwifi # Verdin iMX8M Mini Module without Wi-Fi / BT
Expand All @@ -1006,6 +1019,7 @@ properties:
- enum:
- toradex,verdin-imx8mm-wifi-dahlia # Verdin iMX8M Mini Wi-Fi / BT Module on Dahlia
- toradex,verdin-imx8mm-wifi-dev # Verdin iMX8M Mini Wi-Fi / BT M. on Verdin Development B.
- toradex,verdin-imx8mm-wifi-ivy # Verdin iMX8M Mini Wi-Fi / BT Module on Ivy
- toradex,verdin-imx8mm-wifi-mallow # Verdin iMX8M Mini Wi-Fi / BT Module on Mallow
- toradex,verdin-imx8mm-wifi-yavia # Verdin iMX8M Mini Wi-Fi / BT Module on Yavia
- const: toradex,verdin-imx8mm-wifi # Verdin iMX8M Mini Wi-Fi / BT Module
Expand Down Expand Up @@ -1082,12 +1096,14 @@ properties:
- gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
- skov,imx8mp-skov-revb-lt6 # SKOV i.MX8MP climate control with 7” panel
- skov,imx8mp-skov-revb-mi1010ait-1cp1 # SKOV i.MX8MP climate control with 10.1" panel
- toradex,verdin-imx8mp # Verdin iMX8M Plus Modules
- toradex,verdin-imx8mp-nonwifi # Verdin iMX8M Plus Modules without Wi-Fi / BT
- toradex,verdin-imx8mp-wifi # Verdin iMX8M Plus Wi-Fi / BT Modules
- ysoft,imx8mp-iota2-lumpy # Y Soft i.MX8MP IOTA2 Lumpy Board
- const: fsl,imx8mp

- description: Avnet (MSC Branded) Boards with SM2S i.MX8M Plus Modules
Expand All @@ -1097,11 +1113,19 @@ properties:
- const: avnet,sm2s-imx8mp # SM2S-IMX8PLUS SoM
- const: fsl,imx8mp

- description: Boundary Device Nitrogen8MP Universal SMARC Carrier Board
items:
- const: boundary,imx8mp-nitrogen-smarc-universal-board
- const: boundary,imx8mp-nitrogen-smarc-som
- const: fsl,imx8mp

- description: i.MX8MP DHCOM based Boards
items:
- enum:
- dh,imx8mp-dhcom-drc02 # i.MX8MP DHCOM SoM on DRC02 board
- dh,imx8mp-dhcom-pdk2 # i.MX8MP DHCOM SoM on PDK2 board
- dh,imx8mp-dhcom-pdk3 # i.MX8MP DHCOM SoM on PDK3 board
- dh,imx8mp-dhcom-picoitx # i.MX8MP DHCOM SoM on PicoITX board
- const: dh,imx8mp-dhcom-som # i.MX8MP DHCOM SoM
- const: fsl,imx8mp

Expand All @@ -1112,6 +1136,19 @@ properties:
- const: engicam,icore-mx8mp # i.MX8MP Engicam i.Core MX8M Plus SoM
- const: fsl,imx8mp

- description: Kontron i.MX8MP OSM-S SoM based Boards
items:
- const: kontron,imx8mp-bl-osm-s # Kontron BL i.MX8MP OSM-S Board
- const: kontron,imx8mp-osm-s # Kontron i.MX8MP OSM-S SoM
- const: fsl,imx8mp

- description: Kontron i.MX8MP SMARC based Boards
items:
- const: kontron,imx8mp-smarc-eval-carrier # Kontron i.MX8MP SMARC Eval Carrier
- const: kontron,imx8mp-smarc # Kontron i.MX8MP SMARC Module
- const: kontron,imx8mp-osm-s # Kontron i.MX8MP OSM-S SoM
- const: fsl,imx8mp

- description: PHYTEC phyCORE-i.MX8MP SoM based boards
items:
- const: phytec,imx8mp-phyboard-pollux-rdk # phyBOARD-Pollux RDK
Expand All @@ -1137,6 +1174,7 @@ properties:
- enum:
- toradex,verdin-imx8mp-nonwifi-dahlia # Verdin iMX8M Plus Module on Dahlia
- toradex,verdin-imx8mp-nonwifi-dev # Verdin iMX8M Plus Module on Verdin Development Board
- toradex,verdin-imx8mp-nonwifi-ivy # Verdin iMX8M Plus Module on Ivy
- toradex,verdin-imx8mp-nonwifi-mallow # Verdin iMX8M Plus Module on Mallow
- toradex,verdin-imx8mp-nonwifi-yavia # Verdin iMX8M Plus Module on Yavia
- const: toradex,verdin-imx8mp-nonwifi # Verdin iMX8M Plus Module without Wi-Fi / BT
Expand All @@ -1148,6 +1186,7 @@ properties:
- enum:
- toradex,verdin-imx8mp-wifi-dahlia # Verdin iMX8M Plus Wi-Fi / BT Module on Dahlia
- toradex,verdin-imx8mp-wifi-dev # Verdin iMX8M Plus Wi-Fi / BT M. on Verdin Development B.
- toradex,verdin-imx8mp-wifi-ivy # Verdin iMX8M Plus Wi-Fi / BT Module on Ivy
- toradex,verdin-imx8mp-wifi-mallow # Verdin iMX8M Plus Wi-Fi / BT Module on Mallow
- toradex,verdin-imx8mp-wifi-yavia # Verdin iMX8M Plus Wi-Fi / BT Module on Yavia
- const: toradex,verdin-imx8mp-wifi # Verdin iMX8M Plus Wi-Fi / BT Module
Expand Down
28 changes: 28 additions & 0 deletions Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,34 @@ properties:
'#reset-cells':
const: 1

port:
$ref: /schemas/graph.yaml#/properties/port
description:
Output port node. This port connects the MMSYS/VDOSYS output to
the first component of one display pipeline, for example one of
the available OVL or RDMA blocks.
Some MediaTek SoCs support multiple display outputs per MMSYS.
properties:
endpoint@0:
$ref: /schemas/graph.yaml#/properties/endpoint
description: Output to the primary display pipeline

endpoint@1:
$ref: /schemas/graph.yaml#/properties/endpoint
description: Output to the secondary display pipeline

endpoint@2:
$ref: /schemas/graph.yaml#/properties/endpoint
description: Output to the tertiary display pipeline

anyOf:
- required:
- endpoint@0
- required:
- endpoint@1
- required:
- endpoint@2

required:
- compatible
- reg
Expand Down
Loading

0 comments on commit 9c39d5a

Please sign in to comment.