From nobody Sat Dec 27 22:52:05 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AB6739FC3 for ; Fri, 15 Dec 2023 14:39:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="t2dlhJNb" Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D03F53F2BA for ; Fri, 15 Dec 2023 14:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1702651157; bh=Ybq5UjTeoIDvQGsMjYKQSlN8FhlG+exm++rGqALpbk8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t2dlhJNbN8Z6RMja54gEcGzN7bH6tD5jiK5BEsLVB8sj9TlJN7X9ob2XhzWaHCG2i cgOk8SuVYFbpCouJFOPlGGqVNJPBUDbj7yZV9WOW/MfCPJuOCVYEPj+evw7WQxYm73 1nFnY2Ow6X4KeX/tTxxt8DHlyjxbX3cYzv45zsDqNfumbEBN7MxLitfQd7hEsoOETA MLh606DSvA+U6RmuKNUUiosozbLSJrcXD43niTQQvCdlur/Mu+cd7bKUWXedruVCOW y3M3mpJAJ9KbEou76Hwy2iruOGBcnRdfFsCL7s/1F50FfSGTMWSRpieIoIcF6fly27 Xr7ptUdYmgENg== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a1e88d2d7faso44312666b.1 for ; Fri, 15 Dec 2023 06:39:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702651157; x=1703255957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ybq5UjTeoIDvQGsMjYKQSlN8FhlG+exm++rGqALpbk8=; b=PwTnoFY5UWbZXLVpngwF1G9CCd7z0N0XSVnE5R55H0dEK/6Jtllqs8Qhpimsd6ITDY 1CTWiC+ZnlVHGMYdhepNGHTjur2c4b3NlkH2tL3ecSbhPc6oXksB8Ek4kp0TCAgr+Jzr 1EO563BWjNvolidA2Zuf8s/t1v+l11SKqBVO6ddHflYbgvemS2e2Kdn0gEbinlI7vcO+ 7TGSCgSxBzI2gRAAjVBnjPXYoHDtCNpdMzTklJ1GRdODSfr4h4giCJtNMn4+M3o4vHBt KfDjjDkw+fDWe20Puo1c5zgQezzgh7WLwPfMUWd7BjDQo2aavR+J+MT6XuarX5vCho5O 0L3g== X-Gm-Message-State: AOJu0YzYl9EdyrJlA1zCW4j/7ZSXvNkenZN3Sw6PAHjyRjXI1Lboybpw Xdrd+Ej6HsNZfxPNHt/bwy5H7TFsvC1748jH7d8eKxANGil8z4yvL2+pzbQi3A3xO1L1mIbO/sB grmpEj1ZvyooxafNfQUoh7oFLXfmW1DhOVWyHALVJ5g== X-Received: by 2002:a17:906:530b:b0:a22:f068:7f6f with SMTP id h11-20020a170906530b00b00a22f0687f6fmr2487179ejo.103.1702651157457; Fri, 15 Dec 2023 06:39:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlQI/l2ZAFLp1q43IDXNIJcNIW2onNCcYx/a2Yji69pawtw9Ir+cUHT9Sd1e0dwlnqyRXDFQ== X-Received: by 2002:a17:906:530b:b0:a22:f068:7f6f with SMTP id h11-20020a170906530b00b00a22f0687f6fmr2487171ejo.103.1702651157255; Fri, 15 Dec 2023 06:39:17 -0800 (PST) Received: from stitch.. ([152.115.213.158]) by smtp.gmail.com with ESMTPSA id tm6-20020a170907c38600b00a1db955c809sm10789122ejc.73.2023.12.15.06.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 06:39:16 -0800 (PST) From: Emil Renner Berthing To: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Hoan Tran , Serge Semin , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jisheng Zhang , Guo Ren , Fu Wei , Paul Walmsley , Palmer Dabbelt Subject: [PATCH v1 6/8] riscv: dts: thead: Adjust TH1520 GPIO labels Date: Fri, 15 Dec 2023 15:39:04 +0100 Message-Id: <20231215143906.3651122-7-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231215143906.3651122-1-emil.renner.berthing@canonical.com> References: <20231215143906.3651122-1-emil.renner.berthing@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adjust labels for the TH1520 GPIO controllers such that GPIOs can be referenced by the names used by the documentation. Eg. GPIO0_X -> <&gpio0 X Y> GPIO1_X -> <&gpio1 X Y> GPIO2_X -> <&gpio2 X Y> GPIO3_X -> <&gpio3 X Y> GPIO4_X -> <&gpio4 X Y> AOGPIO_X -> <&aogpio X Y> Remove labels for the parent GPIO devices that shouldn't need to be referenced. Signed-off-by: Emil Renner Berthing --- .../boot/dts/thead/th1520-beaglev-ahead.dts | 2 ++ .../boot/dts/thead/th1520-lichee-pi-4a.dts | 2 ++ arch/riscv/boot/dts/thead/th1520.dtsi | 24 +++++++++---------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts b/arch/risc= v/boot/dts/thead/th1520-beaglev-ahead.dts index 70e8042c8304..91ba96588ae8 100644 --- a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts +++ b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts @@ -17,6 +17,8 @@ aliases { gpio1 =3D &gpio1; gpio2 =3D &gpio2; gpio3 =3D &gpio3; + gpio4 =3D &gpio4; + gpio5 =3D &aogpio; serial0 =3D &uart0; serial1 =3D &uart1; serial2 =3D &uart2; diff --git a/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts b/arch/riscv= /boot/dts/thead/th1520-lichee-pi-4a.dts index 9a3884a73e13..0ae2c20d5641 100644 --- a/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts +++ b/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts @@ -14,6 +14,8 @@ aliases { gpio1 =3D &gpio1; gpio2 =3D &gpio2; gpio3 =3D &gpio3; + gpio4 =3D &gpio4; + gpio5 =3D &aogpio; serial0 =3D &uart0; serial1 =3D &uart1; serial2 =3D &uart2; diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/th= ead/th1520.dtsi index d5e2378a1afa..17ca214b5a97 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -206,13 +206,13 @@ uart3: serial@ffe7f04000 { status =3D "disabled"; }; =20 - gpio2: gpio@ffe7f34000 { + gpio@ffe7f34000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xe7f34000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - portc: gpio-controller@0 { + gpio2: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; @@ -225,13 +225,13 @@ portc: gpio-controller@0 { }; }; =20 - gpio3: gpio@ffe7f38000 { + gpio@ffe7f38000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xe7f38000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - portd: gpio-controller@0 { + gpio3: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; @@ -249,13 +249,13 @@ padctrl1_apsys: pinctrl@ffe7f3c000 { reg =3D <0xff 0xe7f3c000 0x0 0x1000>; }; =20 - gpio0: gpio@ffec005000 { + gpio@ffec005000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xec005000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - porta: gpio-controller@0 { + gpio0: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; @@ -268,13 +268,13 @@ porta: gpio-controller@0 { }; }; =20 - gpio1: gpio@ffec006000 { + gpio@ffec006000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xec006000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - portb: gpio-controller@0 { + gpio1: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; @@ -410,13 +410,13 @@ timer7: timer@ffffc3303c { status =3D "disabled"; }; =20 - ao_gpio0: gpio@fffff41000 { + gpio@fffff41000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xfff41000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - porte: gpio-controller@0 { + aogpio: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; @@ -434,13 +434,13 @@ padctrl_aosys: pinctrl@fffff4a000 { reg =3D <0xff 0xfff4a000 0x0 0x2000>; }; =20 - ao_gpio1: gpio@fffff52000 { + gpio@fffff52000 { compatible =3D "snps,dw-apb-gpio"; reg =3D <0xff 0xfff52000 0x0 0x1000>; #address-cells =3D <1>; #size-cells =3D <0>; =20 - portf: gpio-controller@0 { + gpio4: gpio-controller@0 { compatible =3D "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells =3D <2>; --=20 2.40.1