Skip to contentSkip to conversation

mtd: nand: tango: Update DT binding description

PATCH New Marc Gonzalez 2 participants 4 messages Dec 19, 2016 – Jan 3, 2017

Subsystems (3)
Device tree bindings Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Marc Gonzalez

author
#0 lore raw

PATCH 1/1 mtd: nand: tango: Update DT binding description

Visually separate register ranges (address/size pairs) in reg prop. Change DMA channel name, for consistency with other drivers.

Signed-off-by Marc Gonzalez <[email protected]>
---
 Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++---
 drivers/mtd/nand/tango_nand.c                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mtd/tango-nand.txt +3 -3
index ad5a02f2ac8c..cd1bf2ac9055 100644
@@ -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 at 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/tango_nand.c +1 -1
index cc23db64f0ca..51dc88d6b8da 100644
@@ -629,7 +629,7 @@ static int tango_nand_probe(struct platform_device *pdev)
 	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);
Signature · 1 line
2.10.0
#1 lore raw

PATCH 1/1 mtd: nand: tango: Update DT binding description

Quoted 14 lines · On Mon, 19 Dec 2016 15:30:12 +0100 Marc Gonzalez…

Visually separate register ranges (address/size pairs) in reg prop. Change DMA channel name, for consistency with other drivers.

Signed-off-by Marc Gonzalez <[email protected]>
---
 Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++---
 drivers/mtd/nand/tango_nand.c                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mtd/tango-nand.txt +0 -0
index ad5a02f2ac8c..cd1bf2ac9055 100644

Documentation/devicetree/bindings/mtd/tango-nand.txt Required properties: · line 8

Quoted 5 lines
Documentation/devicetree/bindings/mtd/tango-nand.txt +1 -1
@@ -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"

You probably want to fix the driver accordingly ;-).

Quoted 28 lines
Documentation/devicetree/bindings/mtd/tango-nand.txt +2 -2
 - clocks: reference to the system clock
 - #address-cells: <1>
 - #size-cells: <0>

@@ -17,9 +17,9 @@ Example:
 
 	nandc: nand-controller at 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/tango_nand.c +1 -1
index cc23db64f0ca..51dc88d6b8da 100644
@@ -629,7 +629,7 @@ static int tango_nand_probe(struct platform_device *pdev)
 	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);
author
#2 lore raw

PATCH 1/1 mtd: nand: tango: Update DT binding description

Quoted 12 lines · Boris Brezillon
Quoted 9 lines · On Mon, 19 Dec 2016 15:30:12 +0100 Marc Gonzalez…

Visually separate register ranges (address/size pairs) in reg prop. Change DMA channel name, for consistency with other drivers.

Signed-off-by Marc Gonzalez <[email protected]>
---
 Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++---
 drivers/mtd/nand/tango_nand.c                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 12 lines

Documentation/devicetree/bindings/mtd/tango-nand.txt Required properties: · line 8

Quoted 10 lines
Documentation/devicetree/bindings/mtd/tango-nand.txt +1 -1
index ad5a02f2ac8c..cd1bf2ac9055 100644
@@ -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"

You probably want to fix the driver accordingly ;-).

I'm confused...

Did you miss the change (below) to drivers/mtd/nand/tango_nand.c fixing the driver as well as the documentation?

Quoted 28 lines
Quoted 28 lines
Documentation/devicetree/bindings/mtd/tango-nand.txt +2 -2
 - clocks: reference to the system clock
 - #address-cells: <1>
 - #size-cells: <0>

@@ -17,9 +17,9 @@ Example:
 
 	nandc: nand-controller at 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/tango_nand.c +1 -1
index cc23db64f0ca..51dc88d6b8da 100644
@@ -629,7 +629,7 @@ static int tango_nand_probe(struct platform_device *pdev)
 	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);
#3 lore raw

PATCH 1/1 mtd: nand: tango: Update DT binding description

Quoted 26 lines · On Tue, 3 Jan 2017 09:34:59 +0100 Marc Gonzalez…
Quoted 12 lines · Boris Brezillon
Quoted 9 lines · On Mon, 19 Dec 2016 15:30:12 +0100 Marc Gonzalez…

Visually separate register ranges (address/size pairs) in reg prop. Change DMA channel name, for consistency with other drivers.

Signed-off-by Marc Gonzalez <[email protected]>
---
 Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++---
 drivers/mtd/nand/tango_nand.c                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 12 lines

Documentation/devicetree/bindings/mtd/tango-nand.txt Required properties: · line 8

Quoted 10 lines
Documentation/devicetree/bindings/mtd/tango-nand.txt +1 -1
index ad5a02f2ac8c..cd1bf2ac9055 100644
@@ -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"

You probably want to fix the driver accordingly ;-).

Quoted 4 lines

I'm confused...

Did you miss the change (below) to drivers/mtd/nand/tango_nand.c fixing the driver as well as the documentation?

Indeed, I missed it. The patch is fine, I'll queue it for 4.10-rcX.

Sorry for the noise.

BTW, I heard you had some fixes for 4.10. Feel free to send them.

Regards,

Boris