Message ID | 20200427065254.15397-4-wens@kernel.org |
---|---|
State | New |
Headers | show |
Series | rockchip: rk3328: sync dts and add ROC-RK3328-CC board | expand |
On 2020/4/27 ??2:52, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens at csie.org> > > The "hnp-srp-disable" property for dwc2 is specific to U-boot, not part > of upstream Linux's device tree bindings. > > Move it to rk3328-u-boot.dtsi to avoid losing it when syncing device > tree files. > > Signed-off-by: Chen-Yu Tsai <wens at csie.org> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > Changes since v2: > - New patch > --- > arch/arm/dts/rk3328-u-boot.dtsi | 4 ++++ > arch/arm/dts/rk3328.dtsi | 1 - > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi > index 6d5b3ec06e07..c69e13e11efe 100644 > --- a/arch/arm/dts/rk3328-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-u-boot.dtsi > @@ -62,3 +62,7 @@ > /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ > u-boot,spl-fifo-mode; > }; > + > +&usb20_otg { > + hnp-srp-disable; > +}; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index 060c84e6c0cf..57719b82d13e 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -483,7 +483,6 @@ > "snps,dwc2"; > reg = <0x0 0xff580000 0x0 0x40000>; > interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; > - hnp-srp-disable; > dr_mode = "otg"; > status = "disabled"; > };
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 6d5b3ec06e07..c69e13e11efe 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -62,3 +62,7 @@ /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ u-boot,spl-fifo-mode; }; + +&usb20_otg { + hnp-srp-disable; +}; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 060c84e6c0cf..57719b82d13e 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -483,7 +483,6 @@ "snps,dwc2"; reg = <0x0 0xff580000 0x0 0x40000>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; - hnp-srp-disable; dr_mode = "otg"; status = "disabled"; };