| Message ID | 1524021226-18474-1-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 7abb7e8fcb653c1b2bef7a30f83d3a97777fd3bc |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | [U-Boot,1/3] rockchip: rk3188: add -u-boot.dtsi for rock-rk3188 | expand |
> We should a -u-boot.dtsi for those config need by U-Boot only, > and other part sync with kernel. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 18 ++++++++++++++++++ > arch/arm/dts/rk3188-radxarock.dts | 6 +----- > arch/arm/dts/rk3188.dtsi | 2 -- > 3 files changed, 19 insertions(+), 7 deletions(-) > create mode 100644 arch/arm/dts/rk3188-radxarock-u-boot.dtsi > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> We should a -u-boot.dtsi for those config need by U-Boot only, > and other part sync with kernel. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 18 ++++++++++++++++++ > arch/arm/dts/rk3188-radxarock.dts | 6 +----- > arch/arm/dts/rk3188.dtsi | 2 -- > 3 files changed, 19 insertions(+), 7 deletions(-) > create mode 100644 arch/arm/dts/rk3188-radxarock-u-boot.dtsi > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> We should a -u-boot.dtsi for those config need by U-Boot only, > and other part sync with kernel. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 18 ++++++++++++++++++ > arch/arm/dts/rk3188-radxarock.dts | 6 +----- > arch/arm/dts/rk3188.dtsi | 2 -- > 3 files changed, 19 insertions(+), 7 deletions(-) > create mode 100644 arch/arm/dts/rk3188-radxarock-u-boot.dtsi > Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi new file mode 100644 index 0000000..5d650b1 --- /dev/null +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&cru { + u-boot,dm-spl; +}; + +&pinctrl { + u-boot,dm-spl; +}; + +&uart2 { + status = "okay"; + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts index 5f5b5e9..0fc4f54 100644 --- a/arch/arm/dts/rk3188-radxarock.dts +++ b/arch/arm/dts/rk3188-radxarock.dts @@ -7,6 +7,7 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include "rk3188.dtsi" +#include "rk3188-radxarock-u-boot.dtsi" / { model = "Radxa Rock"; @@ -356,11 +357,6 @@ status = "okay"; }; -&uart2 { - status = "okay"; - u-boot,dm-spl; -}; - &uart3 { status = "okay"; }; diff --git a/arch/arm/dts/rk3188.dtsi b/arch/arm/dts/rk3188.dtsi index f4d438e..1a06843 100644 --- a/arch/arm/dts/rk3188.dtsi +++ b/arch/arm/dts/rk3188.dtsi @@ -105,7 +105,6 @@ compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; rockchip,grf = <&grf>; - u-boot,dm-spl; #clock-cells = <1>; #reset-cells = <1>; @@ -156,7 +155,6 @@ #address-cells = <1>; #size-cells = <1>; ranges; - u-boot,dm-spl; gpio0: gpio0@2000a000 { compatible = "rockchip,gpio-bank";
We should a -u-boot.dtsi for those config need by U-Boot only, and other part sync with kernel. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 18 ++++++++++++++++++ arch/arm/dts/rk3188-radxarock.dts | 6 +----- arch/arm/dts/rk3188.dtsi | 2 -- 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 arch/arm/dts/rk3188-radxarock-u-boot.dtsi