xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
"""
This commit is contained in:
Brian Norris
2017-01-05 09:33:26 -08:00
parent 0c744ea4f7 cf9e1672a6
commit 5bdee54969
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/mtd/tango-nand.txt
View File

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

3
drivers/mtd/nand/Kconfig
View File

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

2
drivers/mtd/nand/lpc32xx_mlc.c
View File

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

4
drivers/mtd/nand/tango_nand.c
View File

@@ -632,11 +632,13 @@ static int tango_nand_probe(struct platform_device *pdev)
if (IS_ERR(nfc->pbus_base)) if (IS_ERR(nfc->pbus_base))
return PTR_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); clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) if (IS_ERR(clk))
return PTR_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)) if (IS_ERR(nfc->chan))
return PTR_ERR(nfc->chan); return PTR_ERR(nfc->chan);

5
drivers/mtd/nand/xway_nand.c
View File

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