Fixes for 4.10-rc3

- Forbid compiling xway NAND controller driver as a module
 - Fix tango NAND DT binding and make sure the controller is in a clean
   state at probe time
 - Add dependency on HAS_IOMEM to the oxnas NAND driver
 - Fix irq number validity check in the lpc32xx driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYbVWqAAoJEGXtNgF+CLcAd8kQAJ9m//rpcPf6wkRwzJ8RYqg0
 N8V6/7SpA8BfiweWqazWsxOhQgmyz9w7RskuigGPBx8TG4zpVEbJHoOaUTjAHfPN
 cjkAbcC2Glv3fdQBLDIfMgibJ4N1JDEjn6uHgaOo4Pe/kO0uGOKk8hNMsNl/5v32
 VinL7Fj3phiic8rVDXkJAxMxef/m8ZFYravxh3+jM4NS/Bdjnf8FPBGJGWhs3q13
 RMOU18uYWNoEW+nTP1T5qseEzNbZr98h2WgTmK0qG6xsi5ngEFYhiPHAyiYYsaZL
 o8rp589yXWopEBEJWijXxKIAGmFJg1J4KaTvgDWaXWVUpOJ4A5cNi0voTme/C380
 RSxChC4X57GADRCEjMowLWAXOHez7xx76Gq03qE1A+MeT1Q0j+f0eEycd59Xf5nz
 LFEsPX+id+cv12NXCoMNPS3Igrqh78YeqKFkJu29roeJocKHElQVSgm7AyWkQKW+
 oHRmJWK6EyH5SV3/LZBmrEbfxemHI48DyRaYjs7qOE9n7mS1A/2D19oNVlmxkWEP
 j/jRTy5NZU/A71TIO/xckf4ogewJySH++0Evs3NucKd5I5XiUKKD3BzYTT5WseRq
 UCa/qfDTrxVQ1ShHwGdeXD41MnZzT6CiPWVNpjVqJs4+Mk2kyRPnE2bubxUZe7CZ
 LH0jw4KA2/R1EaIpSSJx
 =Dg9f
 -----END PGP SIGNATURE-----

Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux

From Boris Brezillon:

"""
Fixes for 4.10-rc3
- Forbid compiling xway NAND controller driver as a module
- Fix tango NAND DT binding and make sure the controller is in a clean
  state at probe time
- Add dependency on HAS_IOMEM to the oxnas NAND driver
- Fix irq number validity check in the lpc32xx driver
"""

Documentation/devicetree/bindings/mtd/tango-nand.txt

@@ -5,7 +5,7 @@ Required properties:
 - compatible: "sigma,smp8758-nand"
 - reg: address/size of nfc_reg, nfc_mem, and pbus_reg
 - dmas: reference to the DMA channel used by the controller
-- dma-names: "nfc_sbox"
+- dma-names: "rxtx"
 - clocks: reference to the system clock
 - #address-cells: <1>
 - #size-cells: <0>
@@ -17,9 +17,9 @@ Example:
 
 	nandc: nand-controller@2c000 {
 		compatible = "sigma,smp8758-nand";
-		reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;
+		reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;
 		dmas = <&dma0 3>;
-		dma-names = "nfc_sbox";
+		dma-names = "rxtx";
 		clocks = <&clkgen SYS_CLK>;
 		#address-cells = <1>;
 		#size-cells = <0>;

drivers/mtd/nand/Kconfig

@@ -426,6 +426,7 @@ config MTD_NAND_ORION
 
 config MTD_NAND_OXNAS
 	tristate "NAND Flash support for Oxford Semiconductor SoC"
+	depends on HAS_IOMEM
 	help
 	  This enables the NAND flash controller on Oxford Semiconductor SoCs.
 
@@ -540,7 +541,7 @@ config MTD_NAND_FSMC
 	  Flexible Static Memory Controller (FSMC)
 
 config MTD_NAND_XWAY
-	tristate "Support for NAND on Lantiq XWAY SoC"
+	bool "Support for NAND on Lantiq XWAY SoC"
 	depends on LANTIQ && SOC_TYPE_XWAY
 	help
 	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached

drivers/mtd/nand/lpc32xx_mlc.c

@@ -775,7 +775,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 	init_completion(&host->comp_controller);
 
 	host->irq = platform_get_irq(pdev, 0);
-	if ((host->irq < 0) || (host->irq >= NR_IRQS)) {
+	if (host->irq < 0) {
 		dev_err(&pdev->dev, "failed to get platform irq\n");
 		res = -EINVAL;
 		goto err_exit3;

drivers/mtd/nand/tango_nand.c

@@ -632,11 +632,13 @@ static int tango_nand_probe(struct platform_device *pdev)
 	if (IS_ERR(nfc->pbus_base))
 		return PTR_ERR(nfc->pbus_base);
 
+	writel_relaxed(MODE_RAW, nfc->pbus_base + PBUS_PAD_MODE);
+
 	clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
 
-	nfc->chan = dma_request_chan(&pdev->dev, "nfc_sbox");
+	nfc->chan = dma_request_chan(&pdev->dev, "rxtx");
 	if (IS_ERR(nfc->chan))
 		return PTR_ERR(nfc->chan);
 

drivers/mtd/nand/xway_nand.c

@@ -232,7 +232,6 @@ static const struct of_device_id xway_nand_match[] = {
 	{ .compatible = "lantiq,nand-xway" },
 	{},
 };
-MODULE_DEVICE_TABLE(of, xway_nand_match);
 
 static struct platform_driver xway_nand_driver = {
 	.probe	= xway_nand_probe,
@@ -243,6 +242,4 @@ static struct platform_driver xway_nand_driver = {
 	},
 };
 
-module_platform_driver(xway_nand_driver);
-
-MODULE_LICENSE("GPL");
+builtin_platform_driver(xway_nand_driver);