* [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref
@ 2021-12-12 1:43 Hector Martin
2021-12-12 1:43 ` [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address Hector Martin
2021-12-12 12:02 ` [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Sven Peter
0 siblings, 2 replies; 4+ messages in thread
From: Hector Martin @ 2021-12-12 1:43 UTC (permalink / raw)
To: Sven Peter
Cc: Alyssa Rosenzweig, linux-kernel, linux-arm-kernel, Hector Martin,
Mark Kettenis
We now know that this frequency comes from the external reference
oscillator and is used for various SoC blocks, and isn't just a random
24MHz clock, so let's call it something more appropriate.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Hector Martin <marcan@marcan.st>
---
arch/arm64/boot/dts/apple/t8103.dtsi | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 8203c60d4819..33c9ea6c7c63 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -96,11 +96,11 @@ timer {
<AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
};
- clk24: clock-24m {
+ clkref: clock-ref {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24000000>;
- clock-output-names = "clk24";
+ clock-output-names = "clkref";
};
soc {
@@ -114,7 +114,7 @@ soc {
i2c0: i2c@235010000 {
compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x2 0x35010000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 627 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c0_pins>;
@@ -127,7 +127,7 @@ i2c0: i2c@235010000 {
i2c1: i2c@235014000 {
compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x2 0x35014000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 628 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c1_pins>;
@@ -140,7 +140,7 @@ i2c1: i2c@235014000 {
i2c2: i2c@235018000 {
compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x2 0x35018000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 629 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c2_pins>;
@@ -154,7 +154,7 @@ i2c2: i2c@235018000 {
i2c3: i2c@23501c000 {
compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x2 0x3501c000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 630 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c3_pins>;
@@ -167,7 +167,7 @@ i2c3: i2c@23501c000 {
i2c4: i2c@235020000 {
compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x2 0x35020000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 631 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&i2c4_pins>;
@@ -188,7 +188,7 @@ serial0: serial@235200000 {
* TODO: figure out the clocking properly, there may
* be a third selectable clock.
*/
- clocks = <&clk24>, <&clk24>;
+ clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart0>;
status = "disabled";
@@ -200,7 +200,7 @@ serial2: serial@235208000 {
reg-io-width = <4>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 607 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clk24>, <&clk24>;
+ clocks = <&clkref>, <&clkref>;
clock-names = "uart", "clk_uart_baud0";
power-domains = <&ps_uart2>;
status = "disabled";
@@ -327,7 +327,7 @@ pinctrl_nub: pinctrl@23d1f0000 {
wdt: watchdog@23d2b0000 {
compatible = "apple,t8103-wdt", "apple,wdt";
reg = <0x2 0x3d2b0000 0x0 0x4000>;
- clocks = <&clk24>;
+ clocks = <&clkref>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 338 IRQ_TYPE_LEVEL_HIGH>;
};
--
2.33.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address
2021-12-12 1:43 [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Hector Martin
@ 2021-12-12 1:43 ` Hector Martin
2021-12-12 12:02 ` Sven Peter
2021-12-12 12:02 ` [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Sven Peter
1 sibling, 1 reply; 4+ messages in thread
From: Hector Martin @ 2021-12-12 1:43 UTC (permalink / raw)
To: Sven Peter
Cc: Alyssa Rosenzweig, linux-kernel, linux-arm-kernel, Hector Martin
We decided to keep SoC nodes sorted by address for sanity; fix a couple
that slipped into the wrong place.
Signed-off-by: Hector Martin <marcan@marcan.st>
---
arch/arm64/boot/dts/apple/t8103.dtsi | 56 ++++++++++++++--------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 33c9ea6c7c63..4950e6340995 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -274,34 +274,6 @@ pcie_pins: pcie-pins {
};
};
- pmgr_mini: power-management@23d280000 {
- compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
- #address-cells = <1>;
- #size-cells = <1>;
- reg = <0x2 0x3d280000 0 0x4000>;
- };
-
- pinctrl_aop: pinctrl@24a820000 {
- compatible = "apple,t8103-pinctrl", "apple,pinctrl";
- reg = <0x2 0x4a820000 0x0 0x4000>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pinctrl_aop 0 0 42>;
- apple,npins = <42>;
-
- interrupt-controller;
- #interrupt-cells = <2>;
- interrupt-parent = <&aic>;
- interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 270 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 271 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
- <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
- };
-
pinctrl_nub: pinctrl@23d1f0000 {
compatible = "apple,t8103-pinctrl", "apple,pinctrl";
reg = <0x2 0x3d1f0000 0x0 0x4000>;
@@ -324,6 +296,13 @@ pinctrl_nub: pinctrl@23d1f0000 {
<AIC_IRQ 336 IRQ_TYPE_LEVEL_HIGH>;
};
+ pmgr_mini: power-management@23d280000 {
+ compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x2 0x3d280000 0 0x4000>;
+ };
+
wdt: watchdog@23d2b0000 {
compatible = "apple,t8103-wdt", "apple,wdt";
reg = <0x2 0x3d2b0000 0x0 0x4000>;
@@ -353,6 +332,27 @@ pinctrl_smc: pinctrl@23e820000 {
<AIC_IRQ 397 IRQ_TYPE_LEVEL_HIGH>;
};
+ pinctrl_aop: pinctrl@24a820000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x4a820000 0x0 0x4000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl_aop 0 0 42>;
+ apple,npins = <42>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 270 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 271 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
pcie0_dart_0: dart@681008000 {
compatible = "apple,t8103-dart";
reg = <0x6 0x81008000 0x0 0x4000>;
--
2.33.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address
2021-12-12 1:43 ` [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address Hector Martin
@ 2021-12-12 12:02 ` Sven Peter
0 siblings, 0 replies; 4+ messages in thread
From: Sven Peter @ 2021-12-12 12:02 UTC (permalink / raw)
To: Hector Martin; +Cc: Alyssa Rosenzweig, linux-kernel, linux-arm-kernel
On Sun, Dec 12, 2021, at 02:43, Hector Martin wrote:
> We decided to keep SoC nodes sorted by address for sanity; fix a couple
> that slipped into the wrong place.
>
> Signed-off-by: Hector Martin <marcan@marcan.st>
> ---
> arch/arm64/boot/dts/apple/t8103.dtsi | 56 ++++++++++++++--------------
> 1 file changed, 28 insertions(+), 28 deletions(-)
Reviewed-by: Sven Peter <sven@svenpeter.dev>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref
2021-12-12 1:43 [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Hector Martin
2021-12-12 1:43 ` [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address Hector Martin
@ 2021-12-12 12:02 ` Sven Peter
1 sibling, 0 replies; 4+ messages in thread
From: Sven Peter @ 2021-12-12 12:02 UTC (permalink / raw)
To: Hector Martin
Cc: Alyssa Rosenzweig, linux-kernel, linux-arm-kernel, Mark Kettenis
On Sun, Dec 12, 2021, at 02:43, Hector Martin wrote:
> We now know that this frequency comes from the external reference
> oscillator and is used for various SoC blocks, and isn't just a random
> 24MHz clock, so let's call it something more appropriate.
>
> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
> Signed-off-by: Hector Martin <marcan@marcan.st>
> ---
Reviewed-by: Sven Peter <sven@svenpeter.dev>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-12 12:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-12 1:43 [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Hector Martin
2021-12-12 1:43 ` [PATCH 2/2] arm64: dts: apple: t8103: Sort nodes by address Hector Martin
2021-12-12 12:02 ` Sven Peter
2021-12-12 12:02 ` [PATCH 1/2] arm64: dts: apple: t8103: Rename clk24 to clkref Sven Peter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®