Skip to content

Commit

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

Pull ARM SoC devicetree updates from Arnd Bergmann:
 "The biggest change this time is for the 32-bit devicetree files, which
  are all moved to a new location, using separate subdirectories for
  each SoC vendor, following the same scheme that is used on arm64, mips
  and riscv. This has been discussed for many years, but so far we never
  did this as there was a plan to move the files out of the kernel
  entirely, which has never happened.

  The impact of this will be that all external patches no longer apply,
  and anything depending on the location of the dtb files in the build
  directory will have to change. The installed files after 'make
  dtbs_install' keep the current location.

  There are six added SoCs here that are largely variants of previously
  added chips. Two other chips are added in a separate branch along with
  their device drivers.

   - The Samsung Exynos 4212 makes its return after the Samsung Galaxy
     Express phone is addded at last. The SoC support was originally
     added in 2012 but removed again in 2017 as it was unused at the
     time.

   - Amlogic C3 is a Cortex-A35 based smart IP camera chip

   - Qualcomm MSM8939 (Snapdragon 615) is a more featureful variant of
     the still common MSM8916 (Snapdragon 410) phone chip that has been
     supported for a long time.

   - Qualcomm SC8180x (Snapdragon 8cx) is one of their earlier high-end
     laptop chips, used in the Lenovo Flex 5G, which is added along with
     the reference board.

   - Qualcomm SDX75 is the latest generation modem chip that is used as
     a peripherial in phones but can also run a standalone Linux. Unlike
     the prior 32-bit SDX65 and SDX55, this now has a 64-bit Cortex-A55.

   - Alibaba T-Head TH1520 is a quad-core RISC-V chip based on the
     Xuantie C910 core, a step up from all previously added rv64 chips.

  All of the above come with reference board implementations, those
  included there are 39 new board files, but only five more 32-bit this
  time, probably a new low:

   - Marantec Maveo board based on dhcor imx6ull module

   - Endian 4i Edge 200, based on the armv5 Marvell Kirkwood chip

   - Epson Moverio BT-200 AR glasses based on TI OMAP4

   - PHYTEC STM32MP1-3 Dev board based on STM32MP15 PHYTEC SOM

   - ICnova ADB4006 board based on Allwinner A20

  On the 64-bit side, there are also fewer addded machines than we had
  in the recent releases:

   - Three boards based on NXP i.MX8: Emtop SoM & Baseboard, NXP i.MX8MM
     EVKB board and i.MX8MP based Gateworks Venice gw7905-2x device.

   - NVIDIA IGX Orin and Jetson Orin Nano boards, both based on tegra234

   - Qualcomm gains support for 6 reference boards on various members of
     their IPQ networking SoC series, as well as the Sony Xperia M4 Aqua
     phone, the Acer Aspire 1 laptop, and the Fxtec Pro1X board on top
     of the various reference platforms for their new chips.

   - Rockchips support for several newer boards: Indiedroid Nova
     (rk3588), Edgeble Neural Compute Module 6B (rk3588), FriendlyARM
     NanoPi R2C Plus (rk3328), Anbernic RG353PS (rk3566), Lunzn
     Fastrhino R66S/R68S (rk3568)

   - TI K3/AM625 based PHYTEC phyBOARD-Lyra-AM625 board and Toradex
     Verdin family with AM62 COM, carrier and dev boards

  Other changes to existing boards contain the usual minor improvements
  along with

   - continued updates to clean up dts files based on dtc warnings and
     binding checks, in particular cache properties and node names

   - support for devicetree overlays on at91, bcm283x

   - significant additions to existing SoC support on mediatek,
     qualcomm, ti k3 family, starfive jh71xx, NXP i.MX6 and i.MX8, ST
     STM32MP1

  As usual, a lot more detail is available in the individual merge
  commits"

* tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (926 commits)
  ARM: mvebu: fix unit address on armada-390-db flash
  ARM: dts: Move .dts files to vendor sub-directories
  kbuild: Support flat DTBs install
  ARM: dts: Add .dts files missing from the build
  ARM: dts: allwinner: Use quoted #include
  ARM: dts: lan966x: kontron-d10: add PHY interrupts
  ARM: dts: lan966x: kontron-d10: fix SPI CS
  ARM: dts: lan966x: kontron-d10: fix board reset
  ARM: dts: at91: Enable device-tree overlay support for AT91 boards
  arm: dts: Enable device-tree overlay support for AT91 boards
  arm64: dts: exynos: Remove clock from Exynos850 pmu_system_controller
  ARM: dts: at91: use generic name for shutdown controller
  ARM: dts: BCM5301X: Add cells sizes to PCIe nodes
  dt-bindings: firmware: brcm,kona-smc: convert to YAML
  riscv: dts: sort makefile entries by directory
  riscv: defconfig: enable T-HEAD SoC
  MAINTAINERS: add entry for T-HEAD RISC-V SoC
  riscv: dts: thead: add sipeed Lichee Pi 4A board device tree
  riscv: dts: add initial T-HEAD TH1520 SoC device tree
  riscv: Add the T-HEAD SoC family Kconfig option
  ...
  • Loading branch information
@torvalds
torvalds committed Jun 29, 2023
2 parents b775d6c + 46448b3 commit 6c1561f
Show file tree
Hide file tree
Showing 3,186 changed files with 49,206 additions and 9,705 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 8 additions & 1 deletion Documentation/devicetree/bindings/arm/amlogic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/amlogic.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Amlogic MesonX
title: Amlogic SoC based Platforms

maintainers:
- Kevin Hilman <khilman@baylibre.com>
Expand Down Expand Up @@ -205,6 +205,13 @@ properties:
- amlogic,ad401
- const: amlogic,a1

- description: Boards with the Amlogic C3 C302X/C308L SoC
items:
- enum:
- amlogic,aw409
- amlogic,aw419
- const: amlogic,c3

- description: Boards with the Amlogic Meson S4 S805X2 SoC
items:
- enum:
Expand Down
14 changes: 8 additions & 6 deletions Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ properties:
- enum:
- asus,rt-ac56u
- asus,rt-ac68u
- buffalo,wzr-1166dhp
- buffalo,wzr-1166dhp2
- buffalo,wzr-1750dhp
- linksys,ea6300-v1
- linksys,ea6500-v2
- luxul,xap-1510v1
- luxul,xap-1510-v1
- luxul,xwc-1000
- netgear,r6250v1
- netgear,r6300v2
- netgear,r6250-v1
- netgear,r6300-v2
- smartrg,sr400ac
- brcm,bcm94708
- const: brcm,bcm4708
Expand All @@ -42,8 +44,8 @@ properties:
- asus,rt-n18u
- buffalo,wzr-600dhp2
- buffalo,wzr-900dhp
- luxul,xap-1410v1
- luxul,xwr-1200v1
- luxul,xap-1410-v1
- luxul,xwr-1200-v1
- tplink,archer-c5-v2
- const: brcm,bcm47081
- const: brcm,bcm4708
Expand Down Expand Up @@ -72,7 +74,7 @@ properties:
- luxul,xap-1610-v1
- luxul,xbr-4500-v1
- luxul,xwc-2000-v1
- luxul,xwr-3100v1
- luxul,xwr-3100-v1
- luxul,xwr-3150-v1
- netgear,r8500
- phicomm,k3
Expand Down
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/arm/fsl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,12 @@ properties:
- const: dh,imx6ull-dhcor-som
- const: fsl,imx6ull

- description: i.MX6ULL DHCOR SoM based Boards
items:
- const: marantec,imx6ull-dhcor-maveo-box
- const: dh,imx6ull-dhcor-som
- const: fsl,imx6ull

- description: i.MX6ULL PHYTEC phyBOARD-Segin
items:
- enum:
Expand Down Expand Up @@ -901,6 +907,7 @@ properties:
- emtrion,emcon-mx8mm-avari # emCON-MX8MM SoM on Avari Base
- fsl,imx8mm-ddr4-evk # i.MX8MM DDR4 EVK Board
- fsl,imx8mm-evk # i.MX8MM EVK Board
- fsl,imx8mm-evkb # i.MX8MM EVKB Board
- gateworks,imx8mm-gw7904
- gw,imx8mm-gw71xx-0x # i.MX8MM Gateworks Development Kit
- gw,imx8mm-gw72xx-0x # i.MX8MM Gateworks Development Kit
Expand All @@ -918,6 +925,12 @@ properties:
- prt,prt8mm # i.MX8MM Protonic PRT8MM Board
- const: fsl,imx8mm

- description: Emtop i.MX8MM based Boards
items:
- const: ees,imx8mm-emtop-baseboard # i.MX8MM Emtop SoM on i.MX8M Mini Baseboard V1
- const: ees,imx8mm-emtop-som # i.MX8MM Emtop SOM-IMX8MMLPD4 module
- const: fsl,imx8mm

- description: Engicam i.Core MX8M Mini SoM based boards
items:
- enum:
Expand Down Expand Up @@ -1019,6 +1032,7 @@ properties:
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
- fsl,imx8mp-evk # i.MX8MP EVK Board
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
- gateworks,imx8mp-gw7905-2x # i.MX8MP Gateworks Board
- polyhex,imx8mp-debix # Polyhex Debix boards
- polyhex,imx8mp-debix-model-a # Polyhex Debix Model A Board
- toradex,verdin-imx8mp # Verdin iMX8M Plus Modules
Expand Down
30 changes: 28 additions & 2 deletions Documentation/devicetree/bindings/arm/qcom.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ description: |
msm8939
msm8953
msm8956
msm8960
msm8974
msm8976
msm8992
Expand Down Expand Up @@ -69,6 +70,7 @@ description: |
sdm845
sdx55
sdx65
sdx75
sm4250
sm6115
sm6115p
Expand All @@ -85,9 +87,15 @@ description: |
The 'board' element must be one of the following strings:
adp
ap-al02-c2
ap-al02-c6
ap-al02-c7
ap-al02-c8
ap-al02-c9
ap-mi01.2
ap-mi01.3
ap-mi01.6
ap-mi01.9
cdp
cp01-c1
dragonboard
Expand Down Expand Up @@ -191,6 +199,7 @@ properties:
- items:
- enum:
- qcom,msm8960-cdp
- samsung,expressatt
- const: qcom,msm8960

- items:
Expand Down Expand Up @@ -333,7 +342,9 @@ properties:
- items:
- enum:
- qcom,ipq5332-ap-mi01.2
- qcom,ipq5332-ap-mi01.3
- qcom,ipq5332-ap-mi01.6
- qcom,ipq5332-ap-mi01.9
- const: qcom,ipq5332

- items:
Expand All @@ -351,7 +362,11 @@ properties:

- items:
- enum:
- qcom,ipq9574-ap-al02-c2
- qcom,ipq9574-ap-al02-c6
- qcom,ipq9574-ap-al02-c7
- qcom,ipq9574-ap-al02-c8
- qcom,ipq9574-ap-al02-c9
- const: qcom,ipq9574

- description: Sierra Wireless MangOH Green with WP8548 Module
Expand Down Expand Up @@ -380,9 +395,9 @@ properties:
- qcom,qru1000-idp
- const: qcom,qru1000

- description: Qualcomm Technologies, Inc. SC7180 IDP
items:
- items:
- enum:
- acer,aspire1
- qcom,sc7180-idp
- const: qcom,sc7180

Expand Down Expand Up @@ -819,6 +834,11 @@ properties:
- qcom,sdx65-mtp
- const: qcom,sdx65

- items:
- enum:
- qcom,sdx75-idp
- const: qcom,sdx75

- items:
- enum:
- qcom,ipq6018-cp01
Expand Down Expand Up @@ -882,6 +902,11 @@ properties:
- const: qcom,qrb4210
- const: qcom,sm4250

- items:
- enum:
- fxtec,pro1x
- const: qcom,sm6115

- items:
- enum:
- lenovo,j606f
Expand Down Expand Up @@ -1042,6 +1067,7 @@ allOf:
- qcom,sdm845
- qcom,sdx55
- qcom,sdx65
- qcom,sdx75
- qcom,sm4250
- qcom,sm6115
- qcom,sm6125
Expand Down
24 changes: 24 additions & 0 deletions Documentation/devicetree/bindings/arm/rockchip.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ properties:
- const: anbernic,rg353p
- const: rockchip,rk3566

- description: Anbernic RG353PS
items:
- const: anbernic,rg353ps
- const: rockchip,rk3566

- description: Anbernic RG353V
items:
- const: anbernic,rg353v
Expand Down Expand Up @@ -102,6 +107,12 @@ properties:
- const: edgeble,neural-compute-module-6a # Edgeble Neural Compute Module 6A SoM
- const: rockchip,rk3588

- description: Edgeble Neural Compute Module 6(Neu6) Model B SoM based boards
items:
- const: edgeble,neural-compute-module-6b-io # Edgeble Neural Compute Module 6B IO Board
- const: edgeble,neural-compute-module-6b # Edgeble Neural Compute Module 6B SoM
- const: rockchip,rk3588

- description: Elgin RV1108 R1
items:
- const: elgin,rv1108-r1
Expand Down Expand Up @@ -189,6 +200,7 @@ properties:
items:
- enum:
- friendlyarm,nanopi-r2c
- friendlyarm,nanopi-r2c-plus
- friendlyarm,nanopi-r2s
- const: rockchip,rk3328

Expand Down Expand Up @@ -534,6 +546,11 @@ properties:
- const: hugsun,x99
- const: rockchip,rk3399

- description: Indiedroid Nova SBC
items:
- const: indiedroid,nova
- const: rockchip,rk3588s

- description: Khadas Edge series boards
items:
- enum:
Expand Down Expand Up @@ -562,6 +579,13 @@ properties:
- const: leez,p710
- const: rockchip,rk3399

- description: Lunzn FastRhino R66S / R68S
items:
- enum:
- lunzn,fastrhino-r66s
- lunzn,fastrhino-r68s
- const: rockchip,rk3568

- description: mqmaker MiQi
items:
- const: mqmaker,miqi
Expand Down
10 changes: 10 additions & 0 deletions Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ properties:
- const: samsung,exynos4210
- const: samsung,exynos4

- description: Samsung Galaxy Tab3 family boards
items:
- enum:
- samsung,t310 # Samsung Galaxy Tab 3 8.0 WiFi (SM-T310)
- samsung,t311 # Samsung Galaxy Tab 3 8.0 3G (SM-T311)
- samsung,t315 # Samsung Galaxy Tab 3 8.0 LTE (SM-T315)
- const: samsung,tab3
- const: samsung,exynos4212
- const: samsung,exynos4

- description: Exynos4412 based boards
items:
- enum:
Expand Down
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/arm/stm32/stm32.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ properties:
- const: seeed,stm32mp157c-odyssey-som
- const: st,stm32mp157

- description: Phytec STM32MP1 SoM based Boards
items:
- const: phytec,phycore-stm32mp1-3
- const: phytec,phycore-stm32mp157c-som
- const: st,stm32mp157

additionalProperties: true

...
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/arm/sunxi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,12 @@ properties:
- const: allwinner,i12-tvbox
- const: allwinner,sun7i-a20

- description: ICnova A20 ADB4006
items:
- const: incircuit,icnova-a20-adb4006
- const: incircuit,icnova-a20
- const: allwinner,sun7i-a20

- description: ICNova A20 SWAC
items:
- const: incircuit,icnova-a20-swac
Expand Down
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/arm/tegra.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ properties:
- const: nvidia,p3737-0000+p3701-0000
- const: nvidia,p3701-0000
- const: nvidia,tegra234
- description: NVIDIA IGX Orin Development Kit
items:
- const: nvidia,p3740-0002+p3701-0008
- const: nvidia,p3701-0008
- const: nvidia,tegra234
- description: Jetson Orin NX
items:
- const: nvidia,p3767-0000
Expand All @@ -176,5 +181,14 @@ properties:
- const: nvidia,p3768-0000+p3767-0000
- const: nvidia,p3767-0000
- const: nvidia,tegra234
- description: Jetson Orin Nano
items:
- const: nvidia,p3767-0005
- const: nvidia,tegra234
- description: Jetson Orin Nano Developer Kit
items:
- const: nvidia,p3768-0000+p3767-0005
- const: nvidia,p3767-0005
- const: nvidia,tegra234

additionalProperties: true
26 changes: 26 additions & 0 deletions Documentation/devicetree/bindings/arm/ti/k3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ properties:
- ti,am62a7-sk
- const: ti,am62a7

- description: K3 AM625 SoC PHYTEC phyBOARD-Lyra
items:
- const: phytec,am625-phyboard-lyra-rdk
- const: phytec,am62-phycore-som
- const: ti,am625

- description: K3 AM625 SoC
items:
- enum:
Expand All @@ -33,6 +39,26 @@ properties:
- ti,am62-lp-sk
- const: ti,am625

- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards
items:
- enum:
- toradex,verdin-am62-nonwifi-dahlia # Verdin AM62 Module on Dahlia
- toradex,verdin-am62-nonwifi-dev # Verdin AM62 Module on Verdin Development Board
- toradex,verdin-am62-nonwifi-yavia # Verdin AM62 Module on Yavia
- const: toradex,verdin-am62-nonwifi # Verdin AM62 Module without Wi-Fi / BT
- const: toradex,verdin-am62 # Verdin AM62 Module
- const: ti,am625

- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards with Wi-Fi / BT
items:
- enum:
- toradex,verdin-am62-wifi-dahlia # Verdin AM62 Wi-Fi / BT Module on Dahlia
- toradex,verdin-am62-wifi-dev # Verdin AM62 Wi-Fi / BT M. on Verdin Development B.
- toradex,verdin-am62-wifi-yavia # Verdin AM62 Wi-Fi / BT Module on Yavia
- const: toradex,verdin-am62-wifi # Verdin AM62 Wi-Fi / BT Module
- const: toradex,verdin-am62 # Verdin AM62 Module
- const: ti,am625

- description: K3 AM642 SoC
items:
- enum:
Expand Down
Loading

0 comments on commit 6c1561f

Please sign in to comment.