Merge tag 'v5.10-rockchip-dtsfixes1' of... (4765df4d) · Commits · 戴 / test

Merge tag 'v5.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Fixed ordering for MMC devices on rk3399, due to a mmc change jumbling all ordering, a fix to make the Odroig Go Advance actually power down and using the correct clock name on the NanoPi R2S. * tag 'v5.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Reorder LED triggers from mmc devices on rk3399-roc-pc. arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. arm64: dts: rockchip: Remove system-power-controller from pmic on Odroid Go Advance arm64: dts: rockchip: fix NanoPi R2S GMAC clock name Link: https://lore.kernel.org/r/11641389.O9o76ZdvQC@phil Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -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";

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;
		};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -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";
		};
		};

arch/arm64/boot/dts/rockchip/rk3399.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@
		i2c6 = &i2c6;
		i2c7 = &i2c7;
		i2c8 = &i2c8;
		mmc0 = &sdio0;
		mmc1 = &sdmmc;
		mmc2 = &sdhci;
		serial0 = &uart0;
		serial1 = &uart1;
		serial2 = &uart2;

Admin message