diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 13:48:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 13:48:07 +0100 |
| commit | 78271a212f7a2cb08c9acb3f477b0519aa271dce (patch) | |
| tree | 65d0e742f62001ef39078c9ca4eb79d48a499e26 /arch/arm/boot | |
| parent | 26bd5bf75c3b755dad1f0575f3bc19a318488c1f (diff) | |
| parent | f4d0e3d48d590e93de51c4562d9c005daa012945 (diff) | |
| download | linux-next-78271a212f7a2cb08c9acb3f477b0519aa271dce.tar.gz linux-next-78271a212f7a2cb08c9acb3f477b0519aa271dce.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3229-xms6.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3229-xms6.dts b/arch/arm/boot/dts/rockchip/rk3229-xms6.dts index 28333449c43a..6fd3e61c89af 100644 --- a/arch/arm/boot/dts/rockchip/rk3229-xms6.dts +++ b/arch/arm/boot/dts/rockchip/rk3229-xms6.dts @@ -48,7 +48,7 @@ sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio2 26 GPIO_ACTIVE_LOW>, - <&gpio2 29 GPIO_ACTIVE_LOW>; + <&gpio2 29 GPIO_ACTIVE_LOW>; }; vcc_host: regulator-vcc-host { @@ -163,7 +163,7 @@ phy: ethernet-phy@0 { compatible = "ethernet-phy-id1234.d400", - "ethernet-phy-ieee802.3-c22"; + "ethernet-phy-ieee802.3-c22"; reg = <0>; clocks = <&cru SCLK_MAC_PHY>; phy-is-integrated; diff --git a/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi b/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi index 6a8e8e0f80c5..16664cdc2d23 100644 --- a/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi +++ b/arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi @@ -93,7 +93,6 @@ &sdmmc0 { bus-width = <4>; - cap-mmc-highspeed; cap-sd-highspeed; disable-wp; no-sdio; |