Hi,

On Wed, Jul 11, 2018 at 06:27:39AM -0700, Tony Lindgren wrote:
> * Pavel Machek <pavel@ucw.cz> [180711 08:05]:
> > Hi!
> > 
> > > > Its parent is gpio@4805d000 , and that one seems to be present.
> > > > 
> > > > user@devuan:/sys/bus/platform/devices$ ls 4805d000.gpio
> > > > driver				       driver_override  gpio
> > > > gpiochip5  modalias  of_node  power  subsystem  uevent
> > > 
> > > Sorry, something went wrong with merging this. The parent
> > > of ti,omap-dmtimer-pwm and pwm-vibrator should be / and
> > > not gpio6.
> > 
> > Ok, got it to probe... after dts fix and adding EPROBE_DEFFER to
> > driver.
> ..
> > --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
> > +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
> > @@ -159,13 +159,7 @@
> >  
> >  		dais = <&mcbsp2_port>, <&mcbsp3_port>;
> >  	};
> > -};
> > -
> > -&dss {
> > -	status = "okay";
> > -};
> >  
> > -&gpio6 {
> >  	pwm8: dmtimer-pwm-8 {
> >  		pinctrl-names = "default";
> >  		pinctrl-0 = <&vibrator_direction_pin>;
> > @@ -192,7 +186,10 @@
> >  		pwm-names = "enable", "direction";
> >  		direction-duty-cycle-ns = <10000000>;
> >  	};
> > +};
> >  
> > +&dss {
> > +	status = "okay";
> >  };
> >  
> >  &dsi1 {
> 
> Hmm sorry if I did a mismerge on the above. A note to
> myself to stop applying patches that apply with fuzz,
> that is clearly dangerous with dts files with lots
> of similar named properties.

It might also have been me doing the mismerge before
sending the patch. Anyways, the patch from Pavel looks
good to me. As a side-effect dss and dsi references
come next to each other.

-- Sebastian