linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 for v4.10
@ 2016-11-18 12:44 Krzysztof Kozlowski
  2016-11-18 12:44 ` [GIT PULL 2/2] ARM: dts: exynos: Topic dts " Krzysztof Kozlowski
  2016-11-19  2:00 ` [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 " Olof Johansson
  0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2016-11-18 12:44 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

Hi,

Topic branch with a GIC interrupt fix and cleanup. No conflicts expected.
No dependencies.

Best regards,
Krzysztof


The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:

  Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-gic-flags-4.10

for you to fetch changes up to 86bb573d0b2a8e876a12d1348bd0b6e377c1043e:

  arm64: dts: exynos: Use human-friendly symbols for interrupt properties in exynos7 (2016-11-03 22:40:39 +0200)

----------------------------------------------------------------
Topic branch with DT arm64 changes for v4.10.

Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
interrupts.  Although this was working but with error messages like:
        genirq: Setting trigger mode 0 for irq 16 failed

Use level high interrupt instead of type none.  The choice of level high was
rather an arbitrary decision hoping it will work on each platform.  Tests shown
no issues so far.

----------------------------------------------------------------
Krzysztof Kozlowski (2):
      arm64: dts: exynos: Fix invalid GIC interrupt flags in exynos7
      arm64: dts: exynos: Use human-friendly symbols for interrupt properties in exynos7

 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 20 +++++--
 arch/arm64/boot/dts/exynos/exynos7.dtsi         | 69 +++++++++++++------------
 2 files changed, 51 insertions(+), 38 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL 2/2] ARM: dts: exynos: Topic dts for v4.10
  2016-11-18 12:44 [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 for v4.10 Krzysztof Kozlowski
@ 2016-11-18 12:44 ` Krzysztof Kozlowski
  2016-11-19  2:02   ` Olof Johansson
  2016-11-19  2:00 ` [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 " Olof Johansson
  1 sibling, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2016-11-18 12:44 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, Kevin Hilman, arm
  Cc: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

Hi,


Topic branch with a GIC interrupt fixes and cleanup (human-friendly symbols).

Possible rather trivial conflicts:

diff --cc arch/arm/boot/dts/exynos4x12.dtsi
index 0074f566cd3b,505f047e81c6..85a7122658f1
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@@ -147,9 -147,10 +147,10 @@@
                };
  
                fimc_is: fimc-is@12000000 {
 -                      compatible = "samsung,exynos4212-fimc-is", "simple-bus";
 +                      compatible = "samsung,exynos4212-fimc-is";
                        reg = <0x12000000 0x260000>;
-                       interrupts = <0 90 0>, <0 95 0>;
+                       interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&pd_isp>;
                        clocks = <&clock CLK_FIMC_LITE0>,
                                 <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,

diff --cc arch/arm/boot/dts/exynos5410.dtsi
index 9a91685d8890,2501249d97aa..bb90bbdbe2d9
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@@ -190,58 -181,8 +190,58 @@@
                pinctrl_3: pinctrl@03860000 {
                        compatible = "samsung,exynos5410-pinctrl";
                        reg = <0x03860000 0x1000>;
-                       interrupts = <0 47 0>;
+                       interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
                };
 +
 +              amba {
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      compatible = "simple-bus";
 +                      interrupt-parent = <&gic>;
 +                      ranges;


Best regards,
Krzysztof


The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:

  Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-gic-flags-4.10

for you to fetch changes up to 04a886727ca7e841afa2fbc5d87aff81ae256dbf:

  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440 (2016-11-03 22:44:56 +0200)

----------------------------------------------------------------
Topic branch with DT changes for v4.10.

Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
interrupts.  Although this was working but with error messages like:
	genirq: Setting trigger mode 0 for irq 16 failed

Use level high interrupt instead of type none.  The choice of level high was
rather an arbitrary decision hoping it will work on each platform.  Tests shown
no issues so far.

----------------------------------------------------------------
Krzysztof Kozlowski (14):
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4210
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos3250
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5250
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5410/exynos542x
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260
      ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5440
      ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos3250
      ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos4
      ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5
      ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5260
      ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440

 arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 20 +++++--
 arch/arm/boot/dts/exynos3250.dtsi         | 97 ++++++++++++++++++-------------
 arch/arm/boot/dts/exynos4.dtsi            | 95 ++++++++++++++++--------------
 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 20 +++++--
 arch/arm/boot/dts/exynos4210.dtsi         | 36 ++++++++----
 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 20 +++++--
 arch/arm/boot/dts/exynos4x12.dtsi         | 48 ++++++++++-----
 arch/arm/boot/dts/exynos5.dtsi            | 64 ++++++++++++++------
 arch/arm/boot/dts/exynos5250.dtsi         | 80 ++++++++++++-------------
 arch/arm/boot/dts/exynos5260.dtsi         | 43 +++++++++-----
 arch/arm/boot/dts/exynos5410.dtsi         | 26 ++++-----
 arch/arm/boot/dts/exynos5420.dtsi         | 78 ++++++++++++-------------
 arch/arm/boot/dts/exynos5440.dtsi         | 70 +++++++++++++---------
 arch/arm/boot/dts/exynos54xx.dtsi         | 34 +++++------
 14 files changed, 437 insertions(+), 294 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 for v4.10
  2016-11-18 12:44 [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 for v4.10 Krzysztof Kozlowski
  2016-11-18 12:44 ` [GIT PULL 2/2] ARM: dts: exynos: Topic dts " Krzysztof Kozlowski
@ 2016-11-19  2:00 ` Olof Johansson
  1 sibling, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2016-11-19  2:00 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

On Fri, Nov 18, 2016 at 02:44:34PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> Topic branch with a GIC interrupt fix and cleanup. No conflicts expected.
> No dependencies.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
> 
>   Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-gic-flags-4.10
> 
> for you to fetch changes up to 86bb573d0b2a8e876a12d1348bd0b6e377c1043e:
> 
>   arm64: dts: exynos: Use human-friendly symbols for interrupt properties in exynos7 (2016-11-03 22:40:39 +0200)
> 
> ----------------------------------------------------------------
> Topic branch with DT arm64 changes for v4.10.
> 
> Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
> interrupts.  Although this was working but with error messages like:
>         genirq: Setting trigger mode 0 for irq 16 failed
> 
> Use level high interrupt instead of type none.  The choice of level high was
> rather an arbitrary decision hoping it will work on each platform.  Tests shown
> no issues so far.

Merged, thanks.


-Olof

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL 2/2] ARM: dts: exynos: Topic dts for v4.10
  2016-11-18 12:44 ` [GIT PULL 2/2] ARM: dts: exynos: Topic dts " Krzysztof Kozlowski
@ 2016-11-19  2:02   ` Olof Johansson
  0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2016-11-19  2:02 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Arnd Bergmann, Kevin Hilman, arm, Kukjin Kim, linux-arm-kernel,
	linux-samsung-soc, linux-kernel, Javier Martinez Canillas

On Fri, Nov 18, 2016 at 02:44:35PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> 
> Topic branch with a GIC interrupt fixes and cleanup (human-friendly symbols).
> 
> Possible rather trivial conflicts:
> 
> diff --cc arch/arm/boot/dts/exynos4x12.dtsi
> index 0074f566cd3b,505f047e81c6..85a7122658f1
> --- a/arch/arm/boot/dts/exynos4x12.dtsi
> +++ b/arch/arm/boot/dts/exynos4x12.dtsi
> @@@ -147,9 -147,10 +147,10 @@@
>                 };
>   
>                 fimc_is: fimc-is@12000000 {
>  -                      compatible = "samsung,exynos4212-fimc-is", "simple-bus";
>  +                      compatible = "samsung,exynos4212-fimc-is";
>                         reg = <0x12000000 0x260000>;
> -                       interrupts = <0 90 0>, <0 95 0>;
> +                       interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
> +                                    <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
>                         power-domains = <&pd_isp>;
>                         clocks = <&clock CLK_FIMC_LITE0>,
>                                  <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
> 
> diff --cc arch/arm/boot/dts/exynos5410.dtsi
> index 9a91685d8890,2501249d97aa..bb90bbdbe2d9
> --- a/arch/arm/boot/dts/exynos5410.dtsi
> +++ b/arch/arm/boot/dts/exynos5410.dtsi
> @@@ -190,58 -181,8 +190,58 @@@
>                 pinctrl_3: pinctrl@03860000 {
>                         compatible = "samsung,exynos5410-pinctrl";
>                         reg = <0x03860000 0x1000>;
> -                       interrupts = <0 47 0>;
> +                       interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
>                 };
>  +
>  +              amba {
>  +                      #address-cells = <1>;
>  +                      #size-cells = <1>;
>  +                      compatible = "simple-bus";
>  +                      interrupt-parent = <&gic>;
>  +                      ranges;
> 
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
> 
>   Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-gic-flags-4.10
> 
> for you to fetch changes up to 04a886727ca7e841afa2fbc5d87aff81ae256dbf:
> 
>   ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440 (2016-11-03 22:44:56 +0200)
> 
> ----------------------------------------------------------------
> Topic branch with DT changes for v4.10.
> 
> Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
> interrupts.  Although this was working but with error messages like:
> 	genirq: Setting trigger mode 0 for irq 16 failed
> 
> Use level high interrupt instead of type none.  The choice of level high was
> rather an arbitrary decision hoping it will work on each platform.  Tests shown
> no issues so far.

Merged, thanks. FYI, you could have based this on the previous DT branch
if you wanted to not expose the conflicts, but simple ones like these
(in particular that we can resolve in our own tree) are OK to expose too.


-Olof

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-11-19  2:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-18 12:44 [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 for v4.10 Krzysztof Kozlowski
2016-11-18 12:44 ` [GIT PULL 2/2] ARM: dts: exynos: Topic dts " Krzysztof Kozlowski
2016-11-19  2:02   ` Olof Johansson
2016-11-19  2:00 ` [GIT PULL 1/2] arm64: dts: exynos: Topic dts arm64 " Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).