Commit ec92b88c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa updates from Max Filippov:

 - enable HAVE_DMA_CONTIGUOUS, configure shared DMA pool reservation in
   kc705 DTS

 - update xtensa DMA-related Documentation/features entries

 - clean up arch/xtensa/kernel/setup.c: move S32C1I self-test out of it,
   remove unused declarations, fix screen_info definition

* tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: update DMA-related Documentation/features entries
  xtensa: configure shared DMA pool reservation in kc705 DTS
  xtensa: enable HAVE_DMA_CONTIGUOUS
  xtensa: move S32C1I self-test to a separate file
  xtensa: fix screen_info, clean up unused declarations in setup.c
parents e93b1cc8 30b50705

Documentation/features/io/dma-api-debug/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ 
    |          um: | TODO |

    |   unicore32: | TODO |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    |      xtensa: |  ok  |

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

Documentation/features/io/dma-contiguous/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ 
    |          um: | TODO |

    |   unicore32: | TODO |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    |      xtensa: |  ok  |

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

arch/xtensa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config XTENSA 
	select GENERIC_SCHED_CLOCK

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_CONTIGUOUS

	select HAVE_EXIT_THREAD

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if !MMU

arch/xtensa/boot/dts/kc705.dts

+16 −0
Original line number Diff line number Diff line
@@ -11,4 +11,20 @@ 
		device_type = "memory";

		reg = <0x00000000 0x38000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";

			reusable;

			size = <0x04000000>;

			alignment = <0x2000>;

			alloc-ranges = <0x00000000 0x20000000>;

			linux,cma-default;

		};

	};

};

arch/xtensa/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ generic-y += bug.h 
generic-y += clkdev.h

generic-y += cputime.h

generic-y += div64.h

generic-y += dma-contiguous.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE