diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-01 08:38:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-01 08:38:39 +0100 |
| commit | a4a1c82719ad29eb4a4426bea2485f7a4b7412ec (patch) | |
| tree | be412516597803ac6a7ba73c97182c203fceb508 /dts/src/arm64/rockchip | |
| parent | ceb40fbbb177693257e5f32fef066aa3ee65f6af (diff) | |
| download | barebox-a4a1c82719ad29eb4a4426bea2485f7a4b7412ec.tar.gz barebox-a4a1c82719ad29eb4a4426bea2485f7a4b7412ec.tar.xz | |
dts: update to v5.10-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/rockchip')
| -rw-r--r-- | dts/src/arm64/rockchip/rk3326-odroid-go2.dts | 1 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3328-nanopi-r2s.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3399-roc-pc.dtsi | 4 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3399.dtsi | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/dts/src/arm64/rockchip/rk3326-odroid-go2.dts b/dts/src/arm64/rockchip/rk3326-odroid-go2.dts index 35bd6b904b..3376810385 100644 --- a/dts/src/arm64/rockchip/rk3326-odroid-go2.dts +++ b/dts/src/arm64/rockchip/rk3326-odroid-go2.dts @@ -243,7 +243,6 @@ interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int>; - rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; clock-output-names = "rk808-clkout1", "xin32k"; diff --git a/dts/src/arm64/rockchip/rk3328-nanopi-r2s.dts b/dts/src/arm64/rockchip/rk3328-nanopi-r2s.dts index be7a31d816..2ee07d15a6 100644 --- a/dts/src/arm64/rockchip/rk3328-nanopi-r2s.dts +++ b/dts/src/arm64/rockchip/rk3328-nanopi-r2s.dts @@ -20,7 +20,7 @@ gmac_clk: gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; - clock-output-names = "gmac_clk"; + clock-output-names = "gmac_clkin"; #clock-cells = <0>; }; diff --git a/dts/src/arm64/rockchip/rk3399-roc-pc.dtsi b/dts/src/arm64/rockchip/rk3399-roc-pc.dtsi index e7a459fa43..20309076db 100644 --- a/dts/src/arm64/rockchip/rk3399-roc-pc.dtsi +++ b/dts/src/arm64/rockchip/rk3399-roc-pc.dtsi @@ -74,14 +74,14 @@ label = "red:diy"; gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; default-state = "off"; - linux,default-trigger = "mmc1"; + linux,default-trigger = "mmc2"; }; yellow_led: led-2 { label = "yellow:yellow-led"; gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; default-state = "off"; - linux,default-trigger = "mmc0"; + linux,default-trigger = "mmc1"; }; }; diff --git a/dts/src/arm64/rockchip/rk3399.dtsi b/dts/src/arm64/rockchip/rk3399.dtsi index ada724b12f..7a9a7aca86 100644 --- a/dts/src/arm64/rockchip/rk3399.dtsi +++ b/dts/src/arm64/rockchip/rk3399.dtsi @@ -29,6 +29,9 @@ i2c6 = &i2c6; i2c7 = &i2c7; i2c8 = &i2c8; + mmc0 = &sdio0; + mmc1 = &sdmmc; + mmc2 = &sdhci; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; |