mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 04:28:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v5.10-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Browse Source 
cpu-supply fixes (supply for each cpu core not only cpu0)
and a spelling for the status property.

* tag 'v5.10-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: replace status value "ok" by "okay"
  ARM: dts: rockchip: update cpu supplies on rk3066a
  ARM: dts: rockchip: rk3066a: add label to cpu@1
  ARM: dts: rockchip: update cpu supplies on rk3288

Link: https://lore.kernel.org/r/1834049.gShM3QRH0n@diego
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2020-10-03 12:37:45 -07:00
parent a3ca4b5e92 0cf10e6f94
commit 02c96f8353
13 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/rk3066a-bqcurie2.dts
View File

@@ -63,7 +63,11 @@ volume-down {
};
&cpu0 {
cpu0-supply = <&vdd_arm>;
cpu-supply = <&vdd_arm>;
};
&cpu1 {
cpu-supply = <&vdd_arm>;
};
&i2c1 {

6
arch/arm/boot/dts/rk3066a-marsboard.dts
View File

@@ -47,7 +47,11 @@ vsys: vsys-regulator {
};
&cpu0 {
cpu0-supply = <&vdd_arm>;
cpu-supply = <&vdd_arm>;
};
&cpu1 {
cpu-supply = <&vdd_arm>;
};
&i2c1 {

6
arch/arm/boot/dts/rk3066a-rayeager.dts
View File

@@ -128,7 +128,11 @@ vcc_otg: usb-otg-regulator {
};
&cpu0 {
cpu0-supply = <&vdd_arm>;
cpu-supply = <&vdd_arm>;
};
&cpu1 {
cpu-supply = <&vdd_arm>;
};
&emac {

2
arch/arm/boot/dts/rk3066a.dtsi
View File

@@ -36,7 +36,7 @@ cpu0: cpu@0 {
clock-latency = <40000>;
clocks = <&cru ARMCLK>;
};
cpu@1 {
cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a9";
next-level-cache = <&L2>;

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

@@ -247,7 +247,7 @@ &gmac {
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&gpu {

2
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
View File

@@ -61,7 +61,7 @@ &gmac {
snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&i2c0 {

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

@@ -191,7 +191,7 @@ &gmac {
snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&gpu {

16
arch/arm/boot/dts/rk3288-miqi.dts
View File

@@ -81,7 +81,19 @@ vcc_sys: vsys-regulator {
};
&cpu0 {
cpu0-supply = <&vdd_cpu>;
cpu-supply = <&vdd_cpu>;
};
&cpu1 {
cpu-supply = <&vdd_cpu>;
};
&cpu2 {
cpu-supply = <&vdd_cpu>;
};
&cpu3 {
cpu-supply = <&vdd_cpu>;
};
&emmc {
@@ -108,7 +120,7 @@ &gmac {
snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&hdmi {

16
arch/arm/boot/dts/rk3288-popmetal.dts
View File

@@ -103,7 +103,19 @@ vcc28_dvp: vcc28-dvp-regulator {
};
&cpu0 {
cpu0-supply = <&vdd_cpu>;
cpu-supply = <&vdd_cpu>;
};
&cpu1 {
cpu-supply = <&vdd_cpu>;
};
&cpu2 {
cpu-supply = <&vdd_cpu>;
};
&cpu3 {
cpu-supply = <&vdd_cpu>;
};
&emmc {
@@ -149,7 +161,7 @@ &gmac {
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&hdmi {

16
arch/arm/boot/dts/rk3288-r89.dts
View File

@@ -91,7 +91,19 @@ vcc_sys: sys-regulator {
};
&cpu0 {
cpu0-supply = <&vdd_cpu>;
cpu-supply = <&vdd_cpu>;
};
&cpu1 {
cpu-supply = <&vdd_cpu>;
};
&cpu2 {
cpu-supply = <&vdd_cpu>;
};
&cpu3 {
cpu-supply = <&vdd_cpu>;
};
&gmac {
@@ -107,7 +119,7 @@ &gmac {
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&hdmi {

2
arch/arm/boot/dts/rk3288-rock2-square.dts
View File

@@ -156,7 +156,7 @@ &sdmmc {
};
&gmac {
status = "ok";
status = "okay";
};
&hdmi {

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

@@ -137,7 +137,7 @@ &gmac {
snps,reset-delays-us = <0 10000 1000000>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};
&gpu {

14
arch/arm/boot/dts/rk3288-vyasa.dts
View File

@@ -125,7 +125,19 @@ ext_gmac: external-gmac-clock {
};
&cpu0 {
cpu0-supply = <&vdd_cpu>;
cpu-supply = <&vdd_cpu>;
};
&cpu1 {
cpu-supply = <&vdd_cpu>;
};
&cpu2 {
cpu-supply = <&vdd_cpu>;
};
&cpu3 {
cpu-supply = <&vdd_cpu>;
};
&emmc {