Merge tag 'v4.13-rockchip-dts32fixes-1' of... (e86c86bc) · Commits · 戴 / test

Merge tag 'v4.13-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes Pull "Rockchip dts32 fixes for 4.13" from Heiko Stübner: Fix for the recently added mali dt support. The example showed a wrong value, so fix it before it gets copy-pasted to much. * tag 'v4.13-rockchip-dts32fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: fix mali gpu node on rk3288 dt-bindings: gpu: drop wrong compatible from midgard binding example

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ Optional properties:
		Example for a Mali-T760:

		gpu@ffa30000 {
		compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";
		compatible = "rockchip,rk3288-mali", "arm,mali-t760";
		reg = <0xffa30000 0x10000>;
		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/rk3288.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -1126,8 +1126,8 @@
		};
		};

		gpu: mali@ffa30000 {
		compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";
		gpu: gpu@ffa30000 {
		compatible = "rockchip,rk3288-mali", "arm,mali-t760";
		reg = <0xffa30000 0x10000>;
		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

Admin message