ASPEED sgpio driver enhancement.
Subsystems (3)
v5 cover ASPEED sgpio driver enhancement.
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins, AST2500/AST2400 SoC has 1 SGPIO master interface that supports up to 80 pins.
In the current driver design, the max number of sgpio pins is hardcoded in macro MAX_NR_HW_SGPIO and the value is 80.
For supporting sgpio master interfaces of AST2600 SoC, the patch series contains the following enhancement:
- Convert txt dt-bindings to yaml.
- Update aspeed-g6 dtsi to support the enhanced sgpio.
- Define max number of gpio pins in ast2600 platform data. Old chip uses the original hardcoded value.
- Support muiltiple SGPIO master interfaces.
- Support up to 128 pins.
- Support wdt reset tolerance.
- Fix irq_chip issues which causes multiple sgpio devices use the same irq_chip data.
- Replace all of_*() APIs with device_*().
Changes from v4:
* Remove ngpios from dtsi
* Add ast2400 and ast2500 platform data.
* Remove unused macros.
* Add ngpios check in a separate patch.
* Fix coding style issues.
Changes from v3:
* Split dt-bindings patch to 2 patches
* Rename ast2600-sgpiom1 compatible with ast2600-sgiom-128
* Rename ast2600-sgpiom2 compatible with ast2600-sgiom-80
* Correct the typo in commit messages.
* Fix coding style issues.
* Replace all of_*() APIs with device_*().
Changes from v2:
* Remove maximum/minimum of ngpios from bindings.
* Remove max-ngpios from bindings and dtsi.
* Remove ast2400-sgpiom and ast2500-sgpiom compatibles from dts and driver.
* Add ast2600-sgpiom1 and ast2600-sgpiom2 compatibles as their max number of available gpio pins are different.
* Modify functions to pass aspeed_sgpio struct instead of passing max_ngpios.
* Split sgpio driver patch to 3 patches
Changes from v1:
* Fix yaml format issues.
* Fix issues reported by kernel test robot.
Please help to review.
Thanks,
Steven
Steven Lee (10):
dt-bindings: aspeed-sgpio: Convert txt bindings to yaml.
dt-bindings: aspeed-sgpio: Add ast2600 sgpio compatibles.
ARM: dts: aspeed-g6: Add SGPIO node.
ARM: dts: aspeed-g5: Remove ngpios from sgpio node.
gpio: gpio-aspeed-sgpio: Add AST2600 sgpio support
gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
gpio: gpio-aspeed-sgpio: Add set_config function
gpio: gpio-aspeed-sgpio: Move irq_chip to aspeed-sgpio struct
gpio: gpio-aspeed-sgpio: Use generic device property APIs
gpio: gpio-aspeed-sgpio: Return error if ngpios is not multiple of 8.
.../bindings/gpio/aspeed,sgpio.yaml | 78 +++++++ .../devicetree/bindings/gpio/sgpio-aspeed.txt | 46 ---- arch/arm/boot/dts/aspeed-g5.dtsi | 1 - arch/arm/boot/dts/aspeed-g6.dtsi | 28 +++ drivers/gpio/gpio-aspeed-sgpio.c | 206 ++++++++++++------ 5 files changed, 248 insertions(+), 111 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml delete mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt
Signature · 1 line
2.17.1
PATCH v5 1/10 dt-bindings: aspeed-sgpio: Convert txt bindings to yaml.
sgpio-aspeed bindings should be converted to yaml format.
--- .../bindings/gpio/aspeed,sgpio.yaml | 75 +++++++++++++++++++ .../devicetree/bindings/gpio/sgpio-aspeed.txt | 46 ------------ 2 files changed, 75 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml delete mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +75 -0
@@ -0,0 +1,75 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/aspeed,sgpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed SGPIO controller + +maintainers: + - Andrew Jeffery <[email protected]> + +description: + This SGPIO controller is for ASPEED AST2500 SoC, it supports up to 80 full + featured Serial GPIOs. Each of the Serial GPIO pins can be programmed to + support the following options + - Support interrupt option for each input port and various interrupt + sensitivity option (level-high, level-low, edge-high, edge-low) + - Support reset tolerance option for each output port + - Directly connected to APB bus and its shift clock is from APB bus clock + divided by a programmable value. + - Co-work with external signal-chained TTL components (74LV165/74LV595) + +properties: + compatible: + enum: + - aspeed,ast2400-sgpio + - aspeed,ast2500-sgpio + + reg: + maxItems: 1 + + gpio-controller: true + + '#gpio-cells': + const: 2 + + interrupts: + maxItems: 1 + + interrupt-controller: true + + clocks: + maxItems: 1 + + ngpios: true + + bus-frequency: true + +required: + - compatible + - reg + - gpio-controller + - '#gpio-cells' + - interrupts + - interrupt-controller + - ngpios + - clocks + - bus-frequency + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/aspeed-clock.h> + sgpio: sgpio at 1e780200 { + #gpio-cells = <2>; + compatible = "aspeed,ast2500-sgpio"; + gpio-controller; + interrupts = <40>; + reg = <0x1e780200 0x0100>; + clocks = <&syscon ASPEED_CLK_APB>; + interrupt-controller; + ngpios = <80>; + bus-frequency = <12000000>; + };
Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt deleted +0 -46
46 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v5 01/10] dt-bindings: aspeed-sgpio: Convert txt bindings to yaml.
Quoted 58 lines · Steven Lee
sgpio-aspeed bindings should be converted to yaml format.
Signed-off-by Steven Lee <[email protected]>--- .../bindings/gpio/aspeed,sgpio.yaml | 75 +++++++++++++++++++ .../devicetree/bindings/gpio/sgpio-aspeed.txt | 46 ------------ 2 files changed, 75 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml delete mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txtDocumentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +13
-0@@ -0,0 +1,75 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/aspeed,sgpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed SGPIO controller + +maintainers: + - Andrew Jeffery <[email protected]> + +description: + This SGPIO controller is for ASPEED AST2500 SoC, it supports up to80 full
+ featured Serial GPIOs. Each of the Serial GPIO pins can be programmed toDocumentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +5
-0+ support the following options + - Support interrupt option for each input port and various interrupt + sensitivity option (level-high, level-low, edge-high, edge-low) + - Support reset tolerance option for each output port + - Directly connected to APB bus and its shift clock is from APB busclock
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +2
-0+ divided by a programmable value. + - Co-work with external signal-chained TTL components(74LV165/74LV595)
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +16
-0+ +properties: + compatible: + enum: + - aspeed,ast2400-sgpio + - aspeed,ast2500-sgpio + + reg: + maxItems: 1 + + gpio-controller: true + + '#gpio-cells': + const: 2 + + interrupts:
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml line 47
Quoted 10 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml new file +10
-0+ maxItems: 1 + + interrupt-controller: true + + clocks: + maxItems: 1 + + ngpios: true + + bus-frequency: true
I'm not familiar enough with dt-schema to know that this does what we need, so deferring to Rob.
Looks good otherwise.
Andrew
Re: [PATCH v5 01/10] dt-bindings: aspeed-sgpio: Convert txt bindings to yaml.
In reply to Steven LeeQuoted 10 lines · Steven Lee
sgpio-aspeed bindings should be converted to yaml format.
Signed-off-by Steven Lee <[email protected]>--- .../bindings/gpio/aspeed,sgpio.yaml | 75 +++++++++++++++++++ .../devicetree/bindings/gpio/sgpio-aspeed.txt | 46 ------------ 2 files changed, 75 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml delete mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt
PATCH v5 2/10 dt-bindings: aspeed-sgpio: Add ast2600 sgpio compatibles.
In reply to Steven LeeAST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins. Add ast2600-sgpiom0-80 and ast2600-sgpiom-128 compatibles and update descriptions to introduce the max number of available gpio pins that AST2600 supported.
--- Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +6 -3
@@ -10,9 +10,10 @@ maintainers: - Andrew Jeffery <[email protected]> description: - This SGPIO controller is for ASPEED AST2500 SoC, it supports up to 80 full - featured Serial GPIOs. Each of the Serial GPIO pins can be programmed to - support the following options + This SGPIO controller is for ASPEED AST2400, AST2500 and AST2600 SoC, + AST2600 have two sgpio master one with 128 pins another one with 80 pins, + AST2500/AST2400 have one sgpio master with 80 pins. Each of the Serial + GPIO pins can be programmed to support the following options - Support interrupt option for each input port and various interrupt sensitivity option (level-high, level-low, edge-high, edge-low) - Support reset tolerance option for each output port
@@ -25,6 +26,8 @@ properties: enum: - aspeed,ast2400-sgpio - aspeed,ast2500-sgpio + - aspeed,ast2600-sgpiom-80 + - aspeed,ast2600-sgpiom-128 reg: maxItems: 1
Signature · 1 line
2.17.1
Rob Herring
maintainerRe: [PATCH v5 02/10] dt-bindings: aspeed-sgpio: Add ast2600 sgpio compatibles.
Quoted 30 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins. Add ast2600-sgpiom0-80 and ast2600-sgpiom-128 compatibles and update descriptions to introduce the max number of available gpio pins that AST2600 supported.
Signed-off-by Steven Lee <[email protected]>Reviewed-by Andrew Jeffery <[email protected]>--- Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +4
-3@@ -10,9 +10,10 @@ maintainers: - Andrew Jeffery <[email protected]> description: - This SGPIO controller is for ASPEED AST2500 SoC, it supports up to 80 full - featured Serial GPIOs. Each of the Serial GPIO pins can be programmed to - support the following options + This SGPIO controller is for ASPEED AST2400, AST2500 and AST2600 SoC, + AST2600 have two sgpio master one with 128 pins another one with 80 pins, + AST2500/AST2400 have one sgpio master with 80 pins. Each of the Serial + GPIO pins can be programmed to support the following options - Support interrupt option for each input port and various interrupt sensitivity option (level-high, level-low, edge-high, edge-low) - Support reset tolerance option for each output port
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml properties: · line 30
Quoted 5 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +2
-0@@ -25,6 +26,8 @@ properties: enum: - aspeed,ast2400-sgpio - aspeed,ast2500-sgpio + - aspeed,ast2600-sgpiom-80 + - aspeed,ast2600-sgpiom-128
If the number of GPIOs is the only difference, then I don't think you should get rid of ngpios. It's one thing if it varies from one SoC to the next, but if something is per instance we should have a property.
Rob
Re: [PATCH v5 02/10] dt-bindings: aspeed-sgpio: Add ast2600 sgpio compatibles.
Quoted 32 lines · Rob Herring
Quoted 31 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins. Add ast2600-sgpiom0-80 and ast2600-sgpiom-128 compatibles and update descriptions to introduce the max number of available gpio pins that AST2600 supported.
Signed-off-by Steven Lee <[email protected]>Reviewed-by Andrew Jeffery <[email protected]>--- Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +4
-3@@ -10,9 +10,10 @@ maintainers: - Andrew Jeffery <[email protected]> description: - This SGPIO controller is for ASPEED AST2500 SoC, it supports up to 80 full - featured Serial GPIOs. Each of the Serial GPIO pins can be programmed to - support the following options + This SGPIO controller is for ASPEED AST2400, AST2500 and AST2600 SoC, + AST2600 have two sgpio master one with 128 pins another one with 80 pins, + AST2500/AST2400 have one sgpio master with 80 pins. Each of the Serial + GPIO pins can be programmed to support the following options - Support interrupt option for each input port and various interrupt sensitivity option (level-high, level-low, edge-high, edge-low) - Support reset tolerance option for each output port@@ -25,6 +26,8 @@ properties: enum:
Quoted 9 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml properties: · line 30
Quoted 4 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +2
-0- aspeed,ast2400-sgpio - aspeed,ast2500-sgpio + - aspeed,ast2600-sgpiom-80 + - aspeed,ast2600-sgpiom-128If the number of GPIOs is the only difference, then I don't think you should get rid of ngpios. It's one thing if it varies from one SoC to the next, but if something is per instance we should have a property.
There are two issues:
1. The maximum number of GPIOs supported by the controller
2. The maximum number of GPIOs supported by the platform
These are different because of what the controller does - here's some previous discussion on the topic:
https://lore.kernel.org/linux-gpio/f2875111-9ba9-43b7-b2a4-d00c8725f5a0 at www.fastmail.com/
We've used ngpios to describe 2; this decision was made prior to the 2600 design - the SGPIO controller for both the 2400 and 2500 supported a maximum of 80 GPIOs. With the 2600 we have to differentiate between the two SGPIO controllers because they support a different maximum number of GPIOs. The proposed approach of different compatibles keeps the behaviour of ngpios the same across all controller implementations.
Cheers,
Andrew
Re: [PATCH v5 02/10] dt-bindings: aspeed-sgpio: Add ast2600 sgpio compatibles.
Quoted 48 lines · Andrew Jeffery
Quoted 32 lines · Rob Herring
Quoted 31 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins. Add ast2600-sgpiom0-80 and ast2600-sgpiom-128 compatibles and update descriptions to introduce the max number of available gpio pins that AST2600 supported.
Signed-off-by Steven Lee <[email protected]>Reviewed-by Andrew Jeffery <[email protected]>--- Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +4
-3@@ -10,9 +10,10 @@ maintainers: - Andrew Jeffery <[email protected]> description: - This SGPIO controller is for ASPEED AST2500 SoC, it supports up to 80 full - featured Serial GPIOs. Each of the Serial GPIO pins can be programmed to - support the following options + This SGPIO controller is for ASPEED AST2400, AST2500 and AST2600 SoC, + AST2600 have two sgpio master one with 128 pins another one with 80 pins, + AST2500/AST2400 have one sgpio master with 80 pins. Each of the Serial + GPIO pins can be programmed to support the following options - Support interrupt option for each input port and various interrupt sensitivity option (level-high, level-low, edge-high, edge-low) - Support reset tolerance option for each output port@@ -25,6 +26,8 @@ properties: enum:Quoted 9 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml properties: · line 30
Quoted 4 lines
Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml +2
-0- aspeed,ast2400-sgpio - aspeed,ast2500-sgpio + - aspeed,ast2600-sgpiom-80 + - aspeed,ast2600-sgpiom-128If the number of GPIOs is the only difference, then I don't think you should get rid of ngpios. It's one thing if it varies from one SoC to the next, but if something is per instance we should have a property.
There are two issues:
Quoted 8 lines
1. The maximum number of GPIOs supported by the controller
2. The maximum number of GPIOs supported by the platformThese are different because of what the controller does - here's some previous discussion on the topic:
https://lore.kernel.org/linux-gpio/f2875111-9ba9-43b7-b2a4-d00c8725f5a0 at www.fastmail.com/
We've used ngpios to describe 2; this decision was made prior to the 2600 design - the SGPIO controller for both the 2400 and 2500 supported a maximum of 80 GPIOs. With the 2600 we have to differentiate between the two SGPIO controllers because they support a different maximum number of GPIOs. The proposed approach of different compatibles keeps the behaviour of ngpios the same across all controller implementations.
Okay, that makes sense.
PATCH v5 3/10 ARM: dts: aspeed-g6: Add SGPIO node.
In reply to Steven LeeAST2600 supports 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +28 -0
@@ -377,6 +377,34 @@ #interrupt-cells = <2>; }; + sgpiom0: sgpiom at 1e780500 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-128"; + reg = <0x1e780500 0x100>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>; + interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm1_default>; + status = "disabled"; + }; + + sgpiom1: sgpiom at 1e780600 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-80"; + reg = <0x1e780600 0x100>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>; + interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm2_default>; + status = "disabled"; + }; + gpio1: gpio at 1e780800 { #gpio-cells = <2>; gpio-controller;
Signature · 1 line
2.17.1
Re: [PATCH v5 03/10] ARM: dts: aspeed-g6: Add SGPIO node.
Quoted 13 lines · Steven Lee
AST2600 supports 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
Signed-off-by Steven Lee <[email protected]>--- arch/arm/boot/dts/aspeed-g6.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm/boot/dts/aspeed-g6.dtsi +0
-0
arch/arm/boot/dts/aspeed-g6.dtsi line 386
Quoted 10 lines
arch/arm/boot/dts/aspeed-g6.dtsi +7
-0@@ -377,6 +377,34 @@ #interrupt-cells = <2>; }; + sgpiom0: sgpiom at 1e780500 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-128"; + reg = <0x1e780500 0x100>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>;
The example in the binding document used ASPEED_CLK_APB. Which is correct? I assume ASPEED_CLK_APB2?
Quoted 33 lines
arch/arm/boot/dts/aspeed-g6.dtsi +21
-0+ interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm1_default>; + status = "disabled"; + }; + + sgpiom1: sgpiom at 1e780600 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-80"; + reg = <0x1e780600 0x100>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>; + interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm2_default>; + status = "disabled"; + }; + gpio1: gpio at 1e780800 { #gpio-cells = <2>; gpio-controller;Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v5 03/10] ARM: dts: aspeed-g6: Add SGPIO node.
Quoted 19 lines · Andrew Jeffery
Quoted 16 lines · Steven Lee
AST2600 supports 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
Signed-off-by Steven Lee <[email protected]>--- arch/arm/boot/dts/aspeed-g6.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm/boot/dts/aspeed-g6.dtsi +0
-0@@ -377,6 +377,34 @@ #interrupt-cells = <2>; };
Quoted 10 lines
arch/arm/boot/dts/aspeed-g6.dtsi line 386
Quoted 7 lines
arch/arm/boot/dts/aspeed-g6.dtsi +7
-0+ sgpiom0: sgpiom at 1e780500 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-128"; + reg = <0x1e780500 0x100>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>;The example in the binding document used
ASPEED_CLK_APB. Which is correct? I assumeASPEED_CLK_APB2?
The example in the binding document is for aspeed-g5. aspeed-g5 and aspeed-g6 use different clocks. Should I add a new patch for adding an example for aspeed-g6?
Quoted 33 lines
Quoted 33 lines
arch/arm/boot/dts/aspeed-g6.dtsi +21
-0+ interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm1_default>; + status = "disabled"; + }; + + sgpiom1: sgpiom at 1e780600 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-80"; + reg = <0x1e780600 0x100>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>; + interrupt-controller; + bus-frequency = <12000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sgpm2_default>; + status = "disabled"; + }; + gpio1: gpio at 1e780800 { #gpio-cells = <2>; gpio-controller;Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Andrew Jeffery
Reviewed-byRe: [PATCH v5 03/10] ARM: dts: aspeed-g6: Add SGPIO node.
Quoted 31 lines · Steven Lee
Quoted 19 lines · Andrew Jeffery
Quoted 16 lines · Steven Lee
AST2600 supports 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
Signed-off-by Steven Lee <[email protected]>--- arch/arm/boot/dts/aspeed-g6.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm/boot/dts/aspeed-g6.dtsi +0
-0@@ -377,6 +377,34 @@ #interrupt-cells = <2>; };Quoted 10 lines
arch/arm/boot/dts/aspeed-g6.dtsi line 386
Quoted 7 lines
arch/arm/boot/dts/aspeed-g6.dtsi +7
-0+ sgpiom0: sgpiom at 1e780500 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2600-sgpiom-128"; + reg = <0x1e780500 0x100>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_APB2>;The example in the binding document used
ASPEED_CLK_APB. Which is correct? I assumeASPEED_CLK_APB2?
Quoted 4 lines
The example in the binding document is for aspeed-g5. aspeed-g5 and aspeed-g6 use different clocks. Should I add a new patch for adding an example for aspeed-g6?
Oh, I missed that. Never mind then!
PATCH v5 4/10 ARM: dts: aspeed-g5: Remove ngpios from sgpio node.
In reply to Steven LeeRemove ngpios property from sgpio node as it should be defined in the platform dts.
--- arch/arm/boot/dts/aspeed-g5.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/aspeed-g5.dtsi +0 -1
@@ -351,7 +351,6 @@ reg = <0x1e780200 0x0100>; clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; - ngpios = <8>; bus-frequency = <12000000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sgpm_default>;
Signature · 1 line
2.17.1
Re: [PATCH v5 04/10] ARM: dts: aspeed-g5: Remove ngpios from sgpio node.
Quoted 4 lines · Steven Lee
Remove ngpios property from sgpio node as it should be defined in the platform dts.
Signed-off-by Steven Lee <[email protected]>
I guess someone will make some noise if this breaks them.
PATCH v5 5/10 gpio: gpio-aspeed-sgpio: Add AST2600 sgpio support
In reply to Steven LeeAST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
In the current driver, the maximum number of gpio pins of SoC is hardcoded as 80 and the gpio pin count mask for GPIO Configuration register is hardcode as GENMASK(9,6). In addition, some functions use the hardcoded value to calculate the gpio offset.
The patch adds ast2600 compatibles and platform data that includes the max number of gpio pins supported by ast2600 and gpio pin count mask for GPIO Configuration register.
The patch also modifies some functions to pass aspeed_sgpio struct for calculating gpio offset without using the hardcoded value.
--- drivers/gpio/gpio-aspeed-sgpio.c | 107 +++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 34 deletions(-)
drivers/gpio/gpio-aspeed-sgpio.c +73 -34
@@ -34,6 +34,12 @@#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0) +#define ASPEED_SGPIO_PINS_SHIFT 6 + +struct aspeed_sgpio_pdata { +const u32 pin_mask; +int max_ngpios; +};struct aspeed_sgpio {struct gpio_chip chip;
@@ -41,6 +47,7 @@ struct aspeed_sgpio {spinlock_t lock;void __iomem *base;int irq; +int max_ngpios;int n_sgpio; };
@@ -75,7 +82,13 @@ static const struct aspeed_sgpio_bank aspeed_sgpio_banks[] = { .val_regs = 0x0038, .rdata_reg = 0x0078, .irq_regs = 0x003C, - .names = { "I", "J" }, + .names = { "I", "J", "K", "L" }, + }, + { + .val_regs =0x0090 , + .rdata_reg = 0x007C, + .irq_regs = 0x0094, + .names = { "M", "N", "O", "P" }, }, };
@@ -121,15 +134,15 @@ static void __iomem *bank_reg(struct aspeed_sgpio *gpio, } } -#define GPIO_BANK (x) ((x % SGPIO_OUTPUT_OFFSET) >> 5) -#define GPIO_OFFSET (x) ((x % SGPIO_OUTPUT_OFFSET) & 0x1f) -#define GPIO_BIT (x) BIT(GPIO_OFFSET(x)) +#define GPIO_BANK (gpio, x) (((x) % (gpio)->max_ngpios) >> 5) +#define GPIO_OFFSET (x) ((x) & GENMASK(4, 0)) +#define GPIO_BIT (gpio, x) BIT(GPIO_OFFSET((x) % (gpio)->max_ngpios)) -static const struct aspeed_sgpio_bank *to_bank (unsigned int offset) +static const struct aspeed_sgpio_bank *to_bank (unsigned int offset,const struct aspeed_sgpio *gpio) {unsigned int bank; - bank =GPIO_BANK (offset); + bank =GPIO_BANK (gpio, offset);WARN_ON (bank >=ARRAY_SIZE (aspeed_sgpio_banks));return &aspeed_sgpio_banks[bank];
@@ -139,18 +152,19 @@ static int aspeed_sgpio_init_valid_mask(struct gpio_chip *gc, unsigned long *valid_mask, unsigned int ngpios) {struct aspeed_sgpio *sgpio =gpiochip_get_data (gc); +int max_ngpios = sgpio->max_ngpios;int n = sgpio->n_sgpio; -int c =SGPIO_OUTPUT_OFFSET - n; +int c = max_ngpios - n; -WARN_ON (ngpios <MAX_NR_HW_SGPIO *2 ); +WARN_ON (ngpios < max_ngpios *2 );/* input GPIOs in the lower range */ bitmap_set (valid_mask,0 , n);bitmap_clear (valid_mask, n, c); -/* output GPIOS above SGPIO_OUTPUT_OFFSET */ -bitmap_set (valid_mask,SGPIO_OUTPUT_OFFSET , n); -bitmap_clear (valid_mask,SGPIO_OUTPUT_OFFSET + n, c); +/* output GPIOS above max_ngpios */ +bitmap_set (valid_mask, max_ngpios, n); +bitmap_clear (valid_mask, max_ngpios + n, c);return 0 ; }
@@ -161,30 +175,30 @@ static void aspeed_sgpio_irq_init_valid_mask(struct gpio_chip *gc,struct aspeed_sgpio *sgpio =gpiochip_get_data (gc);int n = sgpio->n_sgpio; -WARN_ON (ngpios <MAX_NR_HW_SGPIO *2 ); +WARN_ON (ngpios < sgpio->max_ngpios *2 );/* input GPIOs in the lower range */ bitmap_set (valid_mask,0 , n);bitmap_clear (valid_mask, n, ngpios - n); } -static bool aspeed_sgpio_is_input (unsigned int offset) +static bool aspeed_sgpio_is_input (unsigned int offset,const struct aspeed_sgpio *gpio) { -return offset <SGPIO_OUTPUT_OFFSET ; +return offset < gpio->max_ngpios; }static int aspeed_sgpio_get (struct gpio_chip *gc,unsigned int offset) {struct aspeed_sgpio *gpio =gpiochip_get_data (gc); -const struct aspeed_sgpio_bank *bank =to_bank (offset); +const struct aspeed_sgpio_bank *bank =to_bank (offset, gpio);unsigned long flags;enum aspeed_sgpio_reg reg;int rc =0 ;spin_lock_irqsave (&gpio->lock, flags); - reg =aspeed_sgpio_is_input (offset) ? reg_val : reg_rdata; - rc = !!(ioread32 (bank_reg (gpio, bank, reg)) &GPIO_BIT (offset)); + reg =aspeed_sgpio_is_input (offset, gpio) ? reg_val : reg_rdata; + rc = !!(ioread32 (bank_reg (gpio, bank, reg)) &GPIO_BIT (gpio, offset));spin_unlock_irqrestore (&gpio->lock, flags);
@@ -194,11 +208,11 @@ static int aspeed_sgpio_get(struct gpio_chip *gc, unsigned int offset)static int sgpio_set_value (struct gpio_chip *gc,unsigned int offset,int val) {struct aspeed_sgpio *gpio =gpiochip_get_data (gc); -const struct aspeed_sgpio_bank *bank =to_bank (offset); +const struct aspeed_sgpio_bank *bank =to_bank (offset, gpio);void __iomem *addr_r, *addr_w;u32 reg =0 ; -if (aspeed_sgpio_is_input (offset)) +if (aspeed_sgpio_is_input (offset, gpio))return -EINVAL ;/* Since this is an output, read the cached value from rdata, then
@@ -209,9 +223,9 @@ static int sgpio_set_value(struct gpio_chip *gc, unsigned int offset, int val) reg =ioread32 (addr_r);if (val) - reg |=GPIO_BIT (offset); + reg |=GPIO_BIT (gpio, offset);else - reg &= ~GPIO_BIT (offset); + reg &= ~GPIO_BIT (gpio, offset);iowrite32 (reg, addr_w);
@@ -232,7 +246,9 @@ static void aspeed_sgpio_set(struct gpio_chip *gc, unsigned int offset, int val)static int aspeed_sgpio_dir_in (struct gpio_chip *gc,unsigned int offset) { -return aspeed_sgpio_is_input (offset) ?0 : -EINVAL ; +struct aspeed_sgpio *gpio =gpiochip_get_data (gc); + +return aspeed_sgpio_is_input (offset, gpio) ?0 : -EINVAL ; }static int aspeed_sgpio_dir_out (struct gpio_chip *gc,unsigned int offset,int val)
@@ -253,7 +269,9 @@ static int aspeed_sgpio_dir_out(struct gpio_chip *gc, unsigned int offset, int vstatic int aspeed_sgpio_get_direction (struct gpio_chip *gc,unsigned int offset) { -return !!aspeed_sgpio_is_input (offset); +struct aspeed_sgpio *gpio =gpiochip_get_data (gc); + +return !!aspeed_sgpio_is_input (offset, gpio); } static void irqd_to_aspeed_sgpio_data(struct irq_data *d,
@@ -268,8 +286,8 @@ static void irqd_to_aspeed_sgpio_data(struct irq_data *d,WARN_ON (!internal); *gpio = internal; - *bank =to_bank (*offset); - *bit =GPIO_BIT (*offset); + *bank =to_bank (*offset, internal); + *bit =GPIO_BIT (internal, *offset); }static void aspeed_sgpio_irq_ack (struct irq_data *d)
@@ -466,9 +484,21 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,return 0 ; } +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { + .max_ngpios =128 , + .pin_mask =GENMASK (10 ,6 ), +}; + +static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (10 ,6 ), +}; +static const struct of_device_id aspeed_sgpio_of_table[] = { { .compatible ="aspeed,ast2400-sgpio" }, { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2600-sgpiom-128" , .data = &ast2600_sgpiom_128_pdata, }, + { .compatible ="aspeed,ast2600-sgpiom-80" , .data = &ast2600_sgpiom_80_pdata, }, {} };
@@ -476,10 +506,11 @@ MODULE_DEVICE_TABLE(of, aspeed_sgpio_of_table);static int __init aspeed_sgpio_probe (struct platform_device *pdev) { +u32 nr_gpios, sgpio_freq, sgpio_clk_div, gpio_cnt_regval, pin_mask; +const struct aspeed_sgpio_pdata *pdata;struct aspeed_sgpio *gpio; -u32 nr_gpios, sgpio_freq, sgpio_clk_div; -int rc;unsigned long apb_freq; +int rc; gpio =devm_kzalloc (&pdev->dev,sizeof (*gpio),GFP_KERNEL );if (!gpio)
@@ -489,13 +520,22 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)if (IS_ERR (gpio->base))return PTR_ERR (gpio->base); + pdata =device_get_match_data (&pdev->dev); +if (pdata) { + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask; + }else { + gpio->max_ngpios =MAX_NR_HW_SGPIO ; + pin_mask =ASPEED_SGPIO_PINS_MASK ; + } + rc =of_property_read_u32 (pdev->dev.of_node,"ngpios" , &nr_gpios);if (rc <0 ) {dev_err (&pdev->dev,"Could not read ngpios property\n" );return -EINVAL ; - }else if (nr_gpios >MAX_NR_HW_SGPIO ) { + }else if (nr_gpios > gpio->max_ngpios) {dev_err (&pdev->dev,"Number of GPIOs exceeds the maximum of %d: %d\n" , -MAX_NR_HW_SGPIO , nr_gpios); + gpio->max_ngpios, nr_gpios);return -EINVAL ; } gpio->n_sgpio = nr_gpios;
@@ -531,15 +571,14 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)if (sgpio_clk_div > (1 <<16 ) -1 )return -EINVAL ; -iowrite32 (FIELD_PREP (ASPEED_SGPIO_CLK_DIV_MASK , sgpio_clk_div) | -FIELD_PREP (ASPEED_SGPIO_PINS_MASK , (nr_gpios /8 )) | -ASPEED_SGPIO_ENABLE , - gpio->base +ASPEED_SGPIO_CTRL ); + gpio_cnt_regval = ((nr_gpios /8 ) <<ASPEED_SGPIO_PINS_SHIFT ) & pin_mask; +iowrite32 (FIELD_PREP (ASPEED_SGPIO_CLK_DIV_MASK , sgpio_clk_div) | gpio_cnt_regval | +ASPEED_SGPIO_ENABLE , gpio->base +ASPEED_SGPIO_CTRL );spin_lock_init (&gpio->lock); gpio->chip.parent = &pdev->dev; - gpio->chip.ngpio =MAX_NR_HW_SGPIO *2 ; + gpio->chip.ngpio = gpio->max_ngpios *2 ; gpio->chip.init_valid_mask = aspeed_sgpio_init_valid_mask; gpio->chip.direction_input = aspeed_sgpio_dir_in; gpio->chip.direction_output = aspeed_sgpio_dir_out;
Signature · 1 line
2.17.1
Re: [PATCH v5 05/10] gpio: gpio-aspeed-sgpio: Add AST2600 sgpio support
Quoted 62 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins.
In the current driver, the maximum number of gpio pins of SoC is hardcoded as 80 and the gpio pin count mask for GPIO Configuration register is hardcode asGENMASK(9,6). In addition, some functions use the hardcoded value to calculate the gpio offset.
The patch adds ast2600 compatibles and platform data that includes the max number of gpio pins supported by ast2600 and gpio pin count mask for GPIO Configuration register.
The patch also modifies some functions to passaspeed_sgpiostruct for calculating gpio offset without using the hardcoded value.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 107 +++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 34 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +14
-1@@ -34,6 +34,12 @@#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0) +#define ASPEED_SGPIO_PINS_SHIFT 6 + +struct aspeed_sgpio_pdata { +const u32 pin_mask; +int max_ngpios; +};struct aspeed_sgpio {struct gpio_chip chip;@@ -41,6 +47,7 @@ struct aspeed_sgpio {spinlock_t lock;void __iomem *base;int irq; +int max_ngpios;int n_sgpio; };@@ -75,7 +82,13 @@ static const struct aspeed_sgpio_bank aspeed_sgpio_banks[] = { .val_regs =0x0038 , .rdata_reg =0x0078 , .irq_regs =0x003C , - .names = {"I" ,"J" }, + .names = {"I" ,"J" ,"K" ,"L" }, + }, + { + .val_regs = 0x0090, + .rdata_reg = 0x007C, + .irq_regs = 0x0094, + .names = { "M", "N", "O", "P" }, }, };@@ -121,15 +134,15 @@ static void __iomem *bank_reg(struct aspeed_sgpio *gpio, } }
drivers/gpio/gpio-aspeed-sgpio.c static void __iomem *bank_reg(struct aspeed_sgpio *gpio, · line 142
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +4
-4-#define GPIO_BANK (x) ((x % SGPIO_OUTPUT_OFFSET) >> 5) -#define GPIO_OFFSET (x) ((x % SGPIO_OUTPUT_OFFSET) & 0x1f) -#define GPIO_BIT (x) BIT(GPIO_OFFSET(x)) +#define GPIO_BANK (gpio, x) (((x) % (gpio)->max_ngpios) >> 5) +#define GPIO_OFFSET (x) ((x) & GENMASK(4, 0)) +#define GPIO_BIT (gpio, x) BIT(GPIO_OFFSET((x) % (gpio)->max_ngpios)) -static const struct aspeed_sgpio_bank *to_bank (unsigned int offset) +static const struct aspeed_sgpio_bank *to_bank (unsigned int offset,const struct aspeed_sgpio *gpio)
Bit of a nit-pick, but again here, the context pointer (const struct aspeed_sgpio *) should be the first argument.
Quoted 147 lines
drivers/gpio/gpio-aspeed-sgpio.c +1
-1{unsigned int bank; - bank =GPIO_BANK (offset); + bank =GPIO_BANK (gpio, offset);WARN_ON (bank >=ARRAY_SIZE (aspeed_sgpio_banks));drivers/gpio/gpio-aspeed-sgpio.c +6
-5return &aspeed_sgpio_banks[bank];@@ -139,18 +152,19 @@ static int aspeed_sgpio_init_valid_mask(structgpio_chip *gc, unsigned long *valid_mask, unsigned int ngpios) { struct aspeed_sgpio *sgpio = gpiochip_get_data(gc); +int max_ngpios = sgpio->max_ngpios;int n = sgpio->n_sgpio; -int c =SGPIO_OUTPUT_OFFSET - n; +int c = max_ngpios - n; -WARN_ON (ngpios <MAX_NR_HW_SGPIO *2 ); +WARN_ON (ngpios < max_ngpios *2 );/* input GPIOs in the lower range */ bitmap_set (valid_mask,0 , n);bitmap_clear (valid_mask, n, c); -/* output GPIOS above SGPIO_OUTPUT_OFFSET */ -bitmap_set (valid_mask,SGPIO_OUTPUT_OFFSET , n); -bitmap_clear (valid_mask,SGPIO_OUTPUT_OFFSET + n, c); +/* output GPIOS above max_ngpios */ +bitmap_set (valid_mask, max_ngpios, n); +bitmap_clear (valid_mask, max_ngpios + n, c);return 0 ;}
drivers/gpio/gpio-aspeed-sgpio.c +6
-6@@ -161,30 +175,30 @@ static void aspeed_sgpio_irq_init_valid_mask(struct gpio_chip *gc, struct aspeed_sgpio *sgpio = gpiochip_get_data(gc);int n = sgpio->n_sgpio; -WARN_ON (ngpios <MAX_NR_HW_SGPIO *2 ); +WARN_ON (ngpios < sgpio->max_ngpios *2 );/* input GPIOs in the lower range */ bitmap_set (valid_mask,0 , n);bitmap_clear (valid_mask, n, ngpios - n); } -static bool aspeed_sgpio_is_input (unsigned int offset) +static bool aspeed_sgpio_is_input (unsigned int offset,const struct aspeed_sgpio *gpio) { -return offset <SGPIO_OUTPUT_OFFSET ; +return offset < gpio->max_ngpios; }static int aspeed_sgpio_get (struct gpio_chip *gc,unsigned int offset) {struct aspeed_sgpio *gpio =gpiochip_get_data (gc); -const struct aspeed_sgpio_bank *bank =to_bank (offset); +const struct aspeed_sgpio_bank *bank =to_bank (offset, gpio);unsigned long flags;enum aspeed_sgpio_reg reg;int rc =0 ;spin_lock_irqsave (&gpio->lock, flags); - reg =aspeed_sgpio_is_input (offset) ? reg_val : reg_rdata; - rc = !!(ioread32 (bank_reg (gpio, bank, reg)) &GPIO_BIT (offset)); + reg =aspeed_sgpio_is_input (offset, gpio) ? reg_val : reg_rdata; + rc = !!(ioread32 (bank_reg (gpio, bank, reg)) &GPIO_BIT (gpio, offset));drivers/gpio/gpio-aspeed-sgpio.c +2
-2spin_unlock_irqrestore (&gpio->lock, flags);@@ -194,11 +208,11 @@ static int aspeed_sgpio_get(struct gpio_chip *gc, unsigned int offset)static int sgpio_set_value (struct gpio_chip *gc,unsigned int offset,int val) {struct aspeed_sgpio *gpio =gpiochip_get_data (gc); -const struct aspeed_sgpio_bank *bank =to_bank (offset); +const struct aspeed_sgpio_bank *bank =to_bank (offset, gpio);void __iomem *addr_r, *addr_w;u32 reg =0 ; -if (aspeed_sgpio_is_input (offset)) +if (aspeed_sgpio_is_input (offset, gpio))return -EINVAL ;drivers/gpio/gpio-aspeed-sgpio.c +5
-3/* Since this is an output, read the cached value from rdata, then @@ -209,9 +223,9 @@ static int sgpio_set_value(struct gpio_chip *gc, unsigned int offset, int val) reg =ioread32 (addr_r);if (val) - reg |=GPIO_BIT (offset); + reg |=GPIO_BIT (gpio, offset);else - reg &= ~GPIO_BIT (offset); + reg &= ~GPIO_BIT (gpio, offset);iowrite32 (reg, addr_w);@@ -232,7 +246,9 @@ static void aspeed_sgpio_set(struct gpio_chip *gc, unsigned int offset, int val)static int aspeed_sgpio_dir_in (struct gpio_chip *gc,unsigned int offset) { -return aspeed_sgpio_is_input (offset) ?0 : -EINVAL ; +struct aspeed_sgpio *gpio =gpiochip_get_data (gc); + +return aspeed_sgpio_is_input (offset, gpio) ?0 : -EINVAL ; }static int aspeed_sgpio_dir_out(struct
gpio_chip*gc, unsigned int
offset, int val)drivers/gpio/gpio-aspeed-sgpio.c +3
-1@@ -253,7 +269,9 @@ static int aspeed_sgpio_dir_out(struct gpio_chip *gc, unsigned int offset, int vstatic int aspeed_sgpio_get_direction (struct gpio_chip *gc,unsigned int offset) { -return !!aspeed_sgpio_is_input (offset); +struct aspeed_sgpio *gpio =gpiochip_get_data (gc); + +return !!aspeed_sgpio_is_input (offset, gpio); }static void irqd_to_aspeed_sgpio_data(struct
irq_data*d,drivers/gpio/gpio-aspeed-sgpio.c +5
-2@@ -268,8 +286,8 @@ static void irqd_to_aspeed_sgpio_data(struct irq_data *d,WARN_ON (!internal); *gpio = internal; - *bank =to_bank (*offset); - *bit =GPIO_BIT (*offset); + *bank =to_bank (*offset, internal); + *bit =GPIO_BIT (internal, *offset); }static void aspeed_sgpio_irq_ack (struct irq_data *d)@@ -466,9 +484,21 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { + .max_ngpios =128 , + .pin_mask =GENMASK (10 ,6 ),
drivers/gpio/gpio-aspeed-sgpio.c static int aspeed_sgpio_setup_irqs(struct · line 500
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +7
-0+}; + +static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (10 ,6 ), +}; +static const struct of_device_id aspeed_sgpio_of_table[] = { { .compatible ="aspeed,ast2400-sgpio" }, { .compatible ="aspeed,ast2500-sgpio" },
What happened to defining platform data for the 2400 and 2500 ...
Quoted 25 lines
drivers/gpio/gpio-aspeed-sgpio.c +2
-0+ { .compatible = "aspeed,ast2600-sgpiom-128", .data = &ast2600_sgpiom_128_pdata, }, + { .compatible = "aspeed,ast2600-sgpiom-80", .data = &ast2600_sgpiom_80_pdata, },drivers/gpio/gpio-aspeed-sgpio.c +3
-2{} };@@ -476,10 +506,11 @@ MODULE_DEVICE_TABLE(of, aspeed_sgpio_of_table);static int __init aspeed_sgpio_probe (struct platform_device *pdev) { +u32 nr_gpios, sgpio_freq, sgpio_clk_div, gpio_cnt_regval, pin_mask; +const struct aspeed_sgpio_pdata *pdata;struct aspeed_sgpio *gpio; -u32 nr_gpios, sgpio_freq, sgpio_clk_div; -int rc;unsigned long apb_freq; +int rc; gpio =devm_kzalloc (&pdev->dev,sizeof (*gpio),GFP_KERNEL );if (!gpio)@@ -489,13 +520,22 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)if (IS_ERR (gpio->base))return PTR_ERR (gpio->base);
drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 532
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +9
-0+ pdata =device_get_match_data (&pdev->dev); +if (pdata) { + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask; + }else { + gpio->max_ngpios =MAX_NR_HW_SGPIO ; + pin_mask =ASPEED_SGPIO_PINS_MASK ; + } +
... because we should avoid introducing this branch if possible.
Aside from these two minor issues, it looks okay to me.
Andrew
PATCH v5 6/10 gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
In reply to Steven LeeWe use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unused MAX_NR_HW_SGPIO and ASPEED_SGPIO_PINS_MASK macros.
--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)
drivers/gpio/gpio-aspeed-sgpio.c +12 -22
@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6
@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,return 0 ; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 , .pin_mask =GENMASK (10 ,6 ),
@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, }, { .compatible ="aspeed,ast2600-sgpiom-128" , .data = &ast2600_sgpiom_128_pdata, }, { .compatible ="aspeed,ast2600-sgpiom-80" , .data = &ast2600_sgpiom_80_pdata, }, {}
@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios; - pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask; rc =of_property_read_u32 (pdev->dev.of_node,"ngpios" , &nr_gpios);if (rc <0 ) {
Signature · 1 line
2.17.1
Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
Quoted 72 lines · Steven Lee
We use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unusedMAX_NR_HW_SGPIOandASPEED_SGPIO_PINS_MASKmacros.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +5
-13@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 ,drivers/gpio/gpio-aspeed-sgpio.c +2
-2.pin_mask = GENMASK(10, 6),@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, },{ .compatible = "aspeed,ast2600-sgpiom-128", .data =
&ast2600_sgpiom_128_pdata, },
{ .compatible = "aspeed,ast2600-sgpiom-80", .data =&ast2600_sgpiom_80_pdata, },drivers/gpio/gpio-aspeed-sgpio.c +0
-2{}@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios;
drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 521
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +5
-5- pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask;
Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch.
I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered.
Andrew
Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
Quoted 88 lines · Andrew Jeffery
Quoted 72 lines · Steven Lee
We use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unusedMAX_NR_HW_SGPIOandASPEED_SGPIO_PINS_MASKmacros.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +5
-13@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 ,drivers/gpio/gpio-aspeed-sgpio.c +2
-2.pin_mask = GENMASK(10, 6),@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, },{ .compatible = "aspeed,ast2600-sgpiom-128", .data =
&ast2600_sgpiom_128_pdata, },
{ .compatible = "aspeed,ast2600-sgpiom-80", .data =&ast2600_sgpiom_80_pdata, },drivers/gpio/gpio-aspeed-sgpio.c +0
-2{}@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios;drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 521
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +5
-5- pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask;Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch.
Quoted 2 lines
I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered.
I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05).
Thanks,
Steven
Quoted 1 line
Andrew
Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
Quoted 89 lines · Steven Lee
Quoted 88 lines · Andrew Jeffery
Quoted 72 lines · Steven Lee
We use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unusedMAX_NR_HW_SGPIOandASPEED_SGPIO_PINS_MASKmacros.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +5
-13@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 ,drivers/gpio/gpio-aspeed-sgpio.c +2
-2.pin_mask = GENMASK(10, 6),@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, },{ .compatible = "aspeed,ast2600-sgpiom-128", .data =
&ast2600_sgpiom_128_pdata, },
{ .compatible = "aspeed,ast2600-sgpiom-80", .data =&ast2600_sgpiom_80_pdata, },drivers/gpio/gpio-aspeed-sgpio.c +0
-2{}@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios;drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 521
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +5
-5- pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask;Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch.
Quoted 6 lines
Quoted 2 lines
I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered.
I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05).
Yeah, fair enough. Just squash them.
Cheers,
Andrew
Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
Quoted 100 lines · Andrew Jeffery
Quoted 89 lines · Steven Lee
Quoted 88 lines · Andrew Jeffery
Quoted 72 lines · Steven Lee
We use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unusedMAX_NR_HW_SGPIOandASPEED_SGPIO_PINS_MASKmacros.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +5
-13@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 ,.pin_mask =
GENMASK(10, 6),drivers/gpio/gpio-aspeed-sgpio.c +2
-2@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, },{ .compatible = "aspeed,ast2600-sgpiom-128", .data =
&ast2600_sgpiom_128_pdata, },
{ .compatible = "aspeed,ast2600-sgpiom-80", .data =&ast2600_sgpiom_80_pdata, },
{}drivers/gpio/gpio-aspeed-sgpio.c +0
-2@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios;drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 521
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +5
-5- pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask;Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch.
Quoted 6 lines
Quoted 2 lines
I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered.
I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05).
Quoted 5 lines
Yeah, fair enough. Just squash them.
Cheers,
Andrew
I'm ready to pick this up as soon as you respin the series.
Bart
Re: [PATCH v5 06/10] gpio: gpio-aspeed-sgpio: Add AST2400 and AST2500 platform data.
Quoted 101 lines · Bartosz Golaszewski
Quoted 100 lines · Andrew Jeffery
Quoted 95 lines · Steven Lee
Quoted 88 lines · Andrew Jeffery
Quoted 72 lines · Steven Lee
We use platform data to store GPIO pin mask and the max number of available GPIO pins for AST2600.
Refactor driver to also add the platform data for AST2400/AST2500 and remove unusedMAX_NR_HW_SGPIOandASPEED_SGPIO_PINS_MASKmacros.Signed-off-by Steven Lee <[email protected]>--- drivers/gpio/gpio-aspeed-sgpio.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-)drivers/gpio/gpio-aspeed-sgpio.c +5
-13@@ -17,21 +17,8 @@#include <linux/spinlock.h> #include <linux/string.h> -/* -* MAX_NR_HW_GPIO represents the number of actual hardware-supported GPIOs (ie, -* slots within the clocked serial GPIO data). Since each HW GPIO is both an -* input and an output, we provide MAX_NR_HW_GPIO * 2 lines on our gpiochip -* device. -* -* We use SGPIO_OUTPUT_OFFSET to define the split between the inputs and -* outputs; the inputs start at line 0, the outputs start at OUTPUT_OFFSET. -*/ -#define MAX_NR_HW_SGPIO 80 -#define SGPIO_OUTPUT_OFFSET MAX_NR_HW_SGPIO -#define ASPEED_SGPIO_CTRL 0x54 -#define ASPEED_SGPIO_PINS_MASK GENMASK(9, 6)#define ASPEED_SGPIO_CLK_DIV_MASK GENMASK(31, 16)#define ASPEED_SGPIO_ENABLE BIT(0)#define ASPEED_SGPIO_PINS_SHIFT 6@@ -484,6 +471,11 @@ static int aspeed_sgpio_setup_irqs(structaspeed_sgpio *gpio, return 0; } +static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { + .max_ngpios =80 , + .pin_mask =GENMASK (9 ,6 ), +}; +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 ,.pin_mask =
GENMASK(10, 6),drivers/gpio/gpio-aspeed-sgpio.c +2
-2@@ -495,8 +487,8 @@ static const struct aspeed_sgpio_pdata ast2600_sgpiom_80_pdata = { };static const struct of_device_id aspeed_sgpio_of_table[] = { - { .compatible ="aspeed,ast2400-sgpio" }, - { .compatible ="aspeed,ast2500-sgpio" }, + { .compatible ="aspeed,ast2400-sgpio" , .data = &ast2400_sgpio_pdata, }, + { .compatible ="aspeed,ast2500-sgpio" , .data = &ast2400_sgpio_pdata, },{ .compatible = "aspeed,ast2600-sgpiom-128", .data =
&ast2600_sgpiom_128_pdata, },
{ .compatible = "aspeed,ast2600-sgpiom-80", .data =&ast2600_sgpiom_80_pdata, },
{}drivers/gpio/gpio-aspeed-sgpio.c +0
-2@@ -521,13 +513,11 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)return PTR_ERR (gpio->base); pdata =device_get_match_data (&pdev->dev); -if (pdata) { - gpio->max_ngpios = pdata->max_ngpios;drivers/gpio/gpio-aspeed-sgpio.c static int __init aspeed_sgpio_probe(struct · line 521
Quoted 10 lines
drivers/gpio/gpio-aspeed-sgpio.c +5
-5- pin_mask = pdata->pin_mask; - }else { - gpio->max_ngpios =MAX_NR_HW_SGPIO ; - pin_mask =ASPEED_SGPIO_PINS_MASK ; - } +if (!pdata) +return -EINVAL ; + + gpio->max_ngpios = pdata->max_ngpios; + pin_mask = pdata->pin_mask;Hmm, okay, maybe just re-order the patches so this commit comes before the previous one. That way we don't immediately rip out this condition that we just introduced in the previous patch.
Quoted 2 lines
I think I suggested squashing it into the previous patch, but with the removal of the comments and macros I think it's worth leaving it separate, just reordered.
I was wondering if I can squash patch-05 and patch-06 into one patch as this patch(patch-06) requires macros, structures, and functions that modified in the previous patch(patch-05).
Quoted 8 lines
Quoted 5 lines
Yeah, fair enough. Just squash them.
Cheers,
Andrew
I'm ready to pick this up as soon as you respin the series.
Hi Bart,
Per the discussion in the following mail threads, I may redesign aspeed sgpio driver for the new solution.
https://lkml.org/lkml/2021/6/3/1507
https://lkml.org/lkml/2021/6/10/240
Patch02- Patch06 of this patch series will need to be modified for the new solution, although some of them have Reviewed-by tag.
Thanks,
Steven
Quoted 1 line
Bart
PATCH v5 7/10 gpio: gpio-aspeed-sgpio: Add set_config function
In reply to Steven LeeAST SoC supports *retain pin state* function when wdt reset. The patch adds set_config function for handling sgpio reset tolerance register.
--- drivers/gpio/gpio-aspeed-sgpio.c | 54 +++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-)
drivers/gpio/gpio-aspeed-sgpio.c +50 -4
@@ -39,9 +39,10 @@ struct aspeed_sgpio { };struct aspeed_sgpio_bank { -uint16_t val_regs; -uint16_t rdata_reg; -uint16_t irq_regs; +u16 val_regs; +u16 rdata_reg; +u16 irq_regs; +u16 tolerance_regs;const char names[4 ][3 ]; };
@@ -57,24 +58,28 @@ static const struct aspeed_sgpio_bank aspeed_sgpio_banks[] = { .val_regs = 0x0000, .rdata_reg = 0x0070, .irq_regs = 0x0004, + .tolerance_regs = 0x0018, .names = { "A", "B", "C", "D" }, }, { .val_regs =0x001C , .rdata_reg = 0x0074, .irq_regs = 0x0020, + .tolerance_regs = 0x0034, .names = { "E", "F", "G", "H" }, }, { .val_regs =0x0038 , .rdata_reg = 0x0078, .irq_regs = 0x003C, + .tolerance_regs = 0x0050, .names = { "I", "J", "K", "L" }, }, { .val_regs =0x0090 , .rdata_reg = 0x007C, .irq_regs = 0x0094, + .tolerance_regs = 0x00A8, .names = { "M", "N", "O", "P" }, }, };
@@ -87,6 +92,7 @@ enum aspeed_sgpio_reg { reg_irq_type1, reg_irq_type2, reg_irq_status, + reg_tolerance, };#define GPIO_VAL_VALUE 0x00
@@ -115,6 +121,8 @@ static void __iomem *bank_reg(struct aspeed_sgpio *gpio,return gpio->base + bank->irq_regs +GPIO_IRQ_TYPE2 ;case reg_irq_status:return gpio->base + bank->irq_regs +GPIO_IRQ_STATUS ; +case reg_tolerance: +return gpio->base + bank->tolerance_regs;default :/* acturally if code runs to here, it's an error case */ BUG ();
@@ -476,6 +484,44 @@ static const struct aspeed_sgpio_pdata ast2400_sgpio_pdata = { .pin_mask = GENMASK(9, 6), }; +static int aspeed_sgpio_reset_tolerance (struct gpio_chip *chip, +unsigned int offset,bool enable) +{ +struct aspeed_sgpio *gpio =gpiochip_get_data (chip); +unsigned long flags; +void __iomem *reg; +u32 val; + + reg =bank_reg (gpio,to_bank (offset, gpio), reg_tolerance); + +spin_lock_irqsave (&gpio->lock, flags); + + val =readl (reg); + +if (enable) + val |=GPIO_BIT (gpio, offset); +else + val &= ~GPIO_BIT (gpio, offset); + +writel (val, reg); + +spin_unlock_irqrestore (&gpio->lock, flags); + +return 0 ; +} + +static int aspeed_sgpio_set_config (struct gpio_chip *chip,unsigned int offset, +unsigned long config) +{ +unsigned long param =pinconf_to_config_param (config); +u32 arg =pinconf_to_config_argument (config); + +if (param ==PIN_CONFIG_PERSIST_STATE ) +return aspeed_sgpio_reset_tolerance (chip, offset, arg); + +return -ENOTSUPP ; +} +static const struct aspeed_sgpio_pdata ast2600_sgpiom_128_pdata = { .max_ngpios =128 , .pin_mask =GENMASK (10 ,6 ),
@@ -577,7 +623,7 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev) gpio->chip.free =NULL ; gpio->chip.get = aspeed_sgpio_get; gpio->chip.set = aspeed_sgpio_set; - gpio->chip.set_config =NULL ; + gpio->chip.set_config = aspeed_sgpio_set_config; gpio->chip.label =dev_name (&pdev->dev); gpio->chip.base =-1 ;
Signature · 1 line
2.17.1
PATCH v5 8/10 gpio: gpio-aspeed-sgpio: Move irq_chip to aspeed-sgpio struct
In reply to Steven LeeThe current design initializes irq->chip from a global irqchip struct, which causes multiple sgpio devices use the same irq_chip. The patch moves irq_chip to aspeed_sgpio struct for initializing irq_chip from their private gpio struct.
--- drivers/gpio/gpio-aspeed-sgpio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpio/gpio-aspeed-sgpio.c +8 -9
@@ -30,6 +30,7 @@ struct aspeed_sgpio_pdata {struct aspeed_sgpio {struct gpio_chip chip; +struct irq_chip intc;struct clk *pclk;spinlock_t lock;void __iomem *base;
@@ -425,14 +426,6 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc)chained_irq_exit (ic, desc); } -static struct irq_chip aspeed_sgpio_irqchip = { - .name ="aspeed-sgpio" , - .irq_ack = aspeed_sgpio_irq_ack, - .irq_mask = aspeed_sgpio_irq_mask, - .irq_unmask = aspeed_sgpio_irq_unmask, - .irq_set_type = aspeed_sgpio_set_type, -}; -static int aspeed_sgpio_setup_irqs (struct aspeed_sgpio *gpio,struct platform_device *pdev) {
@@ -455,8 +448,14 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,iowrite32 (0xffffffff ,bank_reg (gpio, bank, reg_irq_status)); } + gpio->intc.name =dev_name (&pdev->dev); + gpio->intc.irq_ack = aspeed_sgpio_irq_ack; + gpio->intc.irq_mask = aspeed_sgpio_irq_mask; + gpio->intc.irq_unmask = aspeed_sgpio_irq_unmask; + gpio->intc.irq_set_type = aspeed_sgpio_set_type; + irq = &gpio->chip.irq; - irq->chip = &aspeed_sgpio_irqchip; + irq->chip = &gpio->intc; irq->init_valid_mask = aspeed_sgpio_irq_init_valid_mask; irq->handler = handle_bad_irq; irq->default_type =IRQ_TYPE_NONE ;
Signature · 1 line
2.17.1
PATCH v5 9/10 gpio: gpio-aspeed-sgpio: Use generic device property APIs
In reply to Steven LeeReplace all of_property_read_u32() with device_property_read_u32().
--- drivers/gpio/gpio-aspeed-sgpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-aspeed-sgpio.c +2 -2
@@ -564,7 +564,7 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev) gpio->max_ngpios = pdata->max_ngpios; pin_mask = pdata->pin_mask; - rc =of_property_read_u32 (pdev->dev.of_node,"ngpios" , &nr_gpios); + rc =device_property_read_u32 (&pdev->dev,"ngpios" , &nr_gpios);if (rc <0 ) {dev_err (&pdev->dev,"Could not read ngpios property\n" );return -EINVAL ;
@@ -575,7 +575,7 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev) } gpio->n_sgpio = nr_gpios; - rc =of_property_read_u32 (pdev->dev.of_node,"bus-frequency" , &sgpio_freq); + rc =device_property_read_u32 (&pdev->dev,"bus-frequency" , &sgpio_freq);if (rc <0 ) {dev_err (&pdev->dev,"Could not read bus-frequency property\n" );return -EINVAL ;
Signature · 1 line
2.17.1
PATCH v5 10/10 gpio: gpio-aspeed-sgpio: Return error if ngpios is not multiple of 8.
In reply to Steven LeeAdd an else-if condition in the probe function to check whether ngpios is multiple of 8.
Per AST datasheet, numbers of available serial GPIO pins in Serial GPIO Configuration Register must be n bytes. For instance, if n = 1, it means AST SoC supports 8 GPIO pins.
--- drivers/gpio/gpio-aspeed-sgpio.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpio/gpio-aspeed-sgpio.c +4 -0
@@ -572,6 +572,10 @@ static int __init aspeed_sgpio_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Number of GPIOs exceeds the maximum of %d: %d\n" , gpio->max_ngpios, nr_gpios);return -EINVAL ; + }else if (nr_gpios %8 ) { +dev_err (&pdev->dev,"Number of GPIOs not multiple of 8: %d\n" , + nr_gpios); +return -EINVAL ; } gpio->n_sgpio = nr_gpios;
Signature · 1 line
2.17.1
Re: [PATCH v5 10/10] gpio: gpio-aspeed-sgpio: Return error if ngpios is not multiple of 8.
Quoted 7 lines · Steven Lee
Add an else-if condition in the probe function to check whether ngpios is multiple of 8.
Per AST datasheet, numbers of available serial GPIO pins in Serial GPIO Configuration Register must be n bytes. For instance, if n = 1, it means AST SoC supports 8 GPIO pins.Signed-off-by Steven Lee <[email protected]>
Quoted 19 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins, AST2500/AST2400 SoC has 1 SGPIO master interface that supports up to 80 pins.
In the current driver design, the max number of sgpio pins is hardcoded in macroMAX_NR_HW_SGPIOand the value is 80.For supporting sgpio master interfaces of AST2600 SoC, the patch series contains the following enhancement:
- Convert txt dt-bindings to yaml.
- Update aspeed-g6 dtsi to support the enhanced sgpio.
- Define max number of gpio pins in ast2600 platform data. Old chip uses the original hardcoded value.
- Support muiltiple SGPIO master interfaces.
- Support up to 128 pins.
- Support wdt reset tolerance.
- Fixirq_chipissues which causes multiple sgpio devices use the sameirq_chipdata.
- Replace all of_*() APIs with device_*().
Quoted 1 line
Changes from v4:
v5 looks good to me!
I just need Rob's or another DT persons nod on the bindings (or timeout) before I merge it. Poke me if nothing happens.
Quoted 2 lines
ARM: dts: aspeed-g6: Add SGPIO node.
ARM: dts: aspeed-g5: Remove ngpios from sgpio node.
These two need to be merged through the SoC tree, the rest I will handle.
Yours,
Linus Walleij
Quoted 25 lines · Linus Walleij
Quoted 19 lines · Steven Lee
AST2600 SoC has 2 SGPIO master interfaces one with 128 pins another one with 80 pins, AST2500/AST2400 SoC has 1 SGPIO master interface that supports up to 80 pins.
In the current driver design, the max number of sgpio pins is hardcoded in macroMAX_NR_HW_SGPIOand the value is 80.For supporting sgpio master interfaces of AST2600 SoC, the patch series contains the following enhancement:
- Convert txt dt-bindings to yaml.
- Update aspeed-g6 dtsi to support the enhanced sgpio.
- Define max number of gpio pins in ast2600 platform data. Old chip uses the original hardcoded value.
- Support muiltiple SGPIO master interfaces.
- Support up to 128 pins.
- Support wdt reset tolerance.
- Fixirq_chipissues which causes multiple sgpio devices use the sameirq_chipdata.
- Replace all of_*() APIs with device_*().Quoted 1 line
Changes from v4:
v5 looks good to me!
Quoted 8 lines
I just need Rob's or another DT persons nod on the bindings (or timeout) before I merge it. Poke me if nothing happens.
Quoted 2 lines
ARM: dts: aspeed-g6: Add SGPIO node.
ARM: dts: aspeed-g5: Remove ngpios from sgpio node.These two need to be merged through the SoC tree, the rest I will handle.
Hi Linus, Andrew,
Per the comment in the following mail
https://lkml.org/lkml/2021/6/9/317
I was wondering if I should prepare v6 for the currnet solution or I should drop this patch series then prepare another patch for the new solution(piar GPIO input/output) which breaks userspace but is better than the current solution.
Thanks,
Steven
Quoted 2 lines
Yours,
Linus Walleij
Quoted 7 lines · Steven Lee
Per the comment in the following mail
https://lkml.org/lkml/2021/6/9/317I was wondering if I should prepare v6 for the currnet solution or I should drop this patch series then prepare another patch for the new solution(piar GPIO input/output) which breaks userspace but is better than the current solution.
I would say just go ahead with the new solution. AFAIK Aspeed has pretty tight control over what kind of userspace run on these systems.
BTW please influence Aspeed to use the GPIO character device and ligpiod
https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
if you are doing any kind of userspace GPIO control (which I suspect that you do).
Yours,
Linus Walleij
Quoted 14 lines · Linus Walleij
Quoted 7 lines · Steven Lee
Per the comment in the following mail
https://lkml.org/lkml/2021/6/9/317I was wondering if I should prepare v6 for the currnet solution or I should drop this patch series then prepare another patch for the new solution(piar GPIO input/output) which breaks userspace but is better than the current solution.
I would say just go ahead with the new solution. AFAIK Aspeed has pretty tight control over what kind of userspace run on these systems.
Quoted 6 lines
BTW please influence Aspeed to use the GPIO character device and ligpiod
https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
if you are doing any kind of userspace GPIO control (which I suspect that you do).
We currently use gpioset and gpioget that provided by libgpiod to test aspeed gpio and sgpio drivers.
For the current solution on AST2600,
the valid range of input pins is 0 ~ 127,
the valid range of output pins is 128 ~ 255.
So we access input pins by the following command
``` gpioget $chipId 0 1 2 3 4 ... 127 ```
and access output pins by the following command
``` gpioset $chipId 128=1 129=0 130=1 131=1 ... 255=1 ```
The new solution will change the gpio id order as follows Input:
``` gpioget $chipId 0 2 4 6 8 ... 254 ```
Output:
``` gpioset $chipId 1=1 3=0 5=1 7=1 ... 255=1 ```
Thanks,
Steven
Quoted 2 lines
Yours,
Linus Walleij