Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753650Ab1BLNWd (ORCPT ); Sat, 12 Feb 2011 08:22:33 -0500 Received: from www.wytron.com.tw ([211.75.82.101]:41629 "EHLO www.wytron.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367Ab1BLNW0 (ORCPT ); Sat, 12 Feb 2011 08:22:26 -0500 Message-ID: <4D5689DD.3050508@wytron.com.tw> Date: Sat, 12 Feb 2011 21:23:41 +0800 From: Thomas Chou User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Thunderbird/3.1.7 MIME-Version: 1.0 To: Grant Likely CC: Dmitry Torokhov , linux-kernel@vger.kernel.org, nios2-dev@sopc.et.ntust.edu.tw, linux-input@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Walter Goossens Subject: Re: [PATCH v3] altera_ps2: Add devicetree support References: <1296702304-30471-1-git-send-email-thomas@wytron.com.tw> <20110212092600.GE17755@angua.secretlab.ca> In-Reply-To: <20110212092600.GE17755@angua.secretlab.ca> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 192.168.1.250 X-SA-Exim-Mail-From: thomas@wytron.com.tw X-SA-Exim-Scanned: No (on www.wytron.com.tw); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3149 Lines: 107 On 02/12/2011 05:26 PM, Grant Likely wrote: > On Thu, Feb 03, 2011 at 11:05:04AM +0800, Thomas Chou wrote: >> Signed-off-by: Walter Goossens >> Signed-off-by: Thomas Chou >> --- >> v2 use const and add compat version. >> v3 change compatible vendor to ALTR. >> add dts binding doc. >> >> .../devicetree/bindings/serio/altera_ps2.txt | 4 ++++ >> drivers/input/serio/altera_ps2.c | 11 +++++++++-- >> 2 files changed, 13 insertions(+), 2 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/serio/altera_ps2.txt >> >> diff --git a/Documentation/devicetree/bindings/serio/altera_ps2.txt b/Documentation/devicetree/bindings/serio/altera_ps2.txt >> new file mode 100644 >> index 0000000..4d9eecc >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/serio/altera_ps2.txt >> @@ -0,0 +1,4 @@ >> +Altera UP PS/2 controller >> + >> +Required properties: >> +- compatible : should be "ALTR,ps2-1.0". >> diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c >> index 7998560..d94b4a3 100644 >> --- a/drivers/input/serio/altera_ps2.c >> +++ b/drivers/input/serio/altera_ps2.c >> @@ -19,6 +19,7 @@ >> #include >> #include >> #include >> +#include >> >> #define DRV_NAME "altera_ps2" >> >> @@ -173,6 +174,12 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev) >> return 0; >> } >> >> +static const struct of_device_id altera_ps2_match[] = { >> + { .compatible = "ALTR,ps2-1.0", }, >> + {}, >> +} >> +MODULE_DEVICE_TABLE(of, altera_ps2_match); >> + > > Should be: > > #ifdef CONFIG_OF > static const struct of_device_id altera_ps2_match[] = { > { .compatible = "ALTR,ps2-1.0", }, > {}, > } > MODULE_DEVICE_TABLE(of, altera_ps2_match); > #else /* CONFIG_OF */ > #define altera_ps2_match NULL > #endif /* CONFIG_OF */ > > Otherwise the driver will be advertising that it provides device tree > support when CONFIG_OF is disabled. Thanks. Will update all related drivers. - Thomas > > Otherwise, looks good to me. Feel free to add my acked-by line. > > g. > >> /* >> * Our device driver structure >> */ >> @@ -182,6 +189,7 @@ static struct platform_driver altera_ps2_driver = { >> .driver = { >> .name = DRV_NAME, >> .owner = THIS_MODULE, >> + .of_match_table = altera_ps2_match, >> }, >> }; >> >> @@ -189,13 +197,12 @@ static int __init altera_ps2_init(void) >> { >> return platform_driver_register(&altera_ps2_driver); >> } >> +module_init(altera_ps2_init); >> >> static void __exit altera_ps2_exit(void) >> { >> platform_driver_unregister(&altera_ps2_driver); >> } >> - >> -module_init(altera_ps2_init); >> module_exit(altera_ps2_exit); >> >> MODULE_DESCRIPTION("Altera University Program PS2 controller driver"); >> -- >> 1.7.3.5 >> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/