]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'soc-dt-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Nov 2024 23:26:46 +0000 (15:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Nov 2024 23:26:46 +0000 (15:26 -0800)
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
  ...

39 files changed:
1  2 
arch/arm/boot/dts/rockchip/rk3036-kylin.dts
arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts
arch/arm64/boot/dts/freescale/imx8mp.dtsi
arch/arm64/boot/dts/freescale/imx8ulp.dtsi
arch/arm64/boot/dts/qcom/msm8939.dtsi
arch/arm64/boot/dts/qcom/sm8450.dtsi
arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
arch/arm64/boot/dts/qcom/x1e80100.dtsi
arch/arm64/boot/dts/renesas/r9a09g057.dtsi
arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
arch/arm64/boot/dts/rockchip/rk3328.dtsi
arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
arch/riscv/boot/dts/starfive/jh7110-common.dtsi
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts

Simple merge
Simple merge
index fb4a48a1e2a8a5f3a8ca8a265f7333a3c6a520bb,ca1ced82d513da67ad8212cbbba76cf4a2d6be39..8515c254e15868a5d7f378b0dc0bf8f339fc7b19
  
                pinctrl-0 = <&nvme_reg_en>;
                pinctrl-names = "default";
 +
 +              regulator-boot-on;
        };
+       vph_pwr: regulator-vph-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "vph_pwr";
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
  };
  
  &apps_rsc {
index c6e0356ed9a2a209859556413d50d6408121ad30,c14c60eafba92e21296da9099e90eec40b63e1ae..39f9d9cdc10d8e79824b72288e2529536144fa9e
  
                pinctrl-names = "default";
                pinctrl-0 = <&nvme_reg_en>;
 +
 +              regulator-boot-on;
        };
  
+       vph_pwr: regulator-vph-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "vph_pwr";
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
        vreg_wwan: regulator-wwan {
                compatible = "regulator-fixed";
  
index 0cdaff9c8cf0fce8616fbeeeb153913a726b5b5f,10f3ef76eef21e13613e1844f69fda9b1f00b417..ca5a808f2c7df66a861a933df407fd4bdaea3fe1
  
                pinctrl-0 = <&nvme_reg_en>;
                pinctrl-names = "default";
 +
 +              regulator-boot-on;
        };
+       vph_pwr: regulator-vph-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "vph_pwr";
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
  };
  
  &apps_rsc {
index cdb401767c4206f8c8a615785e707195bc467082,0e58b15e297a93b77a070ae14868376da145910d..6835fdeef3aec10206e8b2839d23e4f3494afe1e
  
                pinctrl-0 = <&nvme_reg_en>;
                pinctrl-names = "default";
 +
 +              regulator-boot-on;
        };
+       vph_pwr: regulator-vph-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "vph_pwr";
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
  };
  
  &apps_rsc {
index 0510abc0edf0ffa5766430e550a64bd2e18873d2,c4814567bb9c772bfc5e58eabd49eef3cccc897a..88805629ed2bf052ea6ec152794066217489cf52
                        dma-coherent;
  
                        linux,pci-domain = <6>;
 -                      num-lanes = <2>;
 +                      num-lanes = <4>;
  
+                       msi-map = <0x0 &gic_its 0xe0000 0x10000>;
                        interrupts = <GIC_SPI 773 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 774 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 837 IRQ_TYPE_LEVEL_HIGH>,
index 4b9ced67742d26e569a5d7e8257b68dc925ba2d6,8ae9b755081665fd691b79c8176ba5fb9dd29847..f72b1518c14f876714c612286db0a79e87aa2bbe
        disable-wp;
        mmc-hs200-1_8v;
        non-removable;
 -      num-slots = <1>;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
 -      supports-emmc;
        status = "okay";
  };
+ &gmac2io {
+       phy-handle = <&rtl8211e>;
+       tx_delay = <0x24>;
+       rx_delay = <0x18>;
+       mdio {
+               rtl8211e: ethernet-phy@1 {
+                       reg = <1>;
+                       pinctrl-0 = <&eth_phy_reset_pin>;
+                       pinctrl-names = "default";
+                       reset-assert-us = <10000>;
+                       reset-deassert-us = <50000>;
+                       reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+               };
+       };
+ };