From: Paul Cercueil <paul@crapouillou.net>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: 周琰杰 <zhouyanjie@wanyeetech.com>,
od@zcrc.me, linux-gpio@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Paul Cercueil" <paul@crapouillou.net>
Subject: [PATCH 3/5] pinctrl: ingenic: Remove duplicated ingenic_chip_info structures
Date: Tue, 7 Jan 2020 00:27:09 +0100 [thread overview]
Message-ID: <20200106232711.559727-4-paul@crapouillou.net> (raw)
In-Reply-To: <20200106232711.559727-1-paul@crapouillou.net>
Until there is the need to handle the JZ4760B and X1000E differently
there is no reason to use a separate ingenic_chip_info since the data
it contains is the same than for the JZ4760 and X1000 respectively.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/pinctrl/pinctrl-ingenic.c | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 7a1d6a720b78..7f73f27cce91 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -61,11 +61,9 @@ enum jz_version {
ID_JZ4740,
ID_JZ4725B,
ID_JZ4760,
- ID_JZ4760B,
ID_JZ4770,
ID_JZ4780,
ID_X1000,
- ID_X1000E,
ID_X1500,
ID_X1830,
};
@@ -615,18 +613,6 @@ static const struct ingenic_chip_info jz4760_chip_info = {
.pull_downs = jz4760_pull_downs,
};
-static const struct ingenic_chip_info jz4760b_chip_info = {
- .num_chips = 6,
- .reg_offset = 0x100,
- .version = ID_JZ4760B,
- .groups = jz4760_groups,
- .num_groups = ARRAY_SIZE(jz4760_groups),
- .functions = jz4760_functions,
- .num_functions = ARRAY_SIZE(jz4760_functions),
- .pull_ups = jz4760_pull_ups,
- .pull_downs = jz4760_pull_downs,
-};
-
static const u32 jz4770_pull_ups[6] = {
0x3fffffff, 0xfff0030c, 0xffffffff, 0xffff4fff, 0xfffffb7c, 0xffa7f00f,
};
@@ -1300,18 +1286,6 @@ static const struct ingenic_chip_info x1000_chip_info = {
.pull_downs = x1000_pull_downs,
};
-static const struct ingenic_chip_info x1000e_chip_info = {
- .num_chips = 4,
- .reg_offset = 0x100,
- .version = ID_X1000E,
- .groups = x1000_groups,
- .num_groups = ARRAY_SIZE(x1000_groups),
- .functions = x1000_functions,
- .num_functions = ARRAY_SIZE(x1000_functions),
- .pull_ups = x1000_pull_ups,
- .pull_downs = x1000_pull_downs,
-};
-
static int x1500_uart0_data_pins[] = { 0x4a, 0x4b, };
static int x1500_uart0_hwflow_pins[] = { 0x4c, 0x4d, };
static int x1500_uart1_data_a_pins[] = { 0x04, 0x05, };
@@ -2460,11 +2434,11 @@ static const struct of_device_id ingenic_pinctrl_of_match[] = {
{ .compatible = "ingenic,jz4740-pinctrl", .data = &jz4740_chip_info },
{ .compatible = "ingenic,jz4725b-pinctrl", .data = &jz4725b_chip_info },
{ .compatible = "ingenic,jz4760-pinctrl", .data = &jz4760_chip_info },
- { .compatible = "ingenic,jz4760b-pinctrl", .data = &jz4760b_chip_info },
+ { .compatible = "ingenic,jz4760b-pinctrl", .data = &jz4760_chip_info },
{ .compatible = "ingenic,jz4770-pinctrl", .data = &jz4770_chip_info },
{ .compatible = "ingenic,jz4780-pinctrl", .data = &jz4780_chip_info },
{ .compatible = "ingenic,x1000-pinctrl", .data = &x1000_chip_info },
- { .compatible = "ingenic,x1000e-pinctrl", .data = &x1000e_chip_info },
+ { .compatible = "ingenic,x1000e-pinctrl", .data = &x1000_chip_info },
{ .compatible = "ingenic,x1500-pinctrl", .data = &x1500_chip_info },
{ .compatible = "ingenic,x1830-pinctrl", .data = &x1830_chip_info },
{},
--
2.24.1
next prev parent reply other threads:[~2020-01-06 23:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 23:27 [PATCH 0/5] pinctrl: ingenic: cleanups Paul Cercueil
2020-01-06 23:27 ` [PATCH 1/5] pinctrl: ingenic: Remove platform ID table Paul Cercueil
2020-01-06 23:27 ` [PATCH 2/5] pinctrl: ingenic: Put ingenic_chip_info pointer in match data Paul Cercueil
2020-01-06 23:27 ` Paul Cercueil [this message]
2020-01-06 23:27 ` [PATCH 4/5] pinctrl: ingenic: Factorize irq_set_type function Paul Cercueil
2020-01-06 23:27 ` [PATCH 5/5] pinctrl: ingenic: Use devm_platform_ioremap_resource() Paul Cercueil
2020-01-07 12:35 ` [PATCH 0/5] pinctrl: ingenic: cleanups Linus Walleij
2020-01-07 14:23 ` Zhou Yanjie
2020-01-08 11:18 ` Zhou Yanjie
2020-01-07 14:11 ` Zhou Yanjie
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=20200106232711.559727-4-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=od@zcrc.me \
--cc=zhouyanjie@wanyeetech.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).