Skip to contentSkip to conversation

Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

PATCH New Sebastian Reichel 6 participants 10 messages Nov 6, 2015 – Nov 9, 2015 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

---
 arch/arm/boot/dts/twl4030.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/twl4030.dtsi +0 -2
index 482b7aa37808..36ae9160b558 100644
@@ -22,8 +22,6 @@
 	charger: bci {
 		compatible = "ti,twl4030-bci";
 		interrupts = <9>, <2>;
-		io-channels = <&twl4030_madc 11>;
-		io-channel-name = "vac";
 		bci3v1-supply = <&vusb3v1>;
 	};
 
Signature · 1 line
2.6.2
#1 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

Hi,

Quoted 11 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Quoted 20 lines
---
 arch/arm/boot/dts/twl4030.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/twl4030.dtsi +0 -2
index 482b7aa37808..36ae9160b558 100644
@@ -22,8 +22,6 @@
 	charger: bci {
 		compatible = "ti,twl4030-bci";
 		interrupts = <9>, <2>;
-		io-channels = <&twl4030_madc 11>;
-		io-channel-name = "vac";
 		bci3v1-supply = <&vusb3v1>;
 	};
 
Signature · 1 line
2.6.2
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151106/a62fabc5/attachment.sig>
#2 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

In reply to Sebastian Reichel
Quoted 11 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

We also found this in kernelci.org build testing, and verified that this fixes the build.

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

Kevin

#3 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

Quoted 11 lines · Kevin Hilman
Quoted 10 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Quoted 8 lines
Quoted 1 line

We also found this in kernelci.org build testing, and verified that this fixes the build.

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

Thanks,

Tony

#4 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

In reply to Kevin Hilman

Hi Kevin,

Quoted 12 lines · On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <[email protected]> wrote:
Quoted 10 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Quoted 8 lines
Quoted 1 line

We also found this in kernelci.org build testing, and verified that this fixes the build.

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

I think "quick fix" is a bit rich. I reported this to Sebastian on Sept 29, Oct 2 , Oct 8, Oct 16, and Oct 21. The only response I got was from Marek Belisko on Oct 8 and 21. I have been using the battery tree (git://git.infradead.org/battery-2.6.git#master) from Sept 25, so none of the commits after that have been in any linux-next release.

Yes, I am a little annoyed. Do people have trouble receiving my emails?

Signature · 2 lines
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
#5 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

Hi Stephen,

Quoted 15 lines · Stephen Rothwell
Quoted 14 lines · On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <[email protected]> wrote:
Quoted 11 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Quoted 8 lines
Quoted 6 lines

We also found this in kernelci.org build testing, and verified that this fixes the build.

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

I think "quick fix" is a bit rich.

You're right, sorry. I didn't have the full context. I wasn't fully aware of the history in -next of this problem. I just found it when it ended up in mainline. I don't think the problem was not getting your emails, looks like the problem was a major disconnect between what was sent to Linus and what was in -next. :(

Hopefully this snafu will help prevent that in the future,

Kevin

#6 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

In reply to Stephen Rothwell

Hi,

Quoted 17 lines · Stephen Rothwell
Quoted 16 lines · On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <[email protected]> wrote:
Quoted 11 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

We also found this in kernelci.org build testing, and verified that this fixes the build.

Quoted 6 lines
Quoted 3 lines

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

I think "quick fix" is a bit rich. I reported this to Sebastian on Sept 29, Oct 2 , Oct 8, Oct 16, and Oct 21.

Yes, I did see them after searching for them. My filter rules put your mails together with the LKML mails (which I usually skip over quite fast), so I did not notice the first one. Since the follow up mails were in the same thread as the one(s) previously marked as dont-care, I didn't notice them either.

Quoted 6 lines

The only response I got was from Marek Belisko on Oct 8 and 21. I have been using the battery tree (git://git.infradead.org/battery-2.6.git#master)
from Sept 25, so none of the commits after that have been in any linux-next release.

Yes, I am a little annoyed.

Sorry :(

Quoted 1 line

Do people have trouble receiving my emails?

I did create two extra rules for your mails directly after preparing the revert, so I hope it won't happen again.

Quoted 3 lines · Kevin Hilman

I don't think the problem was not getting your emails, looks like the problem was a major disconnect between what was sent to Linus and what was in -next. :(

Is there an easy way to check this, so that I can create a cronjob checkin it? Having an additional automatic "your tree differs from linux-next" would be helpful, since that would make me search for the problem/a mail from Stephen.

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151107/82e62c58/attachment.sig>

#7 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

Hi Sebastian,

Quoted 5 lines · On Sat, 7 Nov 2015 03:44:57 +0100 Sebastian Reichel <[email protected]> wrote:

Is there an easy way to check this, so that I can create a cronjob checkin it? Having an additional automatic "your tree differs from linux-next" would be helpful, since that would make me search for the problem/a mail from Stephen.

Well,

wget -q -O- http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/Next/SHA1s | sed -n 's/^battery\t\t*//p'

will get you the SHA1 of the top of your branch that I merged into the latest release.

Signature · 2 lines
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
#8 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

In reply to Sebastian Reichel
Quoted 9 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Sorry for the mess. But wouldn't be better to use correct fix instead of revert?

Quoted 20 lines
---
 arch/arm/boot/dts/twl4030.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/twl4030.dtsi +0 -3
index 482b7aa37808..36ae9160b558 100644
@@ -22,8 +22,6 @@
        charger: bci {
                compatible = "ti,twl4030-bci";
                interrupts = <9>, <2>;
-               io-channels = <&twl4030_madc 11>;
-               io-channel-name = "vac";
                bci3v1-supply = <&vusb3v1>;
        };
 
--
Quoted 2 lines

2.6.2

BR,

marek

Signature · 10 lines
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
#9 lore raw

PATCH 1/1 Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

In reply to Sebastian Reichel
Quoted 9 lines · Sebastian Reichel

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while telling Marek at the same time, that it should go through Tony's tree. Following that I did miss Stephen's messages about the build failure in linux-next and since he switched to merging an older snapshot nobody else noticed the problem in my tree. I didn't notice myself, since I did not build any device tree files assuming none have changed by me.

Good to hear you figured out how it happened :)

Quoted 21 lines
---
 arch/arm/boot/dts/twl4030.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/twl4030.dtsi +0 -2
index 482b7aa37808..36ae9160b558 100644
@@ -22,8 +22,6 @@
 	charger: bci {
 		compatible = "ti,twl4030-bci";
 		interrupts = <9>, <2>;
-		io-channels = <&twl4030_madc 11>;
-		io-channel-name = "vac";
 		bci3v1-supply = <&vusb3v1>;
 	};
 
Signature · 1 line
2.6.2