diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 12:26:48 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 12:26:48 -0400 |
| commit | 1e5f9ed00d72c60f68d8cb75fd7d10abfb5947cd (patch) | |
| tree | cf1946ce1d87045bf2cdb4a748b286d51191aa68 /arch | |
| parent | 443318e0b776562593f4d4fd770055a9d31add54 (diff) | |
| parent | 12392f5896c9affc03c1ddd95a83c32238862a58 (diff) | |
Merge tag 'renesas-fixes-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Renesas ARM Based SoC Fixes for v4.1" from Simon Horman:
* Fix adv7511 IRQ sensing on koelsch board
* tag 'renesas-fixes-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: koelsch: Fix adv7511 IRQ sensing
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 74c3212f1f11..824ddab9c3ad 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts | |||
| @@ -545,7 +545,7 @@ | |||
| 545 | compatible = "adi,adv7511w"; | 545 | compatible = "adi,adv7511w"; |
| 546 | reg = <0x39>; | 546 | reg = <0x39>; |
| 547 | interrupt-parent = <&gpio3>; | 547 | interrupt-parent = <&gpio3>; |
| 548 | interrupts = <29 IRQ_TYPE_EDGE_FALLING>; | 548 | interrupts = <29 IRQ_TYPE_LEVEL_LOW>; |
| 549 | 549 | ||
| 550 | adi,input-depth = <8>; | 550 | adi,input-depth = <8>; |
| 551 | adi,input-colorspace = "rgb"; | 551 | adi,input-colorspace = "rgb"; |