forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/mtd/linux.git
- Loading branch information
Showing
20 changed files
with
253 additions
and
199 deletions.
There are no files selected for viewing
60 changes: 0 additions & 60 deletions
60
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
This file was deleted.
Oops, something went wrong.
93 changes: 93 additions & 0 deletions
93
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/mtd/amlogic,meson-nand.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCs | ||
|
||
allOf: | ||
- $ref: nand-controller.yaml | ||
|
||
maintainers: | ||
- liang.yang@amlogic.com | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- amlogic,meson-gxl-nfc | ||
- amlogic,meson-axg-nfc | ||
|
||
reg: | ||
maxItems: 2 | ||
|
||
reg-names: | ||
items: | ||
- const: nfc | ||
- const: emmc | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
minItems: 2 | ||
|
||
clock-names: | ||
items: | ||
- const: core | ||
- const: device | ||
|
||
patternProperties: | ||
"^nand@[0-7]$": | ||
type: object | ||
properties: | ||
reg: | ||
minimum: 0 | ||
maximum: 1 | ||
|
||
nand-ecc-mode: | ||
const: hw | ||
|
||
nand-ecc-step-size: | ||
const: 1024 | ||
|
||
nand-ecc-strength: | ||
enum: [8, 16, 24, 30, 40, 50, 60] | ||
description: | | ||
The ECC configurations that can be supported are as follows. | ||
meson-gxl-nfc 8, 16, 24, 30, 40, 50, 60 | ||
meson-axg-nfc 8 | ||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/axg-clkc.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
nand-controller@ffe07800 { | ||
compatible = "amlogic,meson-axg-nfc"; | ||
reg = <0xffe07800 0x100>, <0xffe07000 0x800>; | ||
reg-names = "nfc", "emmc"; | ||
interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; | ||
clocks = <&clkc CLKID_SD_EMMC_C>, <&clkc CLKID_FCLK_DIV2>; | ||
clock-names = "core", "device"; | ||
pinctrl-0 = <&nand_pins>; | ||
pinctrl-names = "default"; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
nand@0 { | ||
reg = <0>; | ||
}; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
config MTD_NAND_BRCMNAND | ||
tristate "Broadcom STB NAND controller" | ||
depends on ARM || ARM64 || MIPS || COMPILE_TEST | ||
depends on HAS_IOMEM | ||
help | ||
Enables the Broadcom NAND controller driver. The controller was | ||
originally designed for Set-Top Box but is used on various BCM7xxx, | ||
BCM3xxx, BCM63xxx, iProc/Cygnus and more. | ||
|
||
if MTD_NAND_BRCMNAND | ||
|
||
config MTD_NAND_BRCMNAND_BCM63XX | ||
tristate "Broadcom BCM63xx NAND controller glue" | ||
default BCM63XX | ||
help | ||
Enables the BRCMNAND glue driver to register the NAND controller | ||
on Broadcom BCM63xx MIPS-based DSL platforms. | ||
|
||
config MTD_NAND_BRCMNAND_BCMA | ||
tristate "Broadcom BCMA NAND controller" | ||
depends on BCMA_NFLASH | ||
depends on BCMA | ||
help | ||
Enables the BRCMNAND controller over BCMA on BCM47186/BCM5358 SoCs. | ||
The glue driver will take care of performing the low-level I/O | ||
operations to interface the BRCMNAND controller over the BCMA bus. | ||
|
||
config MTD_NAND_BRCMNAND_BCMBCA | ||
tristate "Broadcom BCMBCA NAND controller glue" | ||
default ARCH_BCMBCA | ||
help | ||
Enables the BRCMNAND glue driver to register the NAND controller | ||
on Broadcom BCA platforms. | ||
|
||
config MTD_NAND_BRCMNAND_BRCMSTB | ||
tristate "Broadcom STB Nand controller glue" | ||
default ARCH_BRCMSTB | ||
help | ||
Enables the BRCMNAND glue driver to register the NAND controller | ||
on Broadcom STB platforms. | ||
|
||
config MTD_NAND_BRCMNAND_IPROC | ||
tristate "Broadcom iProc NAND controller glue" | ||
default ARCH_BCM_IPROC | ||
help | ||
Enables the BRCMNAND controller glue driver to register the NAND | ||
controller on Broadcom iProc platforms. | ||
|
||
endif # MTD_NAND_BRCMNAND |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
# link order matters; don't link the more generic brcmstb_nand.o before the | ||
# more specific iproc_nand.o, for instance | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND) += iproc_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND) += bcm63138_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND) += bcm6368_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmstb_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND_IPROC) += iproc_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMBCA) += bcm63138_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND_BCM63XX) += bcm6368_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND_BRCMSTB) += brcmstb_nand.o | ||
obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand.o | ||
|
||
obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMA) += bcma_nand.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.