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

Commit a27873cd authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up number of on-chip DMA channels on SH7091. 



This accidentally regressed when the multi-IRQ changes went in,
switching SH7091 from 4 to 6 channels. Add SH7091 back in to the
4-channel dependency list.

Reported-by: default avatarAdrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 53a52abc

arch/sh/drivers/dma/Kconfig

+12 −8
Original line number Diff line number Diff line
@@ -13,20 +13,24 @@ config SH_DMA_IRQ_MULTI 
	bool

	depends on SH_DMA

	default y if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \

		CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \

		CPU_SUBTYPE_SH7091 || CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \

		     CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \

		     CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091  || \

		     CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7764  || \

		     CPU_SUBTYPE_SH7780  || CPU_SUBTYPE_SH7785



config NR_ONCHIP_DMA_CHANNELS

	int

	depends on SH_DMA

	default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7750S

	default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7760

	default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	default "4" if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \

		       CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7091

	default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \

		       CPU_SUBTYPE_SH7760

	default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780  || \

			CPU_SUBTYPE_SH7785

	default "6"

	help

	  This allows you to specify the number of channels that the on-chip

	  DMAC supports. This will be 4 for SH7750/SH7751 and 8 for the

	  DMAC supports. This will be 4 for SH7091/SH7750/SH7751 and 8 for the

	  SH7750R/SH7751R.



config NR_DMA_CHANNELS_BOOL