Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea67992 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.12-rockchip-dts32-1' of... 

Merge tag 'v4.12-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 updates for 4.12 part1" from Heiko Stübner:

Contains one new board, the Tinkerboard from Asus based on the rk3288,
definitions for the mmc resets in the socs reset controller, sound
support for the Rock2, dma support for mmc controllers on the rk3188
and a led-fix for the MiQi board and and irq-fix for older Cortex-A9 socs.

* tag 'v4.12-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: setup DMA-channels for mmc0 and emmc for rk3188
  ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs
  ARM: dts: rockchip: add rk322x dw-mmc resets
  ARM: dts: rockchip: add rk3066/rk3188 dw-mmc resets
  ARM: dts: rockchip: add rk3036 dw-mmc resets
  ARM: dts: rockchip: add rk3288 dw-mmc resets
  ARM: dts: rockchip: add dts for RK3288-Tinker board
  dt-bindings: add rk3288-based Asus Tinker board
  ARM: dts: rockchip: fix the MiQi board's LED definition
  ARM: dts: rockchip: Add support for ES8388 to the Radxa Rock 2
parents f63c00bc 94bbdd77

Documentation/devicetree/bindings/arm/rockchip.txt

+3 −0
Original line number Diff line number Diff line 
Rockchip platforms device tree bindings

---------------------------------------

- Asus Tinker board

    Required root node properties:

      - compatible = "asus,rk3288-tinker", "rockchip,rk3288";



- Kylin RK3036 board:

    Required root node properties:

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-popmetal.dtb \

	rk3288-r89.dtb \

	rk3288-rock2-square.dtb \

	rk3288-tinker.dtb \

	rk3288-veyron-brain.dtb \

	rk3288-veyron-jaq.dtb \

	rk3288-veyron-jerry.dtb \

arch/arm/boot/dts/rk3036.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ 
		clock-names = "biu", "ciu";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

		resets = <&cru SRST_MMC0>;

		reset-names = "reset";

		status = "disabled";

	};
@@ -262,6 +264,8 @@ 
		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

		resets = <&cru SRST_SDIO>;

		reset-names = "reset";

		status = "disabled";

	};
@@ -286,6 +290,8 @@ 
		num-slots = <1>;

		pinctrl-names = "default";

		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

		resets = <&cru SRST_EMMC>;

		reset-names = "reset";

		status = "disabled";

	};

arch/arm/boot/dts/rk3188.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -529,11 +529,11 @@ 
};



&global_timer {

	interrupts = <GIC_PPI 11 0xf04>;

	interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;

};



&local_timer {

	interrupts = <GIC_PPI 13 0xf04>;

	interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;

};



&i2c0 {

arch/arm/boot/dts/rk322x.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ 
		fifo-depth = <0x100>;

		pinctrl-names = "default";

		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

		resets = <&cru SRST_EMMC>;

		reset-names = "reset";

		status = "disabled";

	};