* [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order
@ 2019-12-19 9:15 Maxime Ripard
2019-12-19 9:15 ` [PATCH 2/5] ARM: dts: sun8i: v3s: Remove redundant assigned-clocks Maxime Ripard
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Maxime Ripard @ 2019-12-19 9:15 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard; +Cc: Maxime Ripard, linux-arm-kernel
While this is functional, it's a best practice to always have the clocks
and reset lines in order, in case we ever need to have compatibility code.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
arch/arm/boot/dts/sun9i-a80.dtsi | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 1d900f591d5f..dd292a670921 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -387,16 +387,16 @@
usbphy2: phy@a01800 {
compatible = "allwinner,sun9i-a80-usb-phy";
reg = <0x00a01800 0x4>;
- clocks = <&usb_clocks CLK_USB1_HSIC>,
+ clocks = <&usb_clocks CLK_USB1_PHY>,
<&usb_clocks CLK_USB_HSIC>,
- <&usb_clocks CLK_USB1_PHY>;
- clock-names = "hsic_480M",
+ <&usb_clocks CLK_USB1_HSIC>;
+ clock-names = "phy",
"hsic_12M",
- "phy";
- resets = <&usb_clocks RST_USB1_HSIC>,
- <&usb_clocks RST_USB1_PHY>;
- reset-names = "hsic",
- "phy";
+ "hsic_480M";
+ resets = <&usb_clocks RST_USB1_PHY>,
+ <&usb_clocks RST_USB1_HSIC>;
+ reset-names = "phy",
+ "hsic";
status = "disabled";
#phy-cells = <0>;
/* usb1 is always used with HSIC */
@@ -429,16 +429,16 @@
usbphy3: phy@a02800 {
compatible = "allwinner,sun9i-a80-usb-phy";
reg = <0x00a02800 0x4>;
- clocks = <&usb_clocks CLK_USB2_HSIC>,
+ clocks = <&usb_clocks CLK_USB2_PHY>,
<&usb_clocks CLK_USB_HSIC>,
- <&usb_clocks CLK_USB2_PHY>;
- clock-names = "hsic_480M",
+ <&usb_clocks CLK_USB2_HSIC>;
+ clock-names = "phy",
"hsic_12M",
- "phy";
- resets = <&usb_clocks RST_USB2_HSIC>,
- <&usb_clocks RST_USB2_PHY>;
- reset-names = "hsic",
- "phy";
+ "hsic_480M";
+ resets = <&usb_clocks RST_USB2_PHY>,
+ <&usb_clocks RST_USB2_HSIC>;
+ reset-names = "phy",
+ "hsic";
status = "disabled";
#phy-cells = <0>;
};
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/5] ARM: dts: sun8i: v3s: Remove redundant assigned-clocks
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
@ 2019-12-19 9:15 ` Maxime Ripard
2019-12-19 15:17 ` Chen-Yu Tsai
2019-12-19 9:15 ` [PATCH 3/5] ARM: dts: sunxi: Add missing dmas properties to TCON Maxime Ripard
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Maxime Ripard @ 2019-12-19 9:15 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard; +Cc: Maxime Ripard, linux-arm-kernel
The V3s mixer node has an assigned clocks property, while the driver also
enforces it.
Since assigned-clocks is pretty fragile anyway, let's just remove it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
arch/arm/boot/dts/sun8i-v3s.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
index 23ba56df38f7..81ea50838cd5 100644
--- a/arch/arm/boot/dts/sun8i-v3s.dtsi
+++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
@@ -123,8 +123,6 @@
clock-names = "bus",
"mod";
resets = <&display_clocks 0>;
- assigned-clocks = <&display_clocks 6>;
- assigned-clock-rates = <150000000>;
ports {
#address-cells = <1>;
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/5] ARM: dts: sunxi: Add missing dmas properties to TCON
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
2019-12-19 9:15 ` [PATCH 2/5] ARM: dts: sun8i: v3s: Remove redundant assigned-clocks Maxime Ripard
@ 2019-12-19 9:15 ` Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-19 9:15 ` [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array Maxime Ripard
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Maxime Ripard @ 2019-12-19 9:15 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard; +Cc: Maxime Ripard, linux-arm-kernel
The TCON binding mandates a dmas phandle to the DMAengine channel used for
that controller. However, since it's not used in the driver, some device
trees have been missing it. Let's add it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
arch/arm/boot/dts/sun5i.dtsi | 1 +
arch/arm/boot/dts/sun6i-a31.dtsi | 2 ++
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 +
3 files changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 6befa236ba99..9f0b645fd45e 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -275,6 +275,7 @@
compatible = "allwinner,sun5i-a13-tcon";
reg = <0x01c0c000 0x1000>;
interrupts = <44>;
+ dmas = <&dma SUN4I_DMA_DEDICATED 14>;
resets = <&ccu RST_LCD>;
reset-names = "lcd";
clocks = <&ccu CLK_AHB_LCD>,
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 2cf34ae1c17b..4d622ec48b24 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -285,6 +285,7 @@
compatible = "allwinner,sun6i-a31-tcon";
reg = <0x01c0c000 0x1000>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dma 11>;
resets = <&ccu RST_AHB1_LCD0>;
reset-names = "lcd";
clocks = <&ccu CLK_AHB1_LCD0>,
@@ -334,6 +335,7 @@
compatible = "allwinner,sun6i-a31-tcon";
reg = <0x01c0d000 0x1000>;
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dma 12>;
resets = <&ccu RST_AHB1_LCD1>;
reset-names = "lcd";
clocks = <&ccu CLK_AHB1_LCD1>,
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index f292f96ab39b..70ec3493061b 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -182,6 +182,7 @@
/* compatible gets set in SoC specific dtsi file */
reg = <0x01c0c000 0x1000>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&dma 12>;
clocks = <&ccu CLK_BUS_LCD>,
<&ccu CLK_LCD_CH0>;
clock-names = "ahb",
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
2019-12-19 9:15 ` [PATCH 2/5] ARM: dts: sun8i: v3s: Remove redundant assigned-clocks Maxime Ripard
2019-12-19 9:15 ` [PATCH 3/5] ARM: dts: sunxi: Add missing dmas properties to TCON Maxime Ripard
@ 2019-12-19 9:15 ` Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-19 9:15 ` [PATCH 5/5] ARM: dts: sun9i: Remove useless reset and clock names Maxime Ripard
2019-12-19 15:16 ` [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Chen-Yu Tsai
4 siblings, 1 reply; 11+ messages in thread
From: Maxime Ripard @ 2019-12-19 9:15 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard; +Cc: Maxime Ripard, linux-arm-kernel
Even though it translates to the same thing down to the binary level, we
should have an array of 2 number cells to describe each voltage state,
which in turns create a validation warning.
Let's fix this.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
index c73f59900975..6b149271ef13 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
@@ -60,8 +60,7 @@
enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
gpios-states = <0x1>;
- states = <1100000 0x0
- 1300000 0x1>;
+ states = <1100000 0>, <1300000 1>;
};
reg_vcc_dram: vcc-dram {
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array
2019-12-19 9:15 ` [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array Maxime Ripard
@ 2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-20 8:01 ` Maxime Ripard
0 siblings, 1 reply; 11+ messages in thread
From: Chen-Yu Tsai @ 2019-12-19 15:19 UTC (permalink / raw)
To: Maxime Ripard; +Cc: linux-arm-kernel, Maxime Ripard
On Thu, Dec 19, 2019 at 5:15 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> Even though it translates to the same thing down to the binary level, we
> should have an array of 2 number cells to describe each voltage state,
> which in turns create a validation warning.
>
> Let's fix this.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Chen-Yu Tsai <wens@csie.org>
But,
> ---
> arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> index c73f59900975..6b149271ef13 100644
> --- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> @@ -60,8 +60,7 @@
> enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
> gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
> gpios-states = <0x1>;
> - states = <1100000 0x0
> - 1300000 0x1>;
> + states = <1100000 0>, <1300000 1>;
I would keep the table like layout.
> };
>
> reg_vcc_dram: vcc-dram {
> --
> 2.23.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array
2019-12-19 15:19 ` Chen-Yu Tsai
@ 2019-12-20 8:01 ` Maxime Ripard
0 siblings, 0 replies; 11+ messages in thread
From: Maxime Ripard @ 2019-12-20 8:01 UTC (permalink / raw)
To: Chen-Yu Tsai; +Cc: linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1430 bytes --]
Hi,
On Thu, Dec 19, 2019 at 11:19:37PM +0800, Chen-Yu Tsai wrote:
> On Thu, Dec 19, 2019 at 5:15 PM Maxime Ripard <maxime@cerno.tech> wrote:
> >
> > Even though it translates to the same thing down to the binary level, we
> > should have an array of 2 number cells to describe each voltage state,
> > which in turns create a validation warning.
> >
> > Let's fix this.
> >
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
> Acked-by: Chen-Yu Tsai <wens@csie.org>
>
> But,
>
> > ---
> > arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > index c73f59900975..6b149271ef13 100644
> > --- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
> > @@ -60,8 +60,7 @@
> > enable-gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
> > gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
> > gpios-states = <0x1>;
> > - states = <1100000 0x0
> > - 1300000 0x1>;
> > + states = <1100000 0>, <1300000 1>;
>
> I would keep the table like layout.
The one on a single line is the one we have on all the other boards
with regulator-gpio, so if we want to fix it we should fix all of
them.
I've applied the 5 patches for now
Maxime
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/5] ARM: dts: sun9i: Remove useless reset and clock names
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
` (2 preceding siblings ...)
2019-12-19 9:15 ` [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array Maxime Ripard
@ 2019-12-19 9:15 ` Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-19 15:16 ` [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Chen-Yu Tsai
4 siblings, 1 reply; 11+ messages in thread
From: Maxime Ripard @ 2019-12-19 9:15 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard; +Cc: Maxime Ripard, linux-arm-kernel
The MMC configuration clock controller in the A80 definition has a
clock-names and reset-names property, even though the binding for that
controller doesn't declare it.
Remove it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
arch/arm/boot/dts/sun9i-a80.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index dd292a670921..3b533e85da43 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -530,9 +530,7 @@
compatible = "allwinner,sun9i-a80-mmc-config-clk";
reg = <0x01c13000 0x10>;
clocks = <&ccu CLK_BUS_MMC>;
- clock-names = "ahb";
resets = <&ccu RST_BUS_MMC>;
- reset-names = "ahb";
#clock-cells = <1>;
#reset-cells = <1>;
clock-output-names = "mmc0_config", "mmc1_config",
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
` (3 preceding siblings ...)
2019-12-19 9:15 ` [PATCH 5/5] ARM: dts: sun9i: Remove useless reset and clock names Maxime Ripard
@ 2019-12-19 15:16 ` Chen-Yu Tsai
4 siblings, 0 replies; 11+ messages in thread
From: Chen-Yu Tsai @ 2019-12-19 15:16 UTC (permalink / raw)
To: Maxime Ripard; +Cc: linux-arm-kernel, Maxime Ripard
On Thu, Dec 19, 2019 at 5:15 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> While this is functional, it's a best practice to always have the clocks
> and reset lines in order, in case we ever need to have compatibility code.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Chen-Yu Tsai <wens@csie.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-12-20 8:01 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-19 9:15 [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Maxime Ripard
2019-12-19 9:15 ` [PATCH 2/5] ARM: dts: sun8i: v3s: Remove redundant assigned-clocks Maxime Ripard
2019-12-19 15:17 ` Chen-Yu Tsai
2019-12-19 9:15 ` [PATCH 3/5] ARM: dts: sunxi: Add missing dmas properties to TCON Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-19 9:15 ` [PATCH 4/5] ARM: dts: sun8i: nanopi-duo2: Fix GPIO regulator state array Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-20 8:01 ` Maxime Ripard
2019-12-19 9:15 ` [PATCH 5/5] ARM: dts: sun9i: Remove useless reset and clock names Maxime Ripard
2019-12-19 15:19 ` Chen-Yu Tsai
2019-12-19 15:16 ` [PATCH 1/5] ARM: dts: sun9i: Make sure the USB PHY resources are in the same order Chen-Yu Tsai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox