From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
To: Maxime Ripard
<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Michael Turquette
<mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: [PATCH 08/11] ARM: dts: sun8i-a23-q8-tablet: Drop pinmux setting for codec PA gpio
Date: Tue, 24 Jan 2017 10:32:27 +0800 [thread overview]
Message-ID: <20170124023230.3990-9-wens@csie.org> (raw)
In-Reply-To: <20170124023230.3990-1-wens-jdAy2FN1RRM@public.gmane.org>
We are moving towards handling GPIO pinmux settings that don't require
extra bias or drive strength settings to use the GPIO bindings only.
Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 10 ----------
drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 24 ++++++++++++------------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
index 3ab5c0c09d93..b6958e8f2f01 100644
--- a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
+++ b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
@@ -50,7 +50,6 @@
};
&codec {
- pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
allwinner,audio-routing =
"Headphone", "HP",
@@ -62,12 +61,3 @@
"Headset Mic", "HBIAS";
status = "okay";
};
-
-&pio {
- codec_pa_pin: codec_pa_pin@0 {
- allwinner,pins = "PH9";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
- };
-};
diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80.c
index 5626e4674f48..e13e313ce4f5 100644
--- a/drivers/clk/sunxi-ng/ccu-sun9i-a80.c
+++ b/drivers/clk/sunxi-ng/ccu-sun9i-a80.c
@@ -42,7 +42,7 @@ static struct clk_div_table pll_cpux_p_div_table[] = {
static struct ccu_nm pll_c0cpux_clk = {
.enable = BIT(31),
.lock = BIT(0),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV_TABLE(16, 1, pll_cpux_p_div_table),
.common = {
.reg = 0x000,
@@ -56,7 +56,7 @@ static struct ccu_nm pll_c0cpux_clk = {
static struct ccu_nm pll_c1cpux_clk = {
.enable = BIT(31),
.lock = BIT(1),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV_TABLE(16, 1, pll_cpux_p_div_table),
.common = {
.reg = 0x004,
@@ -78,7 +78,7 @@ static struct ccu_nm pll_c1cpux_clk = {
static struct ccu_nm pll_audio_clk = {
.enable = BIT(31),
.lock = BIT(2),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV_OFFSET(0, 6, 0),
.common = {
.reg = 0x008,
@@ -93,7 +93,7 @@ static struct ccu_nm pll_audio_clk = {
static struct ccu_nkmp pll_periph0_clk = {
.enable = BIT(31),
.lock = BIT(3),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -109,7 +109,7 @@ static struct ccu_nkmp pll_periph0_clk = {
static struct ccu_nkmp pll_ve_clk = {
.enable = BIT(31),
.lock = BIT(4),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -125,7 +125,7 @@ static struct ccu_nkmp pll_ve_clk = {
static struct ccu_nkmp pll_ddr_clk = {
.enable = BIT(31),
.lock = BIT(5),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -141,7 +141,7 @@ static struct ccu_nkmp pll_ddr_clk = {
static struct ccu_nm pll_video0_clk = {
.enable = BIT(31),
.lock = BIT(6),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.common = {
.reg = 0x018,
@@ -156,7 +156,7 @@ static struct ccu_nm pll_video0_clk = {
static struct ccu_nkmp pll_video1_clk = {
.enable = BIT(31),
.lock = BIT(7),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(0, 2), /* external divider p */
.common = {
@@ -172,7 +172,7 @@ static struct ccu_nkmp pll_video1_clk = {
static struct ccu_nkmp pll_gpu_clk = {
.enable = BIT(31),
.lock = BIT(8),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -188,7 +188,7 @@ static struct ccu_nkmp pll_gpu_clk = {
static struct ccu_nkmp pll_de_clk = {
.enable = BIT(31),
.lock = BIT(9),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -204,7 +204,7 @@ static struct ccu_nkmp pll_de_clk = {
static struct ccu_nkmp pll_isp_clk = {
.enable = BIT(31),
.lock = BIT(10),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
@@ -220,7 +220,7 @@ static struct ccu_nkmp pll_isp_clk = {
static struct ccu_nkmp pll_periph1_clk = {
.enable = BIT(31),
.lock = BIT(11),
- .n = _SUNXI_CCU_MULT_OFFSET_MIN(8, 8, 0, 12),
+ .n = _SUNXI_CCU_MULT_OFFSET_MIN_MAX(8, 8, 0, 12, 0),
.m = _SUNXI_CCU_DIV(16, 1), /* input divider */
.p = _SUNXI_CCU_DIV(18, 1), /* output divider */
.common = {
--
2.11.0
next prev parent reply other threads:[~2017-01-24 2:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 2:32 [PATCH 00/11] clk: sunxi-ng: Add support for A80 CCUs Chen-Yu Tsai
[not found] ` <20170124023230.3990-1-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-24 2:32 ` [PATCH 01/11] clk: sunxi-ng: mux: Fix determine_rate for mux clocks with pre-dividers Chen-Yu Tsai
[not found] ` <20170124023230.3990-2-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-26 9:55 ` Maxime Ripard
2017-01-26 11:22 ` Chen-Yu Tsai
2017-01-24 2:32 ` [PATCH 02/11] clk: sunxi-ng: mux: honor CLK_SET_RATE_NO_REPARENT flag Chen-Yu Tsai
2017-01-24 2:32 ` [PATCH 03/11] clk: sunxi-ng: mux: Get closest parent rate possible with CLK_SET_RATE_PARENT Chen-Yu Tsai
2017-01-24 2:32 ` [PATCH 04/11] clk: sunxi-ng: Support separately grouped PLL lock status register Chen-Yu Tsai
2017-01-26 9:57 ` Maxime Ripard
2017-01-24 2:32 ` [PATCH 05/11] clk: sunxi-ng: Add A80 CCU Chen-Yu Tsai
[not found] ` <20170124023230.3990-6-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-27 21:13 ` Rob Herring
2017-01-24 2:32 ` [PATCH 06/11] clk: sunxi-ng: Add A80 USB CCU Chen-Yu Tsai
[not found] ` <20170124023230.3990-7-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-26 10:14 ` Maxime Ripard
2017-01-26 11:12 ` [linux-sunxi] " Chen-Yu Tsai
[not found] ` <CAGb2v66R+NtOQ_J-kQeawppvPUUxBd1n0BXD7p8H5JA6pwYDJQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-27 8:45 ` Maxime Ripard
2017-01-27 21:15 ` Rob Herring
2017-01-24 2:32 ` [PATCH 07/11] clk: sunxi-ng: Add A80 Display Engine CCU Chen-Yu Tsai
2017-01-26 10:39 ` Maxime Ripard
2017-01-26 11:20 ` Chen-Yu Tsai
[not found] ` <CAGb2v65QLAD4C27NoRHALO=2WzW=DC6OxwCCMhes-N+kWO3_kg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-27 8:58 ` Maxime Ripard
2017-01-27 9:26 ` Chen-Yu Tsai
[not found] ` <CAGb2v671951p7-QNJh_JHXqCPJMHso8EjER-mBt1sn8j+U+uHg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-27 9:42 ` Maxime Ripard
2017-01-24 2:32 ` Chen-Yu Tsai [this message]
[not found] ` <20170124023230.3990-9-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-26 10:38 ` [PATCH 08/11] ARM: dts: sun8i-a23-q8-tablet: Drop pinmux setting for codec PA gpio Maxime Ripard
2017-01-26 11:15 ` Chen-Yu Tsai
2017-01-24 2:32 ` [PATCH 09/11] ARM: dts: sunxi: Remove no longer used pinctrl/sun4i-a10.h header Chen-Yu Tsai
[not found] ` <20170124023230.3990-10-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-26 10:21 ` Maxime Ripard
2017-01-24 2:32 ` [PATCH 10/11] arm64: dts: allwinner: " Chen-Yu Tsai
[not found] ` <20170124023230.3990-11-wens-jdAy2FN1RRM@public.gmane.org>
2017-01-26 10:15 ` Maxime Ripard
2017-01-26 11:23 ` Chen-Yu Tsai
[not found] ` <CAGb2v66cQoPQzd6W1D8bZ5hSURfGP3icJjeoo1mNk2ccG9B2vw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-01-27 8:46 ` Maxime Ripard
2017-01-24 2:32 ` [PATCH 11/11] ARM: dts: sun9i: Switch to new clock bindings Chen-Yu Tsai
2017-01-24 6:03 ` [PATCH 00/11] clk: sunxi-ng: Add support for A80 CCUs Priit Laes
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=20170124023230.3990-9-wens@csie.org \
--to=wens-jday2fn1rrm@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sboyd-sgV2jX0FEOL9JmXXK+q4OQ@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 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).