github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

A number of cleanups for older socs.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmkbm2sQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgUr4CACgfO9JDXRkWBWLaWGtyIJug0L+7uvKF5hT
 Uw8S0olVPEEVQJk121YEfkYGDdTremJRn4C1LgdtWa095ab+F1JxsT/QhpeVhKqz
 +34kRi+gbeRnfadRLyAipdL7VMq+UGzk6Rwncfx4j+VRtyOyIxijMo7X+Hc3ozAa
 iJmAumRZwt8rlA2dboZrB98c2VKyjd12SL/aDU63fLxlXLaL1f0AK3HxTYInPKyY
 R8Y0cC5rs79LtJJJYUVG6IvIQ30M6eEx/E3g8XIj5dhN/T4MJzwkd5zz9Gorn21v
 r52xZ9EggWNKmEs775ueAyKDByxjXYz9qPfkenq2BuVs25itCSaM
 =74JM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmkgwq8ACgkQmmx57+YA
 GNlagg//ZXMHeVPKTJFsTTEIt2TvOLvZtmolbrengGeGXdie346+m/sDwj59y3fb
 Th6WYdIzCO4/RTFI6h1BLoYh3vSX8CDiliXyrQSCqCT14sX2j2nOhGFGA4u9qXU3
 oa618sKQko27C7A8DSccBE12KS6r5KnlIXcAoKWIKasRbs6D7HAgjJpubwReQPd/
 IZP2kv3MAJZsB4nWzremymR/c7JSB2pu0nFFtzMWYgQhARiJ6BPTYJXAwllrDmFM
 KN8ejG5l2ZLT811hrLqK4mxl5Xjrnok/qohkkGuBj3+wmQM7wrCD2iuFDeV4maJ+
 tDmT8hiYJaPPsO/obVUVtllbjQLkKWoNsiLqj08iLiFB932IdGw95ojh5wcfN50m
 Nm+AuCPC9bQFjV81E4bhMXTGp4KOxX1v/HTAjFlAeCRiK9+rtpUhFsQY8cft77mX
 5mgcV/UsipEL1aYR403C8U3I5Dz0UAYfZZHOyijWNzfFK8QkqgFEnx2zcTghur2i
 zG5+gbiKegL8Uc2cOCaMTrOWulclH6NvEC8B/onb+hLHQPiv8gABhTR+CchSxiEy
 X1zrnb1mjX8P++1RalBleTZkl94pKdAmw6Twia+6XkMVulqPhK9nqMaSt9+u74Ip
 YJHJmgAxvoYbmjk/j4kFlvqFiGsnQarOOXQgl7x/tnM0D26PjMY=
 =fnJJ
 -----END PGP SIGNATURE-----

Merge tag 'v6.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

A number of cleanups for older socs.

* tag 'v6.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: move edp assigned-clocks to edp node on rk3288
  ARM: dts: rockchip: Add spi_flash label to rk3288-veyron
  ARM: dts: rockchip: Remove mshc aliases from RK3288
  ARM: dts: rockchip: Adapt tps65910 nodes on RK3066 boards

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-11-21 20:50:57 +01:00
commit d7eebe1098
5 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
View File

@ -80,26 +80,33 @@ &i2c1 {
clock-frequency = <400000>;
tps: tps@2d {
compatible = "ti,tps65910";
reg = <0x2d>;
gpio-controller;
#gpio-cells = <2>;
interrupt-parent = <&gpio6>;
interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
vcc5-supply = <&vcc_io>;
vcc6-supply = <&vcc_io>;
regulators {
vcc_rtc: regulator@0 {
vcc_rtc: vrtc {
regulator-name = "vcc_rtc";
regulator-always-on;
};
vcc_io: regulator@1 {
vcc_io: vio {
regulator-name = "vcc_io";
regulator-always-on;
};
vdd_arm: regulator@2 {
vdd_arm: vdd1 {
regulator-name = "vdd_arm";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -107,7 +114,7 @@ vdd_arm: regulator@2 {
regulator-always-on;
};
vcc_ddr: regulator@3 {
vcc_ddr: vdd2 {
regulator-name = "vcc_ddr";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -115,42 +122,42 @@ vcc_ddr: regulator@3 {
regulator-always-on;
};
vcc18_cif: regulator@5 {
vcc18_cif: vdig1 {
regulator-name = "vcc18_cif";
regulator-always-on;
};
vdd_11: regulator@6 {
vdd_11: vdig2 {
regulator-name = "vdd_11";
regulator-always-on;
};
vcc_25: regulator@7 {
vcc_25: vpll {
regulator-name = "vcc_25";
regulator-always-on;
};
vcc_18: regulator@8 {
vcc_18: vdac {
regulator-name = "vcc_18";
regulator-always-on;
};
vcc25_hdmi: regulator@9 {
vcc25_hdmi: vaux1 {
regulator-name = "vcc25_hdmi";
regulator-always-on;
};
vcca_33: regulator@10 {
vcca_33: vaux2 {
regulator-name = "vcca_33";
regulator-always-on;
};
vcc_tp: regulator@11 {
vcc_tp: vaux33 {
regulator-name = "vcc_tp";
regulator-always-on;
};
vcc28_cif: regulator@12 {
vcc28_cif: vmmc {
regulator-name = "vcc28_cif";
regulator-always-on;
};
@ -158,9 +165,6 @@ vcc28_cif: regulator@12 {
};
};
/* must be included after &tps gets defined */
#include "../tps65910.dtsi"
&mmc0 { /* sdmmc */
status = "okay";
pinctrl-names = "default";

34
arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
View File

@ -96,11 +96,18 @@ &i2c1 {
clock-frequency = <400000>;
tps: tps@2d {
compatible = "ti,tps65910";
reg = <0x2d>;
gpio-controller;
#gpio-cells = <2>;
interrupt-parent = <&gpio6>;
interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
vcc1-supply = <&vsys>;
vcc2-supply = <&vsys>;
vcc3-supply = <&vsys>;
@ -111,17 +118,17 @@ tps: tps@2d {
vccio-supply = <&vsys>;
regulators {
vcc_rtc: regulator@0 {
vcc_rtc: vrtc {
regulator-name = "vcc_rtc";
regulator-always-on;
};
vcc_io: regulator@1 {
vcc_io: vio {
regulator-name = "vcc_io";
regulator-always-on;
};
vdd_arm: regulator@2 {
vdd_arm: vdd1 {
regulator-name = "vdd_arm";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -129,7 +136,7 @@ vdd_arm: regulator@2 {
regulator-always-on;
};
vcc_ddr: regulator@3 {
vcc_ddr: vdd2 {
regulator-name = "vcc_ddr";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -137,41 +144,41 @@ vcc_ddr: regulator@3 {
regulator-always-on;
};
vcc18_cif: regulator@5 {
vcc18_cif: vdig1 {
regulator-name = "vcc18_cif";
regulator-always-on;
};
vdd_11: regulator@6 {
vdd_11: vdig2 {
regulator-name = "vdd_11";
regulator-always-on;
};
vcc_25: regulator@7 {
vcc_25: vpll {
regulator-name = "vcc_25";
regulator-always-on;
};
vcc_18: regulator@8 {
vcc_18: vdac {
regulator-name = "vcc_18";
regulator-always-on;
};
vcc25_hdmi: regulator@9 {
vcc25_hdmi: vaux1 {
regulator-name = "vcc25_hdmi";
regulator-always-on;
};
vcca_33: regulator@10 {
vcca_33: vaux2 {
regulator-name = "vcca_33";
regulator-always-on;
};
vcc_rmii: regulator@11 {
vcc_rmii: vaux33 {
regulator-name = "vcc_rmii";
};
vcc28_cif: regulator@12 {
vcc28_cif: vmmc {
regulator-name = "vcc28_cif";
regulator-always-on;
};
@ -179,9 +186,6 @@ vcc28_cif: regulator@12 {
};
};
/* must be included after &tps gets defined */
#include "../tps65910.dtsi"
&emac {
phy = <&phy0>;
phy-supply = <&vcc_rmii>;

35
arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
View File

@ -198,9 +198,18 @@ &i2c1 {
status = "okay";
tps: tps@2d {
compatible = "ti,tps65910";
reg = <0x2d>;
gpio-controller;
#gpio-cells = <2>;
interrupt-parent = <&gpio6>;
interrupts = <RK_PA4 IRQ_TYPE_EDGE_RISING>;
interrupt-controller;
#interrupt-cells = <2>;
pinctrl-names = "default";
pinctrl-0 = <&pmic_int>, <&pwr_hold>;
@ -214,19 +223,19 @@ tps: tps@2d {
vccio-supply = <&vsys>;
regulators {
vcc_rtc: regulator@0 {
vcc_rtc: vrtc {
regulator-name = "vcc_rtc";
regulator-always-on;
};
vcc_io: regulator@1 {
vcc_io: vio {
regulator-name = "vcc_io";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vdd_arm: regulator@2 {
vdd_arm: vdd1 {
regulator-name = "vdd_arm";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -234,7 +243,7 @@ vdd_arm: regulator@2 {
regulator-boot-on;
};
vcc_ddr: regulator@3 {
vcc_ddr: vdd2 {
regulator-name = "vcc_ddr";
regulator-min-microvolt = <600000>;
regulator-max-microvolt = <1500000>;
@ -242,52 +251,52 @@ vcc_ddr: regulator@3 {
regulator-boot-on;
};
vcc18: regulator@5 {
vcc18: vdig1 {
regulator-name = "vcc18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
vdd_11: regulator@6 {
vdd_11: vdig2 {
regulator-name = "vdd_11";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
regulator-always-on;
};
vcc_25: regulator@7 {
vcc_25: vpll {
regulator-name = "vcc_25";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
vccio_wl: regulator@8 {
vccio_wl: vdac {
regulator-name = "vccio_wl";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
vcc25_hdmi: regulator@9 {
vcc25_hdmi: vaux1 {
regulator-name = "vcc25_hdmi";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
};
vcca_33: regulator@10 {
vcca_33: vaux2 {
regulator-name = "vcca_33";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vcc_rmii: regulator@11 {
vcc_rmii: vaux33 {
regulator-name = "vcc_rmii";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vcc28_cif: regulator@12 {
vcc28_cif: vmmc {
regulator-name = "vcc28_cif";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
@ -296,8 +305,6 @@ vcc28_cif: regulator@12 {
};
};
#include "../tps65910.dtsi"
&i2c2 {
status = "okay";
};

2
arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi
View File

@ -388,7 +388,7 @@ &spi2 {
rx-sample-delay-ns = <12>;
flash@0 {
spi_flash: flash@0 {
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;

9
arch/arm/boot/dts/rockchip/rk3288.dtsi
View File

@ -34,10 +34,6 @@ aliases {
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
mshc0 = &emmc;
mshc1 = &sdmmc;
mshc2 = &sdio0;
mshc3 = &sdio1;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
@ -745,9 +741,6 @@ power: power-controller {
#address-cells = <1>;
#size-cells = <0>;
assigned-clocks = <&cru SCLK_EDP_24M>;
assigned-clock-parents = <&xin24m>;
/*
* Note: Although SCLK_* are the working clocks
* of device without including on the NOC, needed for
@ -1197,6 +1190,8 @@ edp: dp@ff970000 {
compatible = "rockchip,rk3288-dp";
reg = <0x0 0xff970000 0x0 0x4000>;
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
assigned-clocks = <&cru SCLK_EDP_24M>;
assigned-clock-parents = <&xin24m>;
clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
clock-names = "dp", "pclk";
phys = <&edp_phy>;