| Message ID | 20241028-fix-address-v1-1-dcbe21e59ccf@bootlin.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | riscv: dts: sophgo: fix pinctrl base-address | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
Hello~, Thomas This problem is introduced by this patchset [1], which is still on the sophgo/for-next branch and has not been submitted to the main line. So I think the right thing to do is to submit another version v6 with your bugfix. Link: https://lore.kernel.org/linux-riscv/20241010-sg2002-v5-0-a0f2e582b932@bootlin.com/ [1] Thanks, Chen On 2024/10/28 18:43, Thomas Bonnefille wrote: > Fix the base-address of the pinctrl controller to match its register > address. > > Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com> > --- > arch/riscv/boot/dts/sophgo/sg2002.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/boot/dts/sophgo/sg2002.dtsi b/arch/riscv/boot/dts/sophgo/sg2002.dtsi > index 242fde84443f0d6a2c8476666dfa3d72727071b1..6616f578d190f7aa2a82b233fa9c55267b41ee0e 100644 > --- a/arch/riscv/boot/dts/sophgo/sg2002.dtsi > +++ b/arch/riscv/boot/dts/sophgo/sg2002.dtsi > @@ -16,7 +16,7 @@ memory@80000000 { > }; > > soc { > - pinctrl: pinctrl@3008000 { > + pinctrl: pinctrl@3001000 { > compatible = "sophgo,sg2002-pinctrl"; > reg = <0x03001000 0x1000>, > <0x05027000 0x1000>; > > --- > base-commit: 45a544a62ef7cac9ecc69585a90da72ca68af898 > change-id: 20241028-fix-address-e7f0c40eac2c > > Best regards,
On Tue, Oct 29, 2024 at 07:34:41AM +0800, Chen Wang wrote: > Hello~, Thomas > > This problem is introduced by this patchset [1], which is still on the > sophgo/for-next branch and has not been submitted to the main line. So I > think the right thing to do is to submit another version v6 with your > bugfix. > It is OK to let this patch go. If we want to keep the patch persisent, it is better to apply a fix than revoke the fault one and apply a new version. Regards, Inochi
On Mon, Oct 28, 2024 at 11:43:24AM +0100, Thomas Bonnefille wrote: > Fix the base-address of the pinctrl controller to match its register > address. > > Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com> > --- > arch/riscv/boot/dts/sophgo/sg2002.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/boot/dts/sophgo/sg2002.dtsi b/arch/riscv/boot/dts/sophgo/sg2002.dtsi > index 242fde84443f0d6a2c8476666dfa3d72727071b1..6616f578d190f7aa2a82b233fa9c55267b41ee0e 100644 > --- a/arch/riscv/boot/dts/sophgo/sg2002.dtsi > +++ b/arch/riscv/boot/dts/sophgo/sg2002.dtsi > @@ -16,7 +16,7 @@ memory@80000000 { > }; > > soc { > - pinctrl: pinctrl@3008000 { > + pinctrl: pinctrl@3001000 { > compatible = "sophgo,sg2002-pinctrl"; > reg = <0x03001000 0x1000>, > <0x05027000 0x1000>; > > --- > base-commit: 45a544a62ef7cac9ecc69585a90da72ca68af898 > change-id: 20241028-fix-address-e7f0c40eac2c > > Best regards, > -- > Thomas Bonnefille <thomas.bonnefille@bootlin.com> > Reviewed-by: Inochi Amaoto <inochiama@gmail.com>
On Mon, Oct 28, 2024 at 11:43:24AM +0100, Thomas Bonnefille wrote: > Fix the base-address of the pinctrl controller to match its register > address. > > Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com> Fixes: 93b61555f509 ("riscv: dts: sophgo: Add initial SG2002 SoC device tree")
diff --git a/arch/riscv/boot/dts/sophgo/sg2002.dtsi b/arch/riscv/boot/dts/sophgo/sg2002.dtsi index 242fde84443f0d6a2c8476666dfa3d72727071b1..6616f578d190f7aa2a82b233fa9c55267b41ee0e 100644 --- a/arch/riscv/boot/dts/sophgo/sg2002.dtsi +++ b/arch/riscv/boot/dts/sophgo/sg2002.dtsi @@ -16,7 +16,7 @@ memory@80000000 { }; soc { - pinctrl: pinctrl@3008000 { + pinctrl: pinctrl@3001000 { compatible = "sophgo,sg2002-pinctrl"; reg = <0x03001000 0x1000>, <0x05027000 0x1000>;
Fix the base-address of the pinctrl controller to match its register address. Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com> --- arch/riscv/boot/dts/sophgo/sg2002.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 45a544a62ef7cac9ecc69585a90da72ca68af898 change-id: 20241028-fix-address-e7f0c40eac2c Best regards,