Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: intel,ixp4xx-expansion-bus: split out peripheral properties

The properties of devices in IXP4xx expansion bus need to be also
applied to actual devices' bindings. Prepare for this by splitting them
to separate intel,ixp4xx-expansion-peripheral-props binding, just like
other memory-controller peripheral properties.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230206092624.22922-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Rob Herring
33887fce f9b8556d

+84 -65
+2 -64
Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-bus-controller.yaml
··· 1 1 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 2 %YAML 1.2 3 3 --- 4 - $id: http://devicetree.org/schemas/bus/intel,ixp4xx-expansion-bus-controller.yaml# 4 + $id: http://devicetree.org/schemas/memory-controllers/intel,ixp4xx-expansion-bus-controller.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 7 title: Intel IXP4xx Expansion Bus Controller ··· 56 56 description: Devices attached to chip selects are represented as 57 57 subnodes. 58 58 type: object 59 - 60 - properties: 61 - intel,ixp4xx-eb-t1: 62 - description: Address timing, extend address phase with n cycles. 63 - $ref: /schemas/types.yaml#/definitions/uint32 64 - maximum: 3 65 - 66 - intel,ixp4xx-eb-t2: 67 - description: Setup chip select timing, extend setup phase with n cycles. 68 - $ref: /schemas/types.yaml#/definitions/uint32 69 - maximum: 3 70 - 71 - intel,ixp4xx-eb-t3: 72 - description: Strobe timing, extend strobe phase with n cycles. 73 - $ref: /schemas/types.yaml#/definitions/uint32 74 - maximum: 15 75 - 76 - intel,ixp4xx-eb-t4: 77 - description: Hold timing, extend hold phase with n cycles. 78 - $ref: /schemas/types.yaml#/definitions/uint32 79 - maximum: 3 80 - 81 - intel,ixp4xx-eb-t5: 82 - description: Recovery timing, extend recovery phase with n cycles. 83 - $ref: /schemas/types.yaml#/definitions/uint32 84 - maximum: 15 85 - 86 - intel,ixp4xx-eb-cycle-type: 87 - description: The type of cycles to use on the expansion bus for this 88 - chip select. 0 = Intel cycles, 1 = Motorola cycles, 2 = HPI cycles. 89 - $ref: /schemas/types.yaml#/definitions/uint32 90 - enum: [0, 1, 2] 91 - 92 - intel,ixp4xx-eb-byte-access-on-halfword: 93 - description: Allow byte read access on half word devices. 94 - $ref: /schemas/types.yaml#/definitions/uint32 95 - enum: [0, 1] 96 - 97 - intel,ixp4xx-eb-hpi-hrdy-pol-high: 98 - description: Set HPI HRDY polarity to active high when using HPI. 99 - $ref: /schemas/types.yaml#/definitions/uint32 100 - enum: [0, 1] 101 - 102 - intel,ixp4xx-eb-mux-address-and-data: 103 - description: Multiplex address and data on the data bus. 104 - $ref: /schemas/types.yaml#/definitions/uint32 105 - enum: [0, 1] 106 - 107 - intel,ixp4xx-eb-ahb-split-transfers: 108 - description: Enable AHB split transfers. 109 - $ref: /schemas/types.yaml#/definitions/uint32 110 - enum: [0, 1] 111 - 112 - intel,ixp4xx-eb-write-enable: 113 - description: Enable write cycles. 114 - $ref: /schemas/types.yaml#/definitions/uint32 115 - enum: [0, 1] 116 - 117 - intel,ixp4xx-eb-byte-access: 118 - description: Expansion bus uses only 8 bits. The default is to use 119 - 16 bits. 120 - $ref: /schemas/types.yaml#/definitions/uint32 121 - enum: [0, 1] 59 + $ref: /schemas/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml# 122 60 123 61 required: 124 62 - compatible
+80
Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Peripheral properties for Intel IXP4xx Expansion Bus 8 + 9 + description: 10 + The IXP4xx expansion bus controller handles access to devices on the 11 + memory-mapped expansion bus on the Intel IXP4xx family of system on chips, 12 + including IXP42x, IXP43x, IXP45x and IXP46x. 13 + 14 + maintainers: 15 + - Linus Walleij <linus.walleij@linaro.org> 16 + 17 + properties: 18 + intel,ixp4xx-eb-t1: 19 + description: Address timing, extend address phase with n cycles. 20 + $ref: /schemas/types.yaml#/definitions/uint32 21 + maximum: 3 22 + 23 + intel,ixp4xx-eb-t2: 24 + description: Setup chip select timing, extend setup phase with n cycles. 25 + $ref: /schemas/types.yaml#/definitions/uint32 26 + maximum: 3 27 + 28 + intel,ixp4xx-eb-t3: 29 + description: Strobe timing, extend strobe phase with n cycles. 30 + $ref: /schemas/types.yaml#/definitions/uint32 31 + maximum: 15 32 + 33 + intel,ixp4xx-eb-t4: 34 + description: Hold timing, extend hold phase with n cycles. 35 + $ref: /schemas/types.yaml#/definitions/uint32 36 + maximum: 3 37 + 38 + intel,ixp4xx-eb-t5: 39 + description: Recovery timing, extend recovery phase with n cycles. 40 + $ref: /schemas/types.yaml#/definitions/uint32 41 + maximum: 15 42 + 43 + intel,ixp4xx-eb-cycle-type: 44 + description: The type of cycles to use on the expansion bus for this 45 + chip select. 0 = Intel cycles, 1 = Motorola cycles, 2 = HPI cycles. 46 + $ref: /schemas/types.yaml#/definitions/uint32 47 + enum: [0, 1, 2] 48 + 49 + intel,ixp4xx-eb-byte-access-on-halfword: 50 + description: Allow byte read access on half word devices. 51 + $ref: /schemas/types.yaml#/definitions/uint32 52 + enum: [0, 1] 53 + 54 + intel,ixp4xx-eb-hpi-hrdy-pol-high: 55 + description: Set HPI HRDY polarity to active high when using HPI. 56 + $ref: /schemas/types.yaml#/definitions/uint32 57 + enum: [0, 1] 58 + 59 + intel,ixp4xx-eb-mux-address-and-data: 60 + description: Multiplex address and data on the data bus. 61 + $ref: /schemas/types.yaml#/definitions/uint32 62 + enum: [0, 1] 63 + 64 + intel,ixp4xx-eb-ahb-split-transfers: 65 + description: Enable AHB split transfers. 66 + $ref: /schemas/types.yaml#/definitions/uint32 67 + enum: [0, 1] 68 + 69 + intel,ixp4xx-eb-write-enable: 70 + description: Enable write cycles. 71 + $ref: /schemas/types.yaml#/definitions/uint32 72 + enum: [0, 1] 73 + 74 + intel,ixp4xx-eb-byte-access: 75 + description: Expansion bus uses only 8 bits. The default is to use 76 + 16 bits. 77 + $ref: /schemas/types.yaml#/definitions/uint32 78 + enum: [0, 1] 79 + 80 + additionalProperties: true
+1
Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml
··· 34 34 # The controller specific properties go here. 35 35 allOf: 36 36 - $ref: st,stm32-fmc2-ebi-props.yaml# 37 + - $ref: intel,ixp4xx-expansion-peripheral-props.yaml# 37 38 38 39 additionalProperties: true
+1 -1
MAINTAINERS
··· 2326 2326 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2327 2327 S: Maintained 2328 2328 F: Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml 2329 - F: Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml 2329 + F: Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion* 2330 2330 F: Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt 2331 2331 F: Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml 2332 2332 F: Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml