This patch was to add loongson 2k0500, 2k2000 and 3a5000 gpio chip
dt-bindings support in yaml file.

Signed-off-by: Yinbo Zhu <zhuyinbo@loongson.cn>
---
 .../bindings/gpio/loongson,ls-gpio.yaml       | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
index fb86e8ce6349..97472f1529a0 100644
--- a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
+++ b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
@@ -11,9 +11,24 @@ maintainers:
 
 properties:
   compatible:
-    enum:
-      - loongson,ls2k-gpio
-      - loongson,ls7a-gpio
+    oneOf:
+      - enum:
+          - loongson,ls2k-gpio
+          - loongson,ls2k0500-gpio0
+          - loongson,ls2k0500-gpio1
+          - loongson,ls2k2000-gpio0
+          - loongson,ls2k2000-gpio1
+          - loongson,ls2k2000-gpio2
+          - loongson,ls3a5000-gpio
+          - loongson,ls7a-gpio
+      - items:
+          - enum:
+              - loongson,ls2k1000-gpio
+          - const: loongson,ls2k-gpio
+      - items:
+          - enum:
+              - loongson,ls7a1000-gpio
+          - const: loongson,ls7a-gpio
 
   reg:
     maxItems: 1
@@ -49,7 +64,7 @@ examples:
     #include <dt-bindings/interrupt-controller/irq.h>
 
     gpio0: gpio@1fe00500 {
-      compatible = "loongson,ls2k-gpio";
+      compatible = "loongson,ls2k1000-gpio", "loongson,ls2k-gpio";
       reg = <0x1fe00500 0x38>;
       ngpios = <64>;
       #gpio-cells = <2>;
-- 
2.20.1

On Wed, Aug 23, 2023 at 11:34:26AM +0800, Yinbo Zhu wrote:
> This patch was to add loongson 2k0500, 2k2000 and 3a5000 gpio chip
> dt-bindings support in yaml file.
> 
> Signed-off-by: Yinbo Zhu <zhuyinbo@loongson.cn>
> ---
>  .../bindings/gpio/loongson,ls-gpio.yaml       | 23 +++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
> index fb86e8ce6349..97472f1529a0 100644
> --- a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
> +++ b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
> @@ -11,9 +11,24 @@ maintainers:
>  
>  properties:
>    compatible:
> -    enum:
> -      - loongson,ls2k-gpio
> -      - loongson,ls7a-gpio
> +    oneOf:
> +      - enum:
> +          - loongson,ls2k-gpio
> +          - loongson,ls2k0500-gpio0
> +          - loongson,ls2k0500-gpio1
> +          - loongson,ls2k2000-gpio0
> +          - loongson,ls2k2000-gpio1
> +          - loongson,ls2k2000-gpio2
> +          - loongson,ls3a5000-gpio
> +          - loongson,ls7a-gpio

> +      - items:
> +          - enum:
> +              - loongson,ls2k1000-gpio
> +          - const: loongson,ls2k-gpio
> +      - items:
> +          - enum:
> +              - loongson,ls7a1000-gpio
> +          - const: loongson,ls7a-gpio

Are there going to be more controllers that are compatible with
"ls7a-gpio"? If not, you can simplify both of these to have 2 const:
entries, like:

      - items:
          - const: loongson,ls2k1000-gpio
          - const: loongson,ls2k-gpio

      - items:
          - const: loongson,ls7a1000-gpio
          - const: loongson,ls7a-gpio

Either way,
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

Thanks for sticking at this one :)

在 2023/8/23 下午11:08, Conor Dooley 写道:
> On Wed, Aug 23, 2023 at 11:34:26AM +0800, Yinbo Zhu wrote:
>> This patch was to add loongson 2k0500, 2k2000 and 3a5000 gpio chip
>> dt-bindings support in yaml file.
>>
>> Signed-off-by: Yinbo Zhu <zhuyinbo@loongson.cn>
>> ---
>>   .../bindings/gpio/loongson,ls-gpio.yaml       | 23 +++++++++++++++----
>>   1 file changed, 19 insertions(+), 4 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
>> index fb86e8ce6349..97472f1529a0 100644
>> --- a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
>> +++ b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
>> @@ -11,9 +11,24 @@ maintainers:
>>   
>>   properties:
>>     compatible:
>> -    enum:
>> -      - loongson,ls2k-gpio
>> -      - loongson,ls7a-gpio
>> +    oneOf:
>> +      - enum:
>> +          - loongson,ls2k-gpio
>> +          - loongson,ls2k0500-gpio0
>> +          - loongson,ls2k0500-gpio1
>> +          - loongson,ls2k2000-gpio0
>> +          - loongson,ls2k2000-gpio1
>> +          - loongson,ls2k2000-gpio2
>> +          - loongson,ls3a5000-gpio
>> +          - loongson,ls7a-gpio
> 
>> +      - items:
>> +          - enum:
>> +              - loongson,ls2k1000-gpio
>> +          - const: loongson,ls2k-gpio
>> +      - items:
>> +          - enum:
>> +              - loongson,ls7a1000-gpio
>> +          - const: loongson,ls7a-gpio
> 
> Are there going to be more controllers that are compatible with
> "ls7a-gpio"? If not, you can simplify both of these to have 2 const:
> entries, like:
> 
>        - items:
>            - const: loongson,ls2k1000-gpio
>            - const: loongson,ls2k-gpio
> 
>        - items:
>            - const: loongson,ls7a1000-gpio
>            - const: loongson,ls7a-gpio
> 
> Either way,
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>


okay, I got it.

Thanks,
Yinbo
> 

On Wed, Aug 23, 2023 at 5:34 AM Yinbo Zhu <zhuyinbo@loongson.cn> wrote:

> This patch was to add loongson 2k0500, 2k2000 and 3a5000 gpio chip
> dt-bindings support in yaml file.
>
> Signed-off-by: Yinbo Zhu <zhuyinbo@loongson.cn>

Thanks Yinbo,
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij