Merge branch 'nand/next' into mtd/next (cf431a59) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml

+2 −3

Original line number	Diff line number	Diff line
		@@ -49,13 +49,12 @@ properties:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		$ref: raw-nand-chip.yaml
		properties:
		reg:
		minimum: 0
		maximum: 7

		nand-ecc-mode: true

		nand-ecc-algo:
		const: bch

		@@ -75,7 +74,7 @@ patternProperties:
		minimum: 0
		maximum: 1

		additionalProperties: false
		unevaluatedProperties: false

		required:
		- compatible

+10 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ properties:
		patternProperties:
		"^nand@[0-7]$":
		type: object
		$ref: raw-nand-chip.yaml
		properties:
		reg:
		minimum: 0
		@@ -58,6 +59,14 @@ patternProperties:
		meson-gxl-nfc 8, 16, 24, 30, 40, 50, 60
		meson-axg-nfc 8

		nand-rb:
		maxItems: 1
		items:
		maximum: 0

		unevaluatedProperties: false


		required:
		- compatible
		- reg
		@@ -87,6 +96,7 @@ examples:

		nand@0 {
		reg = <0>;
		nand-rb = <0>;
		};
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ properties:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		$ref: raw-nand-chip.yaml
		properties:
		compatible:
		const: brcm,nandcs
		@@ -136,6 +137,8 @@ patternProperties:
		layout.
		$ref: /schemas/types.yaml#/definitions/uint32

		unevaluatedProperties: false

		allOf:
		- $ref: nand-controller.yaml#
		- if:

+6 −3

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ properties:
		minItems: 1
		maxItems: 2

		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		$ref: raw-nand-chip.yaml
		unevaluatedProperties: false

		allOf:
		- $ref: nand-controller.yaml

		@@ -74,7 +80,6 @@ allOf:
		then:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		properties:
		nand-ecc-strength:
		enum:
		@@ -92,7 +97,6 @@ allOf:
		then:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		properties:
		nand-ecc-strength:
		enum:
		@@ -111,7 +115,6 @@ allOf:
		then:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		properties:
		nand-ecc-strength:
		enum:

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,7 +39,9 @@ properties:
		patternProperties:
		"^nand@[a-f0-9]$":
		type: object
		$ref: raw-nand-chip.yaml
		properties:

		rb-gpios:
		description: GPIO specifier for the busy pin.
		maxItems: 1
		@@ -48,6 +50,8 @@ patternProperties:
		description: GPIO specifier for the write-protect pin.
		maxItems: 1

		unevaluatedProperties: false

		required:
		- compatible
		- reg