Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753570AbbBYVDA (ORCPT ); Wed, 25 Feb 2015 16:03:00 -0500 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:13761 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753103AbbBYVC5 (ORCPT ); Wed, 25 Feb 2015 16:02:57 -0500 X-IronPort-AV: E=Sophos;i="5.09,647,1418112000"; d="scan'208";a="57882370" From: Arun Ramamurthy To: Rob Herring , Pawel Moll , "Mark Rutland" , Ian Campbell , Kumar Gala , "Russell King" , Jean-Christophe Plagniol-Villard , Tomi Valkeinen CC: , , , Dmitry Torokhov , "Anatol Pomazau" , Jonathan Richardson , Scott Branden , Ray Jui , , Arun Ramamurthy Subject: [PATCH] video: ARM CLCD: Added support for FBIO_WAITFORVSYNC Date: Wed, 25 Feb 2015 13:01:21 -0800 Message-ID: <1424898082-1522-3-git-send-email-arun.ramamurthy@broadcom.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424898082-1522-1-git-send-email-arun.ramamurthy@broadcom.com> References: <1424898082-1522-1-git-send-email-arun.ramamurthy@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5823 Lines: 186 Added ioctl and interrupt handler functions to support FBIO_WAITFORVSYNC Also corrected documentation to make interrupts and interrupt-names optional as they are not required properties. Reviewed-by: Ray Jui Reviewed-by: Scott Branden Signed-off-by: Arun Ramamurthy 0 --- .../devicetree/bindings/video/arm,pl11x.txt | 11 +-- drivers/video/fbdev/amba-clcd.c | 82 ++++++++++++++++++++++ include/linux/amba/clcd.h | 4 ++ 3 files changed, 89 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/video/arm,pl11x.txt b/Documentation/devicetree/bindings/video/arm,pl11x.txt index 2262cdb..7d19024 100644 --- a/Documentation/devicetree/bindings/video/arm,pl11x.txt +++ b/Documentation/devicetree/bindings/video/arm,pl11x.txt @@ -10,14 +10,6 @@ Required properties: - reg: base address and size of the control registers block -- interrupt-names: either the single entry "combined" representing a - combined interrupt output (CLCDINTR), or the four entries - "mbe", "vcomp", "lnbu", "fuf" representing the individual - CLCDMBEINTR, CLCDVCOMPINTR, CLCDLNBUINTR, CLCDFUFINTR interrupts - -- interrupts: contains an interrupt specifier for each entry in - interrupt-names - - clock-names: should contain "clcdclk" and "apb_pclk" - clocks: contains phandle and clock specifier pairs for the entries @@ -54,6 +46,9 @@ Optional properties: It can be used to configure a virtual y resolution. It must be a value larger than the actual y resolution. +- interrupts: contains an interrupt specifier for the clcd vcomp interrupt + This is required for the driver to handle FBIO_WAITFORVSYNC ioctls. + Required sub-nodes: - port: describes LCD panel signals, following the common binding diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 3bc09ad..9f7a58c 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include