[PATCH] ARM: integrator: fix OF-related regression

On Sun, Jul 6, 2014 at 5:51 PM, Olof Johansson [off-list ref] wrote:

On Mon, Jun 30, 2014 at 06:52:58PM +0200, Linus Walleij wrote:

quoted

On Thu, Jun 26, 2014 at 9:39 PM, Rabin Vincent [off-list ref] wrote:

quoted

earlyprintk doesn't work on Integrator hardware?

It does, but loading the kernel is done over serial line 115200 bps
so iterative tests take "some time" :-)

quoted

It does on QEMU's
integratorcp so it's trivial to debug there.

Yeah I should be using QEMU for things like this ... poke self.

quoted

The problem is that integrator_init_sysfs() adds a device attribute
called "fpga" to the soc0 bus, and the soc0 bus device is also used as
the root of the device tree, and the device tree has a node called "fpga".

(...)

quoted

07e461cd7e73a84f0e3757932b93cc80976fd749 removed the .0 from the fpga node's
directory, leading to that node (and its subnodes) failing to register due to a
filename conflict with the fpga attribute's file:

Aha! Thanks for root-causing this Rabin. Awesome.

quoted

After Linus' patch, the root is no longer soc0 so the fpga node's directory
becomes /devices/fpga while the attribute file remains at /devices/soc0/fpga.

It appears the patch is doing the right thing, though I had very vague
ideas as to why.

Ok, sounds like this is good to go. I'll apply it to the fixes branch, we can
fairly easily take it out right now if it needs to bake more so please speak up
quickly if that is the case.

Hm, nevermind. Looks like Arnd silently applied it already, and it's
been sent up. Nothing left to do. :)


-Olof