Hi Kishon, On Fri, 2020-01-10 at 16:40 +0530, Kishon Vijay Abraham I wrote: > Hi, > > On Wed, Jan 08, 2020 at 09:51:56AM +0800, Chunfeng Yun wrote: > > Add two optional properties, one for tuning J-K voltage by INTR, > > another for disconnect threshold, both of them are related with > > connect detection > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@xxxxxxxxxxxx> > > Acked-by: Rob Herring <robh@xxxxxxxxxx> > > Patch does not apply. I get the following errors > error: patch failed: Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt:52 > error: Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt: patch does not apply > error: Did you hand edit your patch? > > Can you send them again in the right format? I download this patch from https://patchwork.kernel.org/patch/11322505/ and fetch kernel5.5-rc5, then git am --reject RESEND-v5-01-11-dt-bindings-phy-mtk-tphy-add-two-optional-properties-for-u2phy.patch Applying: dt-bindings: phy-mtk-tphy: add two optional properties for u2phy Checking patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt... Applied patch Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt cleanly. don't reproduce the error you encountered, can you tell me the steps you apply the patch, thanks > > Thanks > Kishon > > --- > > v5: add acked-by Rob > > > > v4: no changes > > > > v3: change commit log > > > > v2: change description > > --- > > Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt b/Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt > > index a5f7a4f0dbc1..ce6abfbdfbe1 100644 > > --- a/Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt > > +++ b/Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt > > @@ -52,6 +52,8 @@ Optional properties (PHY_TYPE_USB2 port (child) node): > > - mediatek,eye-vrt : u32, the selection of VRT reference voltage > > - mediatek,eye-term : u32, the selection of HS_TX TERM reference voltage > > - mediatek,bc12 : bool, enable BC12 of u2phy if support it > > +- mediatek,discth : u32, the selection of disconnect threshold > > +- mediatek,intr : u32, the selection of internal R (resistance) > > > > Example: > > > > -- > > 2.24.0
