The generic pwm-ir-tx driver works for the Nokia n900, so nokia,n900-ir can be removed. Cc: Sicelo <absicsz@xxxxxxxxx> Cc: Rob Herring <robh@xxxxxxxxxx> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@xxxxxxxxx> Cc: Pali Rohár <pali.rohar@xxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Timo Kokkonen <timo.t.kokkonen@xxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Signed-off-by: Sean Young <sean@xxxxxxxx> --- .../devicetree/bindings/media/nokia,n900-ir | 20 ------------------- arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/nokia,n900-ir diff --git a/Documentation/devicetree/bindings/media/nokia,n900-ir b/Documentation/devicetree/bindings/media/nokia,n900-ir deleted file mode 100644 index 13a18ce37dd1..000000000000 --- a/Documentation/devicetree/bindings/media/nokia,n900-ir +++ /dev/null @@ -1,20 +0,0 @@ -Device-Tree bindings for LIRC TX driver for Nokia N900(RX51) - -Required properties: - - compatible: should be "nokia,n900-ir". - - pwms: specifies PWM used for IR signal transmission. - -Example node: - - pwm9: dmtimer-pwm@9 { - compatible = "ti,omap-dmtimer-pwm"; - ti,timers = <&timer9>; - ti,clock-source = <0x00>; /* timer_sys_ck */ - #pwm-cells = <3>; - }; - - ir: n900-ir { - compatible = "nokia,n900-ir"; - - pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ - }; diff --git a/arch/arm/boot/dts/ti/omap/omap3-n900.dts b/arch/arm/boot/dts/ti/omap/omap3-n900.dts index d33485341251..83ab2d6faee6 100644 --- a/arch/arm/boot/dts/ti/omap/omap3-n900.dts +++ b/arch/arm/boot/dts/ti/omap/omap3-n900.dts @@ -165,7 +165,7 @@ pwm9: pwm-9 { }; ir: n900-ir { - compatible = "nokia,n900-ir"; + compatible = "pwm-ir-tx"; pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ }; -- 2.41.0