summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/rockchip/rk3036-evb.dts4
-rw-r--r--arch/arm/boot/dts/rockchip/rk3036-kylin.dts4
-rw-r--r--arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts3
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts16
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts5
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts2
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts1
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288.dtsi1
13 files changed, 22 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3036-evb.dts b/arch/arm/boot/dts/rockchip/rk3036-evb.dts
index becdc0b664bf..c8100dc4c7ce 100644
--- a/arch/arm/boot/dts/rockchip/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rockchip/rk3036-evb.dts
@@ -16,8 +16,6 @@
&emac {
phy = <&phy0>;
- phy-reset-duration = <10>; /* millisecond */
- phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
status = "okay";
@@ -28,6 +26,8 @@
phy0: ethernet-phy@0 {
reg = <0>;
+ reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
+ reset-assert-us = <10000>;
};
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
index ae2f84a4e922..bc6e6468fcc4 100644
--- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts
@@ -102,8 +102,6 @@
&emac {
phy = <&phy0>;
- phy-reset-duration = <10>; /* millisecond */
- phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
status = "okay";
@@ -114,6 +112,8 @@
phy0: ethernet-phy@0 {
reg = <0>;
+ reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
+ reset-assert-us = <10000>;
};
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
index edc2b7f9112d..b56095fc2441 100644
--- a/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
@@ -262,7 +262,7 @@
interrupts = <RK_PB7 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default";
pinctrl-0 = <&gsensor_int>;
- rotation-matrix = "1", "0", "0",
+ mount-matrix = "1", "0", "0",
"0", "-1", "0",
"0", "0", "1";
vdd-supply = <&vcc_io>;
diff --git a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
index a55270672732..8b491b002992 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
@@ -197,11 +197,10 @@
};
&i2c0 {
- hym8563: hym8563@51 {
+ hym8563: rtc@51 {
compatible = "haoyu,hym8563";
reg = <0x51>;
#clock-cells = <0>;
- clock-frequency = <32768>;
clock-output-names = "xin32k";
interrupt-parent = <&gpio7>;
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
diff --git a/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts b/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
index 10ce0554d4fc..46362e804daf 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
@@ -86,6 +86,10 @@
touchscreen@44 {
compatible = "st,stmpe811";
reg = <0x44>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <RK_PB4 IRQ_TYPE_EDGE_FALLING>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_irq_pin>;
};
adc@64 {
@@ -94,7 +98,7 @@
};
i2c_rtc: rtc@68 {
- compatible = "rv4162";
+ compatible = "microcrystal,rv4162";
reg = <0x68>;
pinctrl-names = "default";
pinctrl-0 = <&i2c_rtc_int>;
@@ -121,25 +125,25 @@
compatible = "nxp,pca9533";
reg = <0x62>;
- led1 {
+ led-1 {
label = "red:user1";
linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>;
};
- led2 {
+ led-2 {
label = "green:user2";
linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>;
};
- led3 {
+ led-3 {
label = "blue:user3";
linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>;
};
- led4 {
+ led-4 {
label = "red:user4";
linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>;
@@ -199,7 +203,7 @@
touchscreen {
ts_irq_pin: ts-irq-pin {
- rockchip,pins = <5 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <5 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
index 12ab10c4adde..0816e388852f 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
@@ -100,7 +100,7 @@
tx_delay = <0x0>;
rx_delay = <0x0>;
- mdio0 {
+ mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
index ade9cc291813..d7790eebfdcd 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
@@ -91,14 +91,12 @@
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-name = "vdd10_lcd";
- regulator-suspend-mem-disabled;
};
vcc18_hdmi: SWITCH_REG2 {
regulator-always-on;
regulator-boot-on;
regulator-name = "vcc18_hdmi";
- regulator-suspend-mem-disabled;
};
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
index 6a0844e16279..3da105060302 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
@@ -98,9 +98,8 @@
snps,reset-gpio = <&gpio4 RK_PB0 0>;
snps,reset-active-low;
snps,reset-delays-us = <0 10000 30000>;
- wakeup-source;
- mdio0 {
+ mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
@@ -177,7 +176,7 @@
#address-cells = <1>;
#size-cells = <0>;
- btmrvl: btmrvl@2 {
+ btmrvl: bluetooth@2 {
compatible = "marvell,sd8897-bt";
reg = <2>;
interrupt-parent = <&gpio4>;
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts
index 0d4c50e05558..cba2898f8b7d 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts
@@ -48,7 +48,7 @@
#address-cells = <1>;
#size-cells = <0>;
- btmrvl: btmrvl@2 {
+ btmrvl: bluetooth@2 {
compatible = "marvell,sd8897-bt";
reg = <2>;
interrupt-parent = <&gpio4>;
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts
index 6894763979f0..0bf03b1ff2ab 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts
@@ -488,7 +488,7 @@
interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
reg = <0x2c>;
hid-descr-addr = <0x0020>;
- vcc-supply = <&vcc33_io>;
+ vdd-supply = <&vcc33_io>;
wakeup-source;
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
index d665c3e8862c..20fe84683928 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
@@ -246,7 +246,6 @@
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-name = "vdd10_lcd";
- regulator-suspend-mem-disabled;
};
vcc18_lcd: LDO_REG8 {
@@ -255,7 +254,6 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-name = "vcc18_lcd";
- regulator-suspend-mem-disabled;
};
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
index cc27d116d025..e241f93b2310 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
@@ -47,6 +47,7 @@
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
+ linux,code = <KEY_POWER>;
};
};
diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
index 4e5e7509de48..4f2c048aee54 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
@@ -551,7 +551,6 @@
pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <1>;
- rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <95000>;
status = "disabled";
};
generated by cgit v1.2.3 (git 2.39.0) at 2026-05-13 17:27:42 +0300