Message ID | 20180817105902.10692-12-marek.behun@nic.cz |
---|---|
State | Accepted |
Commit | 0f6686e22843d32793abfe5c4792b0938e12e003 |
Delegated to: | Stefan Roese |
Headers | show |
Series | Updates for Turris Mox | expand |
On 17.08.2018 12:59, Marek BehĂșn wrote: > Remove smi_pins definition since it is already in armada-37xx.dtsi. > Add assigned-clocks definitions to spi0. > > Signed-off-by: Marek Behun <marek.behun@nic.cz> > --- > arch/arm/dts/armada-3720-turris-mox.dts | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts > index 05904387d2..9c96dd39a9 100644 > --- a/arch/arm/dts/armada-3720-turris-mox.dts > +++ b/arch/arm/dts/armada-3720-turris-mox.dts > @@ -94,17 +94,13 @@ > }; > }; > > -&pinctrl_sb { > - smi_pins: smi-pins { > - groups = "smi"; > - function = "smi"; > - }; > -}; > - > &spi0 { > status = "okay"; > pinctrl-names = "default"; > pinctrl-0 = <&spi_cs1_pins>; > + assigned-clocks = <&nb_periph_clk 7>; > + assigned-clock-parents = <&tbg 1>; > + assigned-clock-rates = <20000000>; > > spi-flash@0 { > #address-cells = <1>; > Applied to u-boot-marvell/master Thanks, Stefan
diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index 05904387d2..9c96dd39a9 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -94,17 +94,13 @@ }; }; -&pinctrl_sb { - smi_pins: smi-pins { - groups = "smi"; - function = "smi"; - }; -}; - &spi0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&spi_cs1_pins>; + assigned-clocks = <&nb_periph_clk 7>; + assigned-clock-parents = <&tbg 1>; + assigned-clock-rates = <20000000>; spi-flash@0 { #address-cells = <1>;
Remove smi_pins definition since it is already in armada-37xx.dtsi. Add assigned-clocks definitions to spi0. Signed-off-by: Marek Behun <marek.behun@nic.cz> --- arch/arm/dts/armada-3720-turris-mox.dts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)