Skip to content

Commit

Permalink
Merge tag 'soc-dt-6.10' 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:
 "The updates this time are a bit smaller than most times, mainly
  because it is not totally dominated by new Qualcomm hardware support.

  Instead, we larger than average updates for Rockchips, NXP, Allwinner
  and TI. The only two new SoCs this time are both from NXP and are
  minor variants of already supported ones.

  The updates for aspeed, amlogic and mediatek came a little late, so
  I'm saving those for part 2 in a few days if everything turns out
  fine.

  New machines this time contain:

   - two Broadcom SoC based wireless routers from Asus

   - Five allwinner based consumer devices for gaming, set-top-box and
     eboot reader applications

   - Three older phones based on Qualcomm chips, plus the more recent
     Sony Xperia 1 V

   - 14 industrial and embedded boards based on NXP i.MX6, i.MX8,
     layerscape and s32g3 SoCs

   - six rockchips boards including another handheld game console and a
     few single-board computers

  On top of these, we have the usual cleanups for dtc warnings and
  updates to add more features to already merged machines"

* tag 'soc-dt-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (612 commits)
  arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
  arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells
  arm64: dts: marvell: eDPU: drop redundant address/size-cells
  arm64: dts: qcom: pm6150: correct USB VBUS regulator compatible
  arm64: dts: rockchip: add rk3588 pcie and php IOMMUs
  arm64: dts: rockchip: enable onboard spi flash for rock-3a
  arm64: dts: rockchip: add USB-C support to rk3588s-orangepi-5
  arm64: dts: rockchip: Enable GPU on Orange Pi 5
  arm64: dts: rockchip: enable GPU on khadas-edge2
  arm64: dts: rockchip: Add USB3 on Edgeble NCM6A-IO board
  arm64: dts: rockchip: Support poweroff on Edgeble Neural Compute Module
  arm64: dts: rockchip: Add Radxa ROCK 3C
  dt-bindings: arm: rockchip: add Radxa ROCK 3C
  arm64: dts: exynos: gs101: specify empty clocks for remaining pinctrl
  arm64: dts: exynos: gs101: specify bus clock for pinctrl_hsi2
  arm64: dts: exynos: gs101: specify bus clock for pinctrl_peric[01]
  arm64: dts: exynos: gs101: specify bus clock for pinctrl (far) alive
  arm64: dts: Add/fix /memory node unit-addresses
  arm64: dts: qcom: qcs404: fix bluetooth device address
  arm64: dts: qcom: sc8280xp-x13s: enable USB MP and fingerprint reader
  ...
  • Loading branch information
torvalds committed May 13, 2024
2 parents d65e1a0 + 0cb7e0c commit 6c60000
Show file tree
Hide file tree
Showing 565 changed files with 23,909 additions and 5,102 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ properties:
- description: BCM4709 based boards
items:
- enum:
- asus,rt-ac3200
- asus,rt-ac87u
- buffalo,wxr-1900dhp
- linksys,ea9200
Expand All @@ -67,6 +68,7 @@ properties:
items:
- enum:
- asus,rt-ac3100
- asus,rt-ac5300
- asus,rt-ac88u
- dlink,dir-885l
- dlink,dir-890l
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,30 @@ properties:
- compatible
- "#clock-cells"

gpio:
type: object
additionalProperties: false

properties:
compatible:
const: raspberrypi,firmware-gpio

gpio-controller: true

"#gpio-cells":
const: 2
description:
The first cell is the pin number, and the second cell is used to
specify the gpio polarity (GPIO_ACTIVE_HIGH or GPIO_ACTIVE_LOW).

gpio-line-names:
minItems: 8

required:
- compatible
- gpio-controller
- "#gpio-cells"

reset:
type: object
additionalProperties: false
Expand Down Expand Up @@ -96,6 +120,12 @@ examples:
#clock-cells = <1>;
};
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
#gpio-cells = <2>;
};
reset: reset {
compatible = "raspberrypi,firmware-reset";
#reset-cells = <1>;
Expand Down
22 changes: 19 additions & 3 deletions Documentation/devicetree/bindings/arm/fsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,14 @@ properties:
- const: tq,imx6ull-tqma6ull2l # MCIMX6Y2, LGA SoM variant
- const: fsl,imx6ull

- description: Seeed Stuido i.MX6ULL SoM on dev boards
items:
- enum:
- seeed,imx6ull-seeed-npi-emmc
- seeed,imx6ull-seeed-npi-nand
- const: seeed,imx6ull-seeed-npi
- const: fsl,imx6ull

- description: i.MX6ULZ based Boards
items:
- enum:
Expand Down Expand Up @@ -1050,6 +1058,7 @@ properties:
- enum:
- beacon,imx8mp-beacon-kit # i.MX8MP Beacon Development Kit
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
- emcraft,imx8mp-navqp # i.MX8MP Emcraft Systems NavQ+ Kit
- fsl,imx8mp-evk # i.MX8MP EVK Board
- gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
- gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
Expand Down Expand Up @@ -1218,7 +1227,6 @@ properties:
- enum:
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
- toradex,colibri-imx8x # Colibri iMX8X Modules
- const: fsl,imx8qxp

- description: i.MX8DXL based Boards
Expand All @@ -1227,15 +1235,17 @@ properties:
- fsl,imx8dxl-evk # i.MX8DXL EVK Board
- const: fsl,imx8dxl

- description: i.MX8QXP Boards with Toradex Colibri iMX8X Modules
- description: i.MX8QXP/i.MX8DX Boards with Toradex Colibri iMX8X Modules
items:
- enum:
- toradex,colibri-imx8x-aster # Colibri iMX8X Module on Aster Board
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
- toradex,colibri-imx8x-iris # Colibri iMX8X Module on Iris Board
- toradex,colibri-imx8x-iris-v2 # Colibri iMX8X Module on Iris Board V2
- const: toradex,colibri-imx8x
- const: fsl,imx8qxp
- enum:
- fsl,imx8qxp
- fsl,imx8dx

- description:
TQMa8Xx is a series of SOM featuring NXP i.MX8X system-on-chip
Expand Down Expand Up @@ -1536,6 +1546,12 @@ properties:
- nxp,s32g274a-rdb2
- const: nxp,s32g2

- description: S32G3 based Boards
items:
- enum:
- nxp,s32g399a-rdb3
- const: nxp,s32g3

- description: S32V234 based Boards
items:
- enum:
Expand Down
5 changes: 0 additions & 5 deletions Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ properties:
mboxes:
minItems: 2

ti,system-reboot-controller:
description: Determines If system reboot can be triggered by SoC reboot
type: boolean

ti,host-id:
$ref: /schemas/types.yaml#/definitions/uint32
description: |
Expand Down Expand Up @@ -94,7 +90,6 @@ examples:
- |
pmmc: system-controller@2921800 {
compatible = "ti,k2g-sci";
ti,system-reboot-controller;
mbox-names = "rx", "tx";
mboxes = <&msgmgr 5 2>,
<&msgmgr 0 0>;
Expand Down
18 changes: 10 additions & 8 deletions Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ properties:
- microsoft,dempsey
- microsoft,makepeace
- microsoft,moneypenny
- motorola,falcon
- samsung,s3ve3g
- const: qcom,msm8226

Expand Down Expand Up @@ -184,13 +185,16 @@ properties:
- oneplus,bacon
- samsung,klte
- sony,xperia-castor
- sony,xperia-leo
- const: qcom,msm8974pro
- const: qcom,msm8974

- items:
- const: qcom,msm8916-mtp
- const: qcom,msm8916-mtp/1
- const: qcom,msm8916
- enum:
- samsung,kltechn
- const: samsung,klte
- const: qcom,msm8974pro
- const: qcom,msm8974

- items:
- enum:
Expand All @@ -200,6 +204,8 @@ properties:
- gplus,fl8005a
- huawei,g7
- longcheer,l8910
- longcheer,l8150
- qcom,msm8916-mtp
- samsung,a3u-eur
- samsung,a5u-eur
- samsung,e5
Expand All @@ -220,11 +226,6 @@ properties:
- yiming,uz801-v3
- const: qcom,msm8916

- items:
- const: longcheer,l8150
- const: qcom,msm8916-v1-qrd/9-v1
- const: qcom,msm8916

- items:
- enum:
- motorola,potter
Expand Down Expand Up @@ -1003,6 +1004,7 @@ properties:
- qcom,sm8550-hdk
- qcom,sm8550-mtp
- qcom,sm8550-qrd
- sony,pdx234
- const: qcom,sm8550

- items:
Expand Down
48 changes: 40 additions & 8 deletions Documentation/devicetree/bindings/arm/rockchip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ properties:
- anbernic,rg-arc-s
- const: rockchip,rk3566

- description: ArmSoM Sige7 board
items:
- const: armsom,sige7
- const: rockchip,rk3588

- description: Asus Tinker board
items:
- const: asus,rk3288-tinker
Expand Down Expand Up @@ -198,6 +203,13 @@ properties:
- const: firefly,rk3568-roc-pc
- const: rockchip,rk3568

- description: Forlinx FET3588-C SoM
items:
- enum:
- forlinx,ok3588-c
- const: forlinx,fet3588-c
- const: rockchip,rk3588

- description: FriendlyElec NanoPi R2 series boards
items:
- enum:
Expand Down Expand Up @@ -236,6 +248,11 @@ properties:
- const: friendlyarm,nanopc-t6
- const: rockchip,rk3588

- description: GameForce Chi
items:
- const: gameforce,chi
- const: rockchip,rk3326

- description: GeekBuying GeekBox
items:
- const: geekbuying,geekbox
Expand Down Expand Up @@ -631,7 +648,7 @@ properties:
- const: phytec,rk3288-phycore-som
- const: rockchip,rk3288

- description: Pine64 PinebookPro
- description: Pine64 Pinebook Pro
items:
- const: pine64,pinebook-pro
- const: rockchip,rk3399
Expand All @@ -644,7 +661,7 @@ properties:
- const: pine64,pinenote
- const: rockchip,rk3566

- description: Pine64 PinePhonePro
- description: Pine64 PinePhone Pro
items:
- const: pine64,pinephone-pro
- const: rockchip,rk3399
Expand Down Expand Up @@ -682,7 +699,7 @@ properties:
- const: pine64,quartzpro64
- const: rockchip,rk3588

- description: Pine64 SoQuartz SoM
- description: Pine64 SOQuartz
items:
- enum:
- pine64,soquartz-blade
Expand All @@ -700,12 +717,17 @@ properties:
- powkiddy,x55
- const: rockchip,rk3566

- description: Protonic MECSBC board
items:
- const: prt,mecsbc
- const: rockchip,rk3568

- description: QNAP TS-433-4G 4-Bay NAS
items:
- const: qnap,ts433
- const: rockchip,rk3568

- description: Radxa Compute Module 3(CM3)
- description: Radxa Compute Module 3 (CM3)
items:
- enum:
- radxa,cm3-io
Expand Down Expand Up @@ -767,22 +789,27 @@ properties:
- const: radxa,rockpis
- const: rockchip,rk3308

- description: Radxa Rock2 Square
- description: Radxa Rock 2 Square
items:
- const: radxa,rock2-square
- const: rockchip,rk3288

- description: Radxa ROCK3 Model A
- description: Radxa ROCK 3A
items:
- const: radxa,rock3a
- const: rockchip,rk3568

- description: Radxa ROCK 5 Model A
- description: Radxa ROCK 3C
items:
- const: radxa,rock-3c
- const: rockchip,rk3566

- description: Radxa ROCK 5A
items:
- const: radxa,rock-5a
- const: rockchip,rk3588s

- description: Radxa ROCK 5 Model B
- description: Radxa ROCK 5B
items:
- const: radxa,rock-5b
- const: rockchip,rk3588
Expand Down Expand Up @@ -927,6 +954,11 @@ properties:
- const: turing,rk1
- const: rockchip,rk3588

- description: WolfVision PF5 mainboard
items:
- const: wolfvision,rk3568-pf5
- const: rockchip,rk3568

- description: Xunlong Orange Pi 5 Plus
items:
- const: xunlong,orangepi-5-plus
Expand Down
25 changes: 25 additions & 0 deletions Documentation/devicetree/bindings/arm/sunxi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,21 @@ properties:
- const: anbernic,rg-nano
- const: allwinner,sun8i-v3s

- description: Anbernic RG35XX (2024)
- items:
- const: anbernic,rg35xx-2024
- const: allwinner,sun50i-h700

- description: Anbernic RG35XX Plus
- items:
- const: anbernic,rg35xx-plus
- const: allwinner,sun50i-h700

- description: Anbernic RG35XX H
- items:
- const: anbernic,rg35xx-h
- const: allwinner,sun50i-h700

- description: Amarula A64 Relic
items:
- const: amarula,a64-relic
Expand Down Expand Up @@ -774,6 +789,11 @@ properties:
- const: pocketbook,touch-lux-3
- const: allwinner,sun5i-a13

- description: PocketBook 614 Plus
items:
- const: pocketbook,614-plus
- const: allwinner,sun5i-a13

- description: Point of View Protab2-IPS9
items:
- const: pov,protab2-ips9
Expand Down Expand Up @@ -860,6 +880,11 @@ properties:
- const: allwinner,sl631
- const: allwinner,sun8i-v3

- description: Tanix TX1
items:
- const: oranth,tanix-tx1
- const: allwinner,sun50i-h616

- description: Tanix TX6
items:
- const: oranth,tanix-tx6
Expand Down
Loading

0 comments on commit 6c60000

Please sign in to comment.