bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 14:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
A number of dt-schema cleanups that are log standing, so not suitable
as fix for the current release.

* tag 'v7.1-rockchip-dts32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Pass linux,code to the power key on rk3288-veyron-pinky
  ARM: dts: rockchip: Fix LED node names on rk3288-phycore-rdk
  ARM: dts: rockchip: Fix GMAC description n RK3288 boards
  ARM: dts: rockchip: Fix RTC description on rk3288-firefly-reload
  ARM: dts: rockchip: Add missing the touchscreen interrupt on rk3288-phycore-rdk
  ARM: dts: rockchip: Fix the trackpad supply on rk3288-veyron-jerry
  ARM: dts: rockchip: Fix the Bluetooth node name on rk3288-veyron
  ARM: dts: rockchip: Remove invalid regulator-property from rk3288-veyron
  ARM: dts: rockchip: Use mount-matrix on rk3188-bqedison2qc
  ARM: dts: rockchip: Fix RTC compatible on rk3288-phycore-rdk
  ARM: dts: rockchip: Move PHY reset to ethernet-phy node on rk3036 boards
  ARM: dts: rockchip: Remove rockchip,grf from rk3288 tsadc

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Krzysztof Kozlowski
2026-04-11 10:04:14 +02:00
parent 0ba8e918c7 94c8dc1fa8
commit 104f1e3f6d
13 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rockchip/rk3036-evb.dts
View File

@@ -16,8 +16,6 @@
&emac { &emac {
phy = <&phy0>; phy = <&phy0>;
phy-reset-duration = <10>; /* millisecond */
phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>; pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
status = "okay"; status = "okay";
@@ -28,6 +26,8 @@
phy0: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
reset-assert-us = <10000>;
}; };
}; };
}; };

4
arch/arm/boot/dts/rockchip/rk3036-kylin.dts
View File

@@ -102,8 +102,6 @@
&emac { &emac {
phy = <&phy0>; phy = <&phy0>;
phy-reset-duration = <10>; /* millisecond */
phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>; pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
status = "okay"; status = "okay";
@@ -114,6 +112,8 @@
phy0: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
reset-assert-us = <10000>;
}; };
}; };
}; };

2
arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
View File

@@ -262,7 +262,7 @@
interrupts = <RK_PB7 IRQ_TYPE_EDGE_RISING>; interrupts = <RK_PB7 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gsensor_int>; pinctrl-0 = <&gsensor_int>;
rotation-matrix = "1", "0", "0", mount-matrix = "1", "0", "0",
"0", "-1", "0", "0", "-1", "0",
"0", "0", "1"; "0", "0", "1";
vdd-supply = <&vcc_io>; vdd-supply = <&vcc_io>;

3
arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
View File

@@ -197,11 +197,10 @@
}; };
&i2c0 { &i2c0 {
hym8563: hym8563@51 { hym8563: rtc@51 {
compatible = "haoyu,hym8563"; compatible = "haoyu,hym8563";
reg = <0x51>; reg = <0x51>;
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <32768>;
clock-output-names = "xin32k"; clock-output-names = "xin32k";
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;

16
arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
View File

@@ -86,6 +86,10 @@
touchscreen@44 { touchscreen@44 {
compatible = "st,stmpe811"; compatible = "st,stmpe811";
reg = <0x44>; reg = <0x44>;
interrupt-parent = <&gpio5>;
interrupts = <RK_PB4 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
pinctrl-0 = <&ts_irq_pin>;
}; };
adc@64 { adc@64 {
@@ -94,7 +98,7 @@
}; };
i2c_rtc: rtc@68 { i2c_rtc: rtc@68 {
compatible = "rv4162"; compatible = "microcrystal,rv4162";
reg = <0x68>; reg = <0x68>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c_rtc_int>; pinctrl-0 = <&i2c_rtc_int>;
@@ -121,25 +125,25 @@
compatible = "nxp,pca9533"; compatible = "nxp,pca9533";
reg = <0x62>; reg = <0x62>;
led1 { led-1 {
label = "red:user1"; label = "red:user1";
linux,default-trigger = "none"; linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>; type = <PCA9532_TYPE_LED>;
}; };
led2 { led-2 {
label = "green:user2"; label = "green:user2";
linux,default-trigger = "none"; linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>; type = <PCA9532_TYPE_LED>;
}; };
led3 { led-3 {
label = "blue:user3"; label = "blue:user3";
linux,default-trigger = "none"; linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>; type = <PCA9532_TYPE_LED>;
}; };
led4 { led-4 {
label = "red:user4"; label = "red:user4";
linux,default-trigger = "none"; linux,default-trigger = "none";
type = <PCA9532_TYPE_LED>; type = <PCA9532_TYPE_LED>;
@@ -199,7 +203,7 @@
touchscreen { touchscreen {
ts_irq_pin: ts-irq-pin { 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>;
}; };
}; };

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

@@ -100,7 +100,7 @@
tx_delay = <0x0>; tx_delay = <0x0>;
rx_delay = <0x0>; rx_delay = <0x0>;
mdio0 { mdio {
compatible = "snps,dwmac-mdio"; compatible = "snps,dwmac-mdio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

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

@@ -91,14 +91,12 @@
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-name = "vdd10_lcd"; regulator-name = "vdd10_lcd";
regulator-suspend-mem-disabled;
}; };
vcc18_hdmi: SWITCH_REG2 { vcc18_hdmi: SWITCH_REG2 {
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-name = "vcc18_hdmi"; regulator-name = "vcc18_hdmi";
regulator-suspend-mem-disabled;
}; };
}; };
}; };

5
arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
View File

@@ -98,9 +98,8 @@
snps,reset-gpio = <&gpio4 RK_PB0 0>; snps,reset-gpio = <&gpio4 RK_PB0 0>;
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 30000>; snps,reset-delays-us = <0 10000 30000>;
wakeup-source;
mdio0 { mdio {
compatible = "snps,dwmac-mdio"; compatible = "snps,dwmac-mdio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -177,7 +176,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
btmrvl: btmrvl@2 { btmrvl: bluetooth@2 {
compatible = "marvell,sd8897-bt"; compatible = "marvell,sd8897-bt";
reg = <2>; reg = <2>;
interrupt-parent = <&gpio4>; interrupt-parent = <&gpio4>;

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

@@ -48,7 +48,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
btmrvl: btmrvl@2 { btmrvl: bluetooth@2 {
compatible = "marvell,sd8897-bt"; compatible = "marvell,sd8897-bt";
reg = <2>; reg = <2>;
interrupt-parent = <&gpio4>; interrupt-parent = <&gpio4>;

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

@@ -488,7 +488,7 @@
interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
reg = <0x2c>; reg = <0x2c>;
hid-descr-addr = <0x0020>; hid-descr-addr = <0x0020>;
vcc-supply = <&vcc33_io>; vdd-supply = <&vcc33_io>;
wakeup-source; wakeup-source;
}; };
}; };

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

@@ -246,7 +246,6 @@
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-name = "vdd10_lcd"; regulator-name = "vdd10_lcd";
regulator-suspend-mem-disabled;
}; };
vcc18_lcd: LDO_REG8 { vcc18_lcd: LDO_REG8 {
@@ -255,7 +254,6 @@
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
regulator-suspend-mem-disabled;
}; };
}; };
}; };

1
arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
View File

@@ -47,6 +47,7 @@
key-power { key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_POWER>;
}; };
}; };

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

@@ -551,7 +551,6 @@
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_pin>; pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
status = "disabled"; status = "disabled";
}; };