[RfC,v4,4/6] ARM(64): dts: meson: add GPIO interrupt-controller support
diff mbox

Message ID 5294644a-967e-dba8-d287-d932b38244d1@gmail.com
State New
Headers show

Commit Message

Heiner Kallweit May 28, 2017, 7:11 p.m. UTC
Add support for the GPIO interupt controller of certain Amlogic Meson
Soc's.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 arch/arm/boot/dts/meson8.dtsi             | 8 ++++++++
 arch/arm/boot/dts/meson8b.dtsi            | 8 ++++++++
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++++++
 3 files changed, 24 insertions(+)

Comments

Neil Armstrong May 29, 2017, 8:49 a.m. UTC | #1
Please correct the subject to :
ARM64: dts: meson: add GPIO interrupt-controller support

On 05/28/2017 09:11 PM, Heiner Kallweit wrote:
> Add support for the GPIO interupt controller of certain Amlogic Meson
> Soc's.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  arch/arm/boot/dts/meson8.dtsi             | 8 ++++++++
>  arch/arm/boot/dts/meson8b.dtsi            | 8 ++++++++
>  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++++++
>  3 files changed, 24 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
> index 69930773..b4c4175d 100644
> --- a/arch/arm/boot/dts/meson8.dtsi
> +++ b/arch/arm/boot/dts/meson8.dtsi
> @@ -126,6 +126,14 @@
>  };
>  
>  &cbus {
> +	gpio_intc: interrupt-controller@9880 {
> +		compatible = "amlogic,meson-gpio-intc";
> +		reg = <0x9880 0x10>;
> +		interrupt-controller;
> +		#interrupt-cells = <2>;
> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
> +	};
> +
>  	pinctrl_cbus: pinctrl@9880 {
>  		compatible = "amlogic,meson8-cbus-pinctrl";
>  		reg = <0x9880 0x10>;
> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
> index d9f116a4..1bce64a6 100644
> --- a/arch/arm/boot/dts/meson8b.dtsi
> +++ b/arch/arm/boot/dts/meson8b.dtsi
> @@ -151,6 +151,14 @@
>  		interrupts = <0 0 1>;
>  	};
>  
> +	gpio_intc: interrupt-controller@9880 {
> +		compatible = "amlogic,meson-gpio-intc";
> +		reg = <0x9880 0x10>;
> +		interrupt-controller;
> +		#interrupt-cells = <2>;
> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
> +	};
> +
>  	pinctrl_cbus: pinctrl@9880 {
>  		compatible = "amlogic,meson8b-cbus-pinctrl";
>  		reg = <0x9880 0x10>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> index 436b8750..66dde761 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
> @@ -312,6 +312,14 @@
>  				status = "disabled";
>  			};
>  
> +			gpio_intc: interrupt-controller@9880 {
> +				compatible = "amlogic,meson-gpio-intc";
> +				reg = <0x0 0x09880 0x0 0x10>;
> +				interrupt-controller;
> +				#interrupt-cells = <2>;
> +				parent-interrupts = <64 65 66 67 68 79 70 71>;
> +			};
> +
>  			watchdog@98d0 {
>  				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
>  				reg = <0x0 0x098d0 0x0 0x10>;
> 

Seems correct with the dt-bindings,

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Heiner Kallweit May 29, 2017, 8:01 p.m. UTC | #2
Am 29.05.2017 um 10:49 schrieb Neil Armstrong:
> 
> 
> Please correct the subject to :
> ARM64: dts: meson: add GPIO interrupt-controller support
> 
At first thanks for the review comments.

I chose ARM(64) because Meson8 resides under arch/arm whilst Meson GX
is under arch/arm64, and I didn't want to split it into two patches.
If we change it to ARM64 then it may not fit for Meson8.

> On 05/28/2017 09:11 PM, Heiner Kallweit wrote:
>> Add support for the GPIO interupt controller of certain Amlogic Meson
>> Soc's.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  arch/arm/boot/dts/meson8.dtsi             | 8 ++++++++
>>  arch/arm/boot/dts/meson8b.dtsi            | 8 ++++++++
>>  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++++++
>>  3 files changed, 24 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
>> index 69930773..b4c4175d 100644
>> --- a/arch/arm/boot/dts/meson8.dtsi
>> +++ b/arch/arm/boot/dts/meson8.dtsi
>> @@ -126,6 +126,14 @@
>>  };
>>  
>>  &cbus {
>> +	gpio_intc: interrupt-controller@9880 {
>> +		compatible = "amlogic,meson-gpio-intc";
>> +		reg = <0x9880 0x10>;
>> +		interrupt-controller;
>> +		#interrupt-cells = <2>;
>> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
>> +	};
>> +
>>  	pinctrl_cbus: pinctrl@9880 {
>>  		compatible = "amlogic,meson8-cbus-pinctrl";
>>  		reg = <0x9880 0x10>;
>> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
>> index d9f116a4..1bce64a6 100644
>> --- a/arch/arm/boot/dts/meson8b.dtsi
>> +++ b/arch/arm/boot/dts/meson8b.dtsi
>> @@ -151,6 +151,14 @@
>>  		interrupts = <0 0 1>;
>>  	};
>>  
>> +	gpio_intc: interrupt-controller@9880 {
>> +		compatible = "amlogic,meson-gpio-intc";
>> +		reg = <0x9880 0x10>;
>> +		interrupt-controller;
>> +		#interrupt-cells = <2>;
>> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
>> +	};
>> +
>>  	pinctrl_cbus: pinctrl@9880 {
>>  		compatible = "amlogic,meson8b-cbus-pinctrl";
>>  		reg = <0x9880 0x10>;
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>> index 436b8750..66dde761 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>> @@ -312,6 +312,14 @@
>>  				status = "disabled";
>>  			};
>>  
>> +			gpio_intc: interrupt-controller@9880 {
>> +				compatible = "amlogic,meson-gpio-intc";
>> +				reg = <0x0 0x09880 0x0 0x10>;
>> +				interrupt-controller;
>> +				#interrupt-cells = <2>;
>> +				parent-interrupts = <64 65 66 67 68 79 70 71>;
>> +			};
>> +
>>  			watchdog@98d0 {
>>  				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
>>  				reg = <0x0 0x098d0 0x0 0x10>;
>>
> 
> Seems correct with the dt-bindings,
> 
> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Neil Armstrong May 30, 2017, 8:41 a.m. UTC | #3
Hi Heiner,

On 05/29/2017 10:01 PM, Heiner Kallweit wrote:
> Am 29.05.2017 um 10:49 schrieb Neil Armstrong:
>>
>>
>> Please correct the subject to :
>> ARM64: dts: meson: add GPIO interrupt-controller support
>>
> At first thanks for the review comments.

You're welcome, I'm glad you followed some of our comments.

> 
> I chose ARM(64) because Meson8 resides under arch/arm whilst Meson GX
> is under arch/arm64, and I didn't want to split it into two patches.
> If we change it to ARM64 then it may not fit for Meson8.

Yes, please split the patches in two for ARM and ARM64.
This is a requirement from the arm-soc maintainers.

Neil

> 
>> On 05/28/2017 09:11 PM, Heiner Kallweit wrote:
>>> Add support for the GPIO interupt controller of certain Amlogic Meson
>>> Soc's.
>>>
>>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>>> ---
>>>  arch/arm/boot/dts/meson8.dtsi             | 8 ++++++++
>>>  arch/arm/boot/dts/meson8b.dtsi            | 8 ++++++++
>>>  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++++++
>>>  3 files changed, 24 insertions(+)
>>>
>>> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
>>> index 69930773..b4c4175d 100644
>>> --- a/arch/arm/boot/dts/meson8.dtsi
>>> +++ b/arch/arm/boot/dts/meson8.dtsi
>>> @@ -126,6 +126,14 @@
>>>  };
>>>  
>>>  &cbus {
>>> +	gpio_intc: interrupt-controller@9880 {
>>> +		compatible = "amlogic,meson-gpio-intc";
>>> +		reg = <0x9880 0x10>;
>>> +		interrupt-controller;
>>> +		#interrupt-cells = <2>;
>>> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
>>> +	};
>>> +
>>>  	pinctrl_cbus: pinctrl@9880 {
>>>  		compatible = "amlogic,meson8-cbus-pinctrl";
>>>  		reg = <0x9880 0x10>;
>>> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
>>> index d9f116a4..1bce64a6 100644
>>> --- a/arch/arm/boot/dts/meson8b.dtsi
>>> +++ b/arch/arm/boot/dts/meson8b.dtsi
>>> @@ -151,6 +151,14 @@
>>>  		interrupts = <0 0 1>;
>>>  	};
>>>  
>>> +	gpio_intc: interrupt-controller@9880 {
>>> +		compatible = "amlogic,meson-gpio-intc";
>>> +		reg = <0x9880 0x10>;
>>> +		interrupt-controller;
>>> +		#interrupt-cells = <2>;
>>> +		parent-interrupts = <64 65 66 67 68 79 70 71>;
>>> +	};
>>> +
>>>  	pinctrl_cbus: pinctrl@9880 {
>>>  		compatible = "amlogic,meson8b-cbus-pinctrl";
>>>  		reg = <0x9880 0x10>;
>>> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>>> index 436b8750..66dde761 100644
>>> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>>> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
>>> @@ -312,6 +312,14 @@
>>>  				status = "disabled";
>>>  			};
>>>  
>>> +			gpio_intc: interrupt-controller@9880 {
>>> +				compatible = "amlogic,meson-gpio-intc";
>>> +				reg = <0x0 0x09880 0x0 0x10>;
>>> +				interrupt-controller;
>>> +				#interrupt-cells = <2>;
>>> +				parent-interrupts = <64 65 66 67 68 79 70 71>;
>>> +			};
>>> +
>>>  			watchdog@98d0 {
>>>  				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
>>>  				reg = <0x0 0x098d0 0x0 0x10>;
>>>
>>
>> Seems correct with the dt-bindings,
>>
>> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
>>
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index 69930773..b4c4175d 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -126,6 +126,14 @@ 
 };
 
 &cbus {
+	gpio_intc: interrupt-controller@9880 {
+		compatible = "amlogic,meson-gpio-intc";
+		reg = <0x9880 0x10>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		parent-interrupts = <64 65 66 67 68 79 70 71>;
+	};
+
 	pinctrl_cbus: pinctrl@9880 {
 		compatible = "amlogic,meson8-cbus-pinctrl";
 		reg = <0x9880 0x10>;
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index d9f116a4..1bce64a6 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -151,6 +151,14 @@ 
 		interrupts = <0 0 1>;
 	};
 
+	gpio_intc: interrupt-controller@9880 {
+		compatible = "amlogic,meson-gpio-intc";
+		reg = <0x9880 0x10>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		parent-interrupts = <64 65 66 67 68 79 70 71>;
+	};
+
 	pinctrl_cbus: pinctrl@9880 {
 		compatible = "amlogic,meson8b-cbus-pinctrl";
 		reg = <0x9880 0x10>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 436b8750..66dde761 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -312,6 +312,14 @@ 
 				status = "disabled";
 			};
 
+			gpio_intc: interrupt-controller@9880 {
+				compatible = "amlogic,meson-gpio-intc";
+				reg = <0x0 0x09880 0x0 0x10>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				parent-interrupts = <64 65 66 67 68 79 70 71>;
+			};
+
 			watchdog@98d0 {
 				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
 				reg = <0x0 0x098d0 0x0 0x10>;