From: Shawn Guo <shawn.guo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Cc: Grant Likely
<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>,
Colin Cross <ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>,
Erik Gilling <konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>,
Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Belisko Marek
<marek.belisko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>,
Sergei Shtylyov
<sshtylyov-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org>
Subject: Re: [RFC PATCH v2 11/13] arm/tegra: Add device tree support to pinmux driver
Date: Tue, 16 Aug 2011 11:45:09 +0800 [thread overview]
Message-ID: <20110816034509.GG8044@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <1313440100-17131-12-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
On Mon, Aug 15, 2011 at 02:28:18PM -0600, Stephen Warren wrote:
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> arch/arm/mach-tegra/pinmux.c | 249 ++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 249 insertions(+), 0 deletions(-)
>
Same question here, since we are moving over to device tree anyway,
is it necessarily to keep these "#ifdef CONFIG_OF" all over the files?
Can we manage to get rid of them, since we have a suite of empty OF API
created for this?
Regards,
Shawn
> diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
> index ed316f9..5dfe6c1 100644
> --- a/arch/arm/mach-tegra/pinmux.c
> +++ b/arch/arm/mach-tegra/pinmux.c
> @@ -20,6 +20,7 @@
> #include <linux/errno.h>
> #include <linux/spinlock.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #include <mach/iomap.h>
> @@ -124,6 +125,21 @@ static const char *pingroup_name(enum tegra_pingroup pg)
> return pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int pingroup_enum(const char *name, enum tegra_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_PINGROUP; pg++)
> + if (!strcasecmp(name, tegra_soc_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *func_name(enum tegra_mux_func func)
> {
> if (func == TEGRA_MUX_RSVD1)
> @@ -147,6 +163,41 @@ static const char *func_name(enum tegra_mux_func func)
> return tegra_mux_names[func];
> }
>
> +#ifdef CONFIG_OF
> +static int func_enum(const char *name, enum tegra_mux_func *func_out)
> +{
> + int func;
> +
> + if (!strcasecmp(name, "RSVD1")) {
> + *func_out = TEGRA_MUX_RSVD1;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD2")) {
> + *func_out = TEGRA_MUX_RSVD2;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD3")) {
> + *func_out = TEGRA_MUX_RSVD3;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD4")) {
> + *func_out = TEGRA_MUX_RSVD4;
> + return 0;
> + }
> + if (!strcasecmp(name, "NONE")) {
> + *func_out = TEGRA_MUX_NONE;
> + return 0;
> + }
> +
> + for (func = 0; func < TEGRA_MAX_MUX; func++)
> + if (!strcasecmp(name, tegra_mux_names[func])) {
> + *func_out = func;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
>
> static const char *tri_name(unsigned long val)
> {
> @@ -329,6 +380,22 @@ static const char *drive_pinmux_name(enum tegra_drive_pingroup pg)
> return drive_pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int drive_pinmux_enum(const char *name,
> + enum tegra_drive_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_DRIVE_PINGROUP; pg++)
> + if (!strcasecmp(name, drive_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *enable_name(unsigned long val)
> {
> return val ? "ENABLE" : "DISABLE";
> @@ -666,15 +733,197 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
> }
> }
>
> +#ifdef CONFIG_OF
> +static void __init tegra_pinmux_parse_mux_groups(
> + struct platform_device *pdev,
> + struct device_node *mux_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(mux_node, node) {
> + struct tegra_pingroup_config config;
> + int ret;
> + const char *func;
> +
> + ret = pingroup_enum(node->name, &config.pingroup);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_string(node, "nvidia,function",
> + &func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Missing property nvidia,function\n",
> + node->name);
> + continue;
> + }
> + ret = func_enum(func, &config.func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid nvidia,function value %s\n",
> + node->name, func);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,pull-up", NULL))
> + config.pupd = TEGRA_PUPD_PULL_UP;
> + else if (of_find_property(node, "nvidia,pull-down", NULL))
> + config.pupd = TEGRA_PUPD_PULL_DOWN;
> + else
> + config.pupd = TEGRA_PUPD_NORMAL;
> +
> + if (of_find_property(node, "nvidia,tristate", NULL))
> + config.tristate = TEGRA_TRI_TRISTATE;
> + else
> + config.tristate = TEGRA_TRI_NORMAL;
> +
> + dev_dbg(&pdev->dev, "(mux) %s: func %d (%s) pull %d tri %d\n",
> + node->name, config.func, func, config.pupd,
> + config.tristate);
> +
> + tegra_pinmux_config_pingroup(&config);
> + }
> +}
> +
> +static void __init tegra_pinmux_parse_drive_groups(
> + struct platform_device *pdev,
> + struct device_node *drive_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(drive_node, node) {
> + enum tegra_drive_pingroup pg;
> + enum tegra_hsm hsm;
> + enum tegra_schmitt schmitt;
> + enum tegra_drive drive;
> + enum tegra_pull_strength pull_down;
> + enum tegra_pull_strength pull_up;
> + enum tegra_slew slew_rising;
> + enum tegra_slew slew_falling;
> + int ret;
> +
> + ret = drive_pinmux_enum(node->name, &pg);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,high-speed-mode", NULL))
> + hsm = TEGRA_HSM_ENABLE;
> + else
> + hsm = TEGRA_HSM_DISABLE;
> +
> + if (of_find_property(node, "nvidia,schmitt", NULL))
> + schmitt = TEGRA_SCHMITT_ENABLE;
> + else
> + schmitt = TEGRA_SCHMITT_DISABLE;
> +
> + ret = of_property_read_u32(node, "nvidia,drive-power", &drive);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,drive-power\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-down-strength",
> + &pull_down);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-down-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-up-strength",
> + &pull_up);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-up-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-rising",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-rising\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-falling",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-falling\n",
> + node->name);
> + continue;
> + }
> +
> + dev_dbg(&pdev->dev,
> + "(drive) %s: hsm %d schmitt %d drive %d "
> + "pull_down %d pull_up %d slew_r %d slew_f %d\n",
> + node->name,
> + hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> +
> + tegra_drive_pinmux_config_pingroup(pg, hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> + }
> +}
> +
> +static void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(pdev->dev.of_node, node) {
> + if (!strcmp(node->name, "nvidia,mux-groups"))
> + tegra_pinmux_parse_mux_groups(pdev, node);
> + else if (!strcmp(node->name, "nvidia,drive-groups"))
> + tegra_pinmux_parse_drive_groups(pdev, node);
> + else
> + dev_err(&pdev->dev, "%s: Unknown child node\n",
> + node->name);
> + }
> +}
> +#else
> +static inline void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> +}
> +#endif
> +
> static int __init tegra_pinmux_probe(struct platform_device *pdev)
> {
> + tegra_pinmux_probe_dt(pdev);
> +
> return 0;
> }
>
> +static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
> + { .compatible = "nvidia,tegra20-pinmux", },
> + { },
> +};
> +
> static struct platform_driver tegra_pinmux_driver = {
> .driver = {
> .name = "tegra-pinmux",
> .owner = THIS_MODULE,
> + .of_match_table = tegra_pinmux_of_match,
> },
> .probe = tegra_pinmux_probe,
> };
> --
> 1.7.0.4
>
>
WARNING: multiple messages have this Message-ID (diff)
From: Shawn Guo <shawn.guo@freescale.com>
To: Stephen Warren <swarren@nvidia.com>
Cc: Grant Likely <grant.likely@secretlab.ca>,
Colin Cross <ccross@android.com>,
Erik Gilling <konkers@android.com>,
Olof Johansson <olof@lixom.net>,
Russell King <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
<devicetree-discuss@lists.ozlabs.org>,
<linux-tegra@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Belisko Marek <marek.belisko@gmail.com>,
Jamie Iles <jamie@jamieiles.com>,
Sergei Shtylyov <sshtylyov@mvista.com>
Subject: Re: [RFC PATCH v2 11/13] arm/tegra: Add device tree support to pinmux driver
Date: Tue, 16 Aug 2011 11:45:09 +0800 [thread overview]
Message-ID: <20110816034509.GG8044@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <1313440100-17131-12-git-send-email-swarren@nvidia.com>
On Mon, Aug 15, 2011 at 02:28:18PM -0600, Stephen Warren wrote:
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> arch/arm/mach-tegra/pinmux.c | 249 ++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 249 insertions(+), 0 deletions(-)
>
Same question here, since we are moving over to device tree anyway,
is it necessarily to keep these "#ifdef CONFIG_OF" all over the files?
Can we manage to get rid of them, since we have a suite of empty OF API
created for this?
Regards,
Shawn
> diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
> index ed316f9..5dfe6c1 100644
> --- a/arch/arm/mach-tegra/pinmux.c
> +++ b/arch/arm/mach-tegra/pinmux.c
> @@ -20,6 +20,7 @@
> #include <linux/errno.h>
> #include <linux/spinlock.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #include <mach/iomap.h>
> @@ -124,6 +125,21 @@ static const char *pingroup_name(enum tegra_pingroup pg)
> return pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int pingroup_enum(const char *name, enum tegra_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_PINGROUP; pg++)
> + if (!strcasecmp(name, tegra_soc_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *func_name(enum tegra_mux_func func)
> {
> if (func == TEGRA_MUX_RSVD1)
> @@ -147,6 +163,41 @@ static const char *func_name(enum tegra_mux_func func)
> return tegra_mux_names[func];
> }
>
> +#ifdef CONFIG_OF
> +static int func_enum(const char *name, enum tegra_mux_func *func_out)
> +{
> + int func;
> +
> + if (!strcasecmp(name, "RSVD1")) {
> + *func_out = TEGRA_MUX_RSVD1;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD2")) {
> + *func_out = TEGRA_MUX_RSVD2;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD3")) {
> + *func_out = TEGRA_MUX_RSVD3;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD4")) {
> + *func_out = TEGRA_MUX_RSVD4;
> + return 0;
> + }
> + if (!strcasecmp(name, "NONE")) {
> + *func_out = TEGRA_MUX_NONE;
> + return 0;
> + }
> +
> + for (func = 0; func < TEGRA_MAX_MUX; func++)
> + if (!strcasecmp(name, tegra_mux_names[func])) {
> + *func_out = func;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
>
> static const char *tri_name(unsigned long val)
> {
> @@ -329,6 +380,22 @@ static const char *drive_pinmux_name(enum tegra_drive_pingroup pg)
> return drive_pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int drive_pinmux_enum(const char *name,
> + enum tegra_drive_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_DRIVE_PINGROUP; pg++)
> + if (!strcasecmp(name, drive_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *enable_name(unsigned long val)
> {
> return val ? "ENABLE" : "DISABLE";
> @@ -666,15 +733,197 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
> }
> }
>
> +#ifdef CONFIG_OF
> +static void __init tegra_pinmux_parse_mux_groups(
> + struct platform_device *pdev,
> + struct device_node *mux_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(mux_node, node) {
> + struct tegra_pingroup_config config;
> + int ret;
> + const char *func;
> +
> + ret = pingroup_enum(node->name, &config.pingroup);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_string(node, "nvidia,function",
> + &func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Missing property nvidia,function\n",
> + node->name);
> + continue;
> + }
> + ret = func_enum(func, &config.func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid nvidia,function value %s\n",
> + node->name, func);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,pull-up", NULL))
> + config.pupd = TEGRA_PUPD_PULL_UP;
> + else if (of_find_property(node, "nvidia,pull-down", NULL))
> + config.pupd = TEGRA_PUPD_PULL_DOWN;
> + else
> + config.pupd = TEGRA_PUPD_NORMAL;
> +
> + if (of_find_property(node, "nvidia,tristate", NULL))
> + config.tristate = TEGRA_TRI_TRISTATE;
> + else
> + config.tristate = TEGRA_TRI_NORMAL;
> +
> + dev_dbg(&pdev->dev, "(mux) %s: func %d (%s) pull %d tri %d\n",
> + node->name, config.func, func, config.pupd,
> + config.tristate);
> +
> + tegra_pinmux_config_pingroup(&config);
> + }
> +}
> +
> +static void __init tegra_pinmux_parse_drive_groups(
> + struct platform_device *pdev,
> + struct device_node *drive_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(drive_node, node) {
> + enum tegra_drive_pingroup pg;
> + enum tegra_hsm hsm;
> + enum tegra_schmitt schmitt;
> + enum tegra_drive drive;
> + enum tegra_pull_strength pull_down;
> + enum tegra_pull_strength pull_up;
> + enum tegra_slew slew_rising;
> + enum tegra_slew slew_falling;
> + int ret;
> +
> + ret = drive_pinmux_enum(node->name, &pg);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,high-speed-mode", NULL))
> + hsm = TEGRA_HSM_ENABLE;
> + else
> + hsm = TEGRA_HSM_DISABLE;
> +
> + if (of_find_property(node, "nvidia,schmitt", NULL))
> + schmitt = TEGRA_SCHMITT_ENABLE;
> + else
> + schmitt = TEGRA_SCHMITT_DISABLE;
> +
> + ret = of_property_read_u32(node, "nvidia,drive-power", &drive);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,drive-power\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-down-strength",
> + &pull_down);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-down-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-up-strength",
> + &pull_up);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-up-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-rising",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-rising\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-falling",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-falling\n",
> + node->name);
> + continue;
> + }
> +
> + dev_dbg(&pdev->dev,
> + "(drive) %s: hsm %d schmitt %d drive %d "
> + "pull_down %d pull_up %d slew_r %d slew_f %d\n",
> + node->name,
> + hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> +
> + tegra_drive_pinmux_config_pingroup(pg, hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> + }
> +}
> +
> +static void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(pdev->dev.of_node, node) {
> + if (!strcmp(node->name, "nvidia,mux-groups"))
> + tegra_pinmux_parse_mux_groups(pdev, node);
> + else if (!strcmp(node->name, "nvidia,drive-groups"))
> + tegra_pinmux_parse_drive_groups(pdev, node);
> + else
> + dev_err(&pdev->dev, "%s: Unknown child node\n",
> + node->name);
> + }
> +}
> +#else
> +static inline void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> +}
> +#endif
> +
> static int __init tegra_pinmux_probe(struct platform_device *pdev)
> {
> + tegra_pinmux_probe_dt(pdev);
> +
> return 0;
> }
>
> +static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
> + { .compatible = "nvidia,tegra20-pinmux", },
> + { },
> +};
> +
> static struct platform_driver tegra_pinmux_driver = {
> .driver = {
> .name = "tegra-pinmux",
> .owner = THIS_MODULE,
> + .of_match_table = tegra_pinmux_of_match,
> },
> .probe = tegra_pinmux_probe,
> };
> --
> 1.7.0.4
>
>
WARNING: multiple messages have this Message-ID (diff)
From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v2 11/13] arm/tegra: Add device tree support to pinmux driver
Date: Tue, 16 Aug 2011 11:45:09 +0800 [thread overview]
Message-ID: <20110816034509.GG8044@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <1313440100-17131-12-git-send-email-swarren@nvidia.com>
On Mon, Aug 15, 2011 at 02:28:18PM -0600, Stephen Warren wrote:
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> arch/arm/mach-tegra/pinmux.c | 249 ++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 249 insertions(+), 0 deletions(-)
>
Same question here, since we are moving over to device tree anyway,
is it necessarily to keep these "#ifdef CONFIG_OF" all over the files?
Can we manage to get rid of them, since we have a suite of empty OF API
created for this?
Regards,
Shawn
> diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
> index ed316f9..5dfe6c1 100644
> --- a/arch/arm/mach-tegra/pinmux.c
> +++ b/arch/arm/mach-tegra/pinmux.c
> @@ -20,6 +20,7 @@
> #include <linux/errno.h>
> #include <linux/spinlock.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
>
> #include <mach/iomap.h>
> @@ -124,6 +125,21 @@ static const char *pingroup_name(enum tegra_pingroup pg)
> return pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int pingroup_enum(const char *name, enum tegra_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_PINGROUP; pg++)
> + if (!strcasecmp(name, tegra_soc_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *func_name(enum tegra_mux_func func)
> {
> if (func == TEGRA_MUX_RSVD1)
> @@ -147,6 +163,41 @@ static const char *func_name(enum tegra_mux_func func)
> return tegra_mux_names[func];
> }
>
> +#ifdef CONFIG_OF
> +static int func_enum(const char *name, enum tegra_mux_func *func_out)
> +{
> + int func;
> +
> + if (!strcasecmp(name, "RSVD1")) {
> + *func_out = TEGRA_MUX_RSVD1;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD2")) {
> + *func_out = TEGRA_MUX_RSVD2;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD3")) {
> + *func_out = TEGRA_MUX_RSVD3;
> + return 0;
> + }
> + if (!strcasecmp(name, "RSVD4")) {
> + *func_out = TEGRA_MUX_RSVD4;
> + return 0;
> + }
> + if (!strcasecmp(name, "NONE")) {
> + *func_out = TEGRA_MUX_NONE;
> + return 0;
> + }
> +
> + for (func = 0; func < TEGRA_MAX_MUX; func++)
> + if (!strcasecmp(name, tegra_mux_names[func])) {
> + *func_out = func;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
>
> static const char *tri_name(unsigned long val)
> {
> @@ -329,6 +380,22 @@ static const char *drive_pinmux_name(enum tegra_drive_pingroup pg)
> return drive_pingroups[pg].name;
> }
>
> +#ifdef CONFIG_OF
> +static int drive_pinmux_enum(const char *name,
> + enum tegra_drive_pingroup *pg_out)
> +{
> + int pg;
> +
> + for (pg = 0; pg < TEGRA_MAX_DRIVE_PINGROUP; pg++)
> + if (!strcasecmp(name, drive_pingroups[pg].name)) {
> + *pg_out = pg;
> + return 0;
> + }
> +
> + return -EINVAL;
> +}
> +#endif
> +
> static const char *enable_name(unsigned long val)
> {
> return val ? "ENABLE" : "DISABLE";
> @@ -666,15 +733,197 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
> }
> }
>
> +#ifdef CONFIG_OF
> +static void __init tegra_pinmux_parse_mux_groups(
> + struct platform_device *pdev,
> + struct device_node *mux_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(mux_node, node) {
> + struct tegra_pingroup_config config;
> + int ret;
> + const char *func;
> +
> + ret = pingroup_enum(node->name, &config.pingroup);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_string(node, "nvidia,function",
> + &func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Missing property nvidia,function\n",
> + node->name);
> + continue;
> + }
> + ret = func_enum(func, &config.func);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(mux) %s: Invalid nvidia,function value %s\n",
> + node->name, func);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,pull-up", NULL))
> + config.pupd = TEGRA_PUPD_PULL_UP;
> + else if (of_find_property(node, "nvidia,pull-down", NULL))
> + config.pupd = TEGRA_PUPD_PULL_DOWN;
> + else
> + config.pupd = TEGRA_PUPD_NORMAL;
> +
> + if (of_find_property(node, "nvidia,tristate", NULL))
> + config.tristate = TEGRA_TRI_TRISTATE;
> + else
> + config.tristate = TEGRA_TRI_NORMAL;
> +
> + dev_dbg(&pdev->dev, "(mux) %s: func %d (%s) pull %d tri %d\n",
> + node->name, config.func, func, config.pupd,
> + config.tristate);
> +
> + tegra_pinmux_config_pingroup(&config);
> + }
> +}
> +
> +static void __init tegra_pinmux_parse_drive_groups(
> + struct platform_device *pdev,
> + struct device_node *drive_node)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(drive_node, node) {
> + enum tegra_drive_pingroup pg;
> + enum tegra_hsm hsm;
> + enum tegra_schmitt schmitt;
> + enum tegra_drive drive;
> + enum tegra_pull_strength pull_down;
> + enum tegra_pull_strength pull_up;
> + enum tegra_slew slew_rising;
> + enum tegra_slew slew_falling;
> + int ret;
> +
> + ret = drive_pinmux_enum(node->name, &pg);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Invalid pingroup name\n",
> + node->name);
> + continue;
> + }
> +
> + if (of_find_property(node, "nvidia,high-speed-mode", NULL))
> + hsm = TEGRA_HSM_ENABLE;
> + else
> + hsm = TEGRA_HSM_DISABLE;
> +
> + if (of_find_property(node, "nvidia,schmitt", NULL))
> + schmitt = TEGRA_SCHMITT_ENABLE;
> + else
> + schmitt = TEGRA_SCHMITT_DISABLE;
> +
> + ret = of_property_read_u32(node, "nvidia,drive-power", &drive);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,drive-power\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-down-strength",
> + &pull_down);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-down-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,pull-up-strength",
> + &pull_up);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,pull-up-strength\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-rising",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-rising\n",
> + node->name);
> + continue;
> + }
> +
> + ret = of_property_read_u32(node, "nvidia,slew-rate-falling",
> + &slew_rising);
> + if (ret < 0) {
> + dev_err(&pdev->dev,
> + "(drive) %s: Missing property "
> + "nvidia,slew_rate-falling\n",
> + node->name);
> + continue;
> + }
> +
> + dev_dbg(&pdev->dev,
> + "(drive) %s: hsm %d schmitt %d drive %d "
> + "pull_down %d pull_up %d slew_r %d slew_f %d\n",
> + node->name,
> + hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> +
> + tegra_drive_pinmux_config_pingroup(pg, hsm, schmitt, drive,
> + pull_down, pull_up,
> + slew_rising, slew_falling);
> + }
> +}
> +
> +static void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> + struct device_node *node;
> +
> + for_each_child_of_node(pdev->dev.of_node, node) {
> + if (!strcmp(node->name, "nvidia,mux-groups"))
> + tegra_pinmux_parse_mux_groups(pdev, node);
> + else if (!strcmp(node->name, "nvidia,drive-groups"))
> + tegra_pinmux_parse_drive_groups(pdev, node);
> + else
> + dev_err(&pdev->dev, "%s: Unknown child node\n",
> + node->name);
> + }
> +}
> +#else
> +static inline void __init tegra_pinmux_probe_dt(struct platform_device *pdev)
> +{
> +}
> +#endif
> +
> static int __init tegra_pinmux_probe(struct platform_device *pdev)
> {
> + tegra_pinmux_probe_dt(pdev);
> +
> return 0;
> }
>
> +static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
> + { .compatible = "nvidia,tegra20-pinmux", },
> + { },
> +};
> +
> static struct platform_driver tegra_pinmux_driver = {
> .driver = {
> .name = "tegra-pinmux",
> .owner = THIS_MODULE,
> + .of_match_table = tegra_pinmux_of_match,
> },
> .probe = tegra_pinmux_probe,
> };
> --
> 1.7.0.4
>
>
next prev parent reply other threads:[~2011-08-16 3:45 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-15 20:28 [RFC PATCH v2 00/13] arm/tegra: Initialize GPIO & pinmux from DT Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 02/13] arm/tegra: Avoid duplicate gpio/pinmux devices with dt Stephen Warren
2011-08-15 20:28 ` Stephen Warren
[not found] ` <1313440100-17131-3-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-08-16 20:46 ` Stephen Warren
2011-08-16 20:46 ` Stephen Warren
2011-08-16 20:46 ` Stephen Warren
[not found] ` <1313440100-17131-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-08-15 20:28 ` [RFC PATCH v2 01/13] arm/tegra: Prep boards for gpio/pinmux conversion to pdevs Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 03/13] arm/tegra: board-dt: Add AUXDATA for tegra-gpio and tegra-pinmux Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-16 3:30 ` Shawn Guo
2011-08-16 3:30 ` Shawn Guo
2011-08-16 3:30 ` Shawn Guo
[not found] ` <20110816033056.GE8044-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-08-16 20:24 ` Stephen Warren
2011-08-16 20:24 ` Stephen Warren
2011-08-16 20:24 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 04/13] docs/dt: Document nvidia, tegra20-gpio's nvidia, enabled-gpios property Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 04/13] docs/dt: Document nvidia,tegra20-gpio's nvidia,enabled-gpios property Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 05/13] arm/dt: Tegra: Add nvidia, gpios property to GPIO controller Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 05/13] arm/dt: Tegra: Add nvidia,gpios " Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 06/13] docs/dt: Document nvidia,tegra20-pinmux binding Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
[not found] ` <1313440100-17131-7-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-08-16 3:48 ` Shawn Guo
2011-08-16 3:48 ` Shawn Guo
2011-08-16 3:48 ` Shawn Guo
2011-08-16 13:51 ` Arnd Bergmann
2011-08-16 13:51 ` [RFC PATCH v2 06/13] docs/dt: Document nvidia, tegra20-pinmux binding Arnd Bergmann
2011-08-16 13:51 ` [RFC PATCH v2 06/13] docs/dt: Document nvidia,tegra20-pinmux binding Arnd Bergmann
[not found] ` <201108161551.31389.arnd-r2nGTMty4D4@public.gmane.org>
2011-08-16 17:32 ` Stephen Warren
2011-08-16 17:32 ` Stephen Warren
2011-08-16 17:32 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04AEA2537D-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-08-17 6:02 ` Shawn Guo
2011-08-17 6:02 ` Shawn Guo
2011-08-17 6:02 ` Shawn Guo
[not found] ` <20110817060242.GA10037-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-08-17 6:17 ` Shawn Guo
2011-08-17 6:17 ` Shawn Guo
2011-08-17 6:17 ` Shawn Guo
2011-08-17 11:37 ` Arnd Bergmann
2011-08-17 11:37 ` [RFC PATCH v2 06/13] docs/dt: Document nvidia, tegra20-pinmux binding Arnd Bergmann
2011-08-17 11:37 ` [RFC PATCH v2 06/13] docs/dt: Document nvidia,tegra20-pinmux binding Arnd Bergmann
[not found] ` <201108171337.26166.arnd-r2nGTMty4D4@public.gmane.org>
2011-08-17 11:43 ` Jamie Iles
2011-08-17 11:43 ` Jamie Iles
2011-08-17 11:43 ` Jamie Iles
2011-08-18 6:36 ` Stephen Warren
2011-08-18 6:36 ` Stephen Warren
2011-08-18 6:36 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 07/13] arm/dt: Tegra: Add pinmux node Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 08/13] gpio/tegra: Convert to a platform device Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 10/13] arm/tegra: Convert pinmux driver " Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-16 13:09 ` [RFC PATCH v2 00/13] arm/tegra: Initialize GPIO & pinmux from DT Arnd Bergmann
2011-08-16 13:09 ` Arnd Bergmann
2011-08-16 13:09 ` Arnd Bergmann
[not found] ` <201108161509.17157.arnd-r2nGTMty4D4@public.gmane.org>
2011-08-16 14:01 ` Linus Walleij
2011-08-16 14:01 ` Linus Walleij
2011-08-16 14:01 ` Linus Walleij
[not found] ` <CACRpkdaVx=6AJ5DFjVN1ZYQ++hu9pT6WxD9n+pqmYVaCf1xawg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-08-16 14:37 ` Arnd Bergmann
2011-08-16 14:37 ` Arnd Bergmann
2011-08-16 14:37 ` Arnd Bergmann
[not found] ` <201108161637.16620.arnd-r2nGTMty4D4@public.gmane.org>
2011-08-16 14:45 ` Linus Walleij
2011-08-16 14:45 ` Linus Walleij
2011-08-16 14:45 ` Linus Walleij
2011-08-16 17:12 ` Stephen Warren
2011-08-16 17:12 ` Stephen Warren
2011-08-16 17:12 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04AEA25368-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-08-17 11:23 ` Arnd Bergmann
2011-08-17 11:23 ` Arnd Bergmann
2011-08-17 11:23 ` Arnd Bergmann
[not found] ` <201108171323.38441.arnd-r2nGTMty4D4@public.gmane.org>
2011-08-18 6:22 ` Stephen Warren
2011-08-18 6:22 ` Stephen Warren
2011-08-18 6:22 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04AF6F3062-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-08-18 9:15 ` Arnd Bergmann
2011-08-18 9:15 ` Arnd Bergmann
2011-08-18 9:15 ` Arnd Bergmann
2011-08-23 12:51 ` Linus Walleij
2011-08-23 12:51 ` Linus Walleij
2011-08-23 12:51 ` Linus Walleij
[not found] ` <CACRpkdY=nVQYnznTU7=_D0n1V1U_xOKH2y75-jKp7k7NzwH8Zw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-08-23 18:49 ` Stephen Warren
2011-08-23 18:49 ` Stephen Warren
2011-08-23 18:49 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04B24A38E6-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-08-23 20:00 ` Linus Walleij
2011-08-23 20:00 ` Linus Walleij
2011-08-23 20:00 ` Linus Walleij
2011-08-22 19:56 ` Stephen Warren
2011-08-22 19:56 ` Stephen Warren
2011-08-22 19:56 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04B24A3687-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-08-22 22:56 ` Olof Johansson
2011-08-22 22:56 ` Olof Johansson
2011-08-22 22:56 ` Olof Johansson
2011-08-15 20:28 ` [RFC PATCH v2 09/13] gpio/tegra: Add device tree support Stephen Warren
2011-08-15 20:28 ` Stephen Warren
[not found] ` <1313440100-17131-10-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-08-16 3:39 ` Shawn Guo
2011-08-16 3:39 ` Shawn Guo
2011-08-16 3:39 ` Shawn Guo
2011-08-15 20:28 ` [RFC PATCH v2 11/13] arm/tegra: Add device tree support to pinmux driver Stephen Warren
2011-08-15 20:28 ` Stephen Warren
[not found] ` <1313440100-17131-12-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-08-16 3:45 ` Shawn Guo [this message]
2011-08-16 3:45 ` Shawn Guo
2011-08-16 3:45 ` Shawn Guo
[not found] ` <20110816034509.GG8044-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-08-23 23:35 ` Stephen Warren
2011-08-23 23:35 ` Stephen Warren
2011-08-23 23:35 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 12/13] arm/tegra: board-dt: Remove dependency on non-dt pinmux functions Stephen Warren
2011-08-15 20:28 ` Stephen Warren
2011-08-15 20:28 ` [RFC PATCH v2 13/13] arm/tegra: Remove temporary gpio/pinmux registration workaround Stephen Warren
2011-08-15 20:28 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110816034509.GG8044@S2100-06.ap.freescale.net \
--to=shawn.guo-kzfg59tc24xl57midrcfdg@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
--cc=jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org \
--cc=konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=marek.belisko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=sshtylyov-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org \
--cc=swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.