Merge branch 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata (3ec438af) · Commits · 戴 / test

Pull libata sata_dwc_460ex updates from Tejun Heo: "Patches to bring sata_dwc_460ex up to snuff. It was a separate pull request because it depends on dmaengine dw platform changes which are now in mainline" * 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (24 commits) ata: dwc: add DMADEVICES dependency powerpc/4xx: Device tree update for the 460ex DWC SATA ata: sata_dwc_460ex: make debug messages neat ata: sata_dwc_460ex: supply physical address of FIFO to DMA ata: sata_dwc_460ex: use devm_ioremap ata: sata_dwc_460ex: tidy up sata_dwc_clear_dmacr() ata: sata_dwc_460ex: use readl/writel_relaxed() ata: sata_dwc_460ex: switch to new dmaengine_terminate_* API ata: sata_dwc_460ex: add __iomem to register base pointer ata: sata_dwc_460ex: get rid of incorrect cast ata: sata_dwc_460ex: get rid of some pointless casts ata: sata_dwc_460ex: remove empty libata callback ata: sata_dwc_460ex: correct HOSTDEV{P}_FROM_*() macros ata: sata_dwc_460ex: get rid of global data ata: sata_dwc_460ex: add phy support ata: sata_dwc_460ex: use "dmas" DT property to find dma channel ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands ata: sata_dwc_460ex: skip dma setup for non-dma commands ata: sata_dwc_460ex: select only core part of DMA driver ata: sata_dwc_460ex: DMA is always a flow controller ...

arch/powerpc/boot/dts/canyonlands.dts

+12 −3

Original line number	Original line	Diff line number	Diff line
	@@ -190,12 +190,21 @@
	/* DMA */ 0x2 &UIC0 0xc 0x4>;		/* DMA */ 0x2 &UIC0 0xc 0x4>;
	};		};

			AHBDMA: dma@bffd0800 {
			compatible = "snps,dma-spear1340";
			reg = <4 0xbffd0800 0x400>;
			interrupt-parent = <&UIC3>;
			interrupts = <0x5 0x4>;
			#dma-cells = <3>;
			};

	SATA0: sata@bffd1000 {		SATA0: sata@bffd1000 {
	compatible = "amcc,sata-460ex";		compatible = "amcc,sata-460ex";
	reg = <4 0xbffd1000 0x800 4 0xbffd0800 0x400>;		reg = <4 0xbffd1000 0x800>;
	interrupt-parent = <&UIC3>;		interrupt-parent = <&UIC3>;
	interrupts = <0x0 0x4 /* SATA */		interrupts = <0x0 0x4>;
	0x5 0x4>; /* AHBDMA */		dmas = <&AHBDMA 0 1 0>;
			dma-names = "sata-dma";
	};		};

	POB0: opb {		POB0: opb {

drivers/ata/Kconfig

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -313,14 +313,23 @@ config ATA_PIIX

	config SATA_DWC		config SATA_DWC
	tristate "DesignWare Cores SATA support"		tristate "DesignWare Cores SATA support"
	depends on 460EX		depends on DMADEVICES
	select DW_DMAC		select GENERIC_PHY
	help		help
	This option enables support for the on-chip SATA controller of the		This option enables support for the on-chip SATA controller of the
	AppliedMicro processor 460EX.		AppliedMicro processor 460EX.

	If unsure, say N.		If unsure, say N.

			config SATA_DWC_OLD_DMA
			bool "Support old device trees"
			depends on SATA_DWC
			select DW_DMAC_CORE
			default y if 460EX
			help
			This option enables support for old device trees without the
			"dmas" property.

	config SATA_DWC_DEBUG		config SATA_DWC_DEBUG
	bool "Debugging driver version"		bool "Debugging driver version"
	depends on SATA_DWC		depends on SATA_DWC

Admin message