Skip to content

Commit

Permalink
Merge branch 'at91-4.9-trunk/dt' into linux-4.9-at91
Browse files Browse the repository at this point in the history
  • Loading branch information
noglitch committed Jul 10, 2018
2 parents b2b06ab + f6ae9b7 commit b7206f3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/at91-sama5d2_ptc_ek_pda4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
compatible = "qt1070";
reg = <0x1b>;
interrupt-parent = <&pioA>;
interrupts = <98 0x0>;
interrupts = <PIN_PD2 IRQ_TYPE_NONE>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qt1070_irq>;
wakeup-source;
Expand All @@ -49,7 +49,7 @@
compatible = "atmel,atmel_mxt_ts";
reg = <0x4a>;
interrupt-parent = <&pioA>;
interrupts = <73 0x0>;
interrupts = <PIN_PC9 IRQ_TYPE_NONE>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mxt_irq>;
};
Expand Down

0 comments on commit b7206f3

Please sign in to comment.