| Message ID | 1414186926-25986-1-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Freitag, 24. Oktober 2014, 14:42:06 schrieb Doug Anderson: > Now that SPI DMA has been fixed on rk3288 we can enable it. > > Signed-off-by: Doug Anderson <dianders@chromium.org> > Signed-off-by: Alexandru M Stan <amstan@chromium.org> applied into my v3.19-armsoc/dts branch I've taken the liberty of changing the subject to ARM: dts: rockchip: Add SPI DMA into rk3288.dtsi Heiko > --- > arch/arm/boot/dts/rk3288.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 874e66d..e0b99f7 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -177,6 +177,8 @@ > compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; > clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>; > clock-names = "spiclk", "apb_pclk"; > + dmas = <&dmac_peri 11>, <&dmac_peri 12>; > + dma-names = "tx", "rx"; > interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>; > @@ -190,6 +192,8 @@ > compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; > clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>; > clock-names = "spiclk", "apb_pclk"; > + dmas = <&dmac_peri 13>, <&dmac_peri 14>; > + dma-names = "tx", "rx"; > interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>; > @@ -203,6 +207,8 @@ > compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; > clocks = <&cru SCLK_SPI2>, <&cru PCLK_SPI2>; > clock-names = "spiclk", "apb_pclk"; > + dmas = <&dmac_peri 15>, <&dmac_peri 16>; > + dma-names = "tx", "rx"; > interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 874e66d..e0b99f7 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -177,6 +177,8 @@ compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>; clock-names = "spiclk", "apb_pclk"; + dmas = <&dmac_peri 11>, <&dmac_peri 12>; + dma-names = "tx", "rx"; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>; @@ -190,6 +192,8 @@ compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; clocks = <&cru SCLK_SPI1>, <&cru PCLK_SPI1>; clock-names = "spiclk", "apb_pclk"; + dmas = <&dmac_peri 13>, <&dmac_peri 14>; + dma-names = "tx", "rx"; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>; @@ -203,6 +207,8 @@ compatible = "rockchip,rk3288-spi", "rockchip,rk3066-spi"; clocks = <&cru SCLK_SPI2>, <&cru PCLK_SPI2>; clock-names = "spiclk", "apb_pclk"; + dmas = <&dmac_peri 15>, <&dmac_peri 16>; + dma-names = "tx", "rx"; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&spi2_clk &spi2_tx &spi2_rx &spi2_cs0>;