diff mbox series

[7/7] arm64: dts: apple: Add SMC node to t8103/t6001 devicetrees

Message ID E1oVYUi-005Cmk-0R@rmk-PC.armlinux.org.uk
State New
Headers show
Series Add Apple Mac System Management Controller GPIOs | expand

Commit Message

Russell King (Oracle) Sept. 6, 2022, 1:20 p.m. UTC
From: Hector Martin <marcan@marcan.st>

Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 arch/arm64/boot/dts/apple/t8103.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

Comments

Russell King (Oracle) Sept. 8, 2022, 4:46 p.m. UTC | #1
On Tue, Sep 06, 2022 at 03:42:47PM +0200, Sven Peter wrote:
> 
> 
> On Tue, Sep 6, 2022, at 15:20, Russell King wrote:
> > From: Hector Martin <marcan@marcan.st>
> >
> > Signed-off-by: Hector Martin <marcan@marcan.st>
> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> > ---
> >  arch/arm64/boot/dts/apple/t8103.dtsi | 26 ++++++++++++++++++++++++++
> >  1 file changed, 26 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi 
> > b/arch/arm64/boot/dts/apple/t8103.dtsi
> > index 51a63b29d404..15c6023cf612 100644
> > --- a/arch/arm64/boot/dts/apple/t8103.dtsi
> > +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
> > @@ -336,6 +336,32 @@ wdt: watchdog@23d2b0000 {
> >  			interrupts = <AIC_IRQ 338 IRQ_TYPE_LEVEL_HIGH>;
> >  		};
> > 
> > +		smc_mbox: mbox@23e408000 {
> > +			compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4";
> > +			reg = <0x2 0x3e408000 0x0 0x4000>;
> > +			interrupt-parent = <&aic>;
> > +			interrupts = <AIC_IRQ 400 IRQ_TYPE_LEVEL_HIGH>,
> > +				<AIC_IRQ 401 IRQ_TYPE_LEVEL_HIGH>,
> > +				<AIC_IRQ 402 IRQ_TYPE_LEVEL_HIGH>,
> > +				<AIC_IRQ 403 IRQ_TYPE_LEVEL_HIGH>;
> > +			interrupt-names = "send-empty", "send-not-empty",
> > +				"recv-empty", "recv-not-empty";
> > +			#mbox-cells = <0>;
> > +		};
> > +
> > +		smc: smc@23e400000 {
> 
> Usually we sort these nodes by their address to prevent merge conflicts.
> I guess it doesn't really matter here though since nothing will be between
> these two nodes.
> Either way,

If that's how the nodes should be sorted, let's do it now so we don't
end up with another patch that re-ordering this - I've made the change.

> Reviewed-by: Sven Peter <sven@svenpeter.dev>

Thanks!
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 51a63b29d404..15c6023cf612 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -336,6 +336,32 @@  wdt: watchdog@23d2b0000 {
 			interrupts = <AIC_IRQ 338 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
+		smc_mbox: mbox@23e408000 {
+			compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4";
+			reg = <0x2 0x3e408000 0x0 0x4000>;
+			interrupt-parent = <&aic>;
+			interrupts = <AIC_IRQ 400 IRQ_TYPE_LEVEL_HIGH>,
+				<AIC_IRQ 401 IRQ_TYPE_LEVEL_HIGH>,
+				<AIC_IRQ 402 IRQ_TYPE_LEVEL_HIGH>,
+				<AIC_IRQ 403 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "send-empty", "send-not-empty",
+				"recv-empty", "recv-not-empty";
+			#mbox-cells = <0>;
+		};
+
+		smc: smc@23e400000 {
+			compatible = "apple,t8103-smc", "apple,smc";
+			reg = <0x2 0x3e400000 0x0 0x4000>,
+				<0x2 0x3fe00000 0x0 0x100000>;
+			reg-names = "smc", "sram";
+			mboxes = <&smc_mbox>;
+
+			smc_gpio: gpio {
+				gpio-controller;
+				#gpio-cells = <2>;
+			};
+		};
+
 		pinctrl_smc: pinctrl@23e820000 {
 			compatible = "apple,t8103-pinctrl", "apple,pinctrl";
 			reg = <0x2 0x3e820000 0x0 0x4000>;