| Message ID | a50c1dc50a079e25d3557b207d817ac0e1f7bdf2.1528989474.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Commit | 69601ce003e4066f4394ddccc48ab6aabc0d314a |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [U-Boot,1/4] arm: mvebu: solidrun-microsom: update SPI flash compatible | expand |
Reviewed-by: Dennis Gilmore <dennis@ausil.us> Tested-by: Dennis Gilmore <dennis@ausil.us> On Thu, 2018-06-14 at 18:17 +0300, Baruch Siach wrote: > The same pinctrl node appears in the solidrun-microsom dtsi. Use that > instead. > > Cc: Dennis Gilmore <dennis@ausil.us> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > arch/arm/dts/armada-388-helios4.dts | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/dts/armada-388-helios4.dts > b/arch/arm/dts/armada-388-helios4.dts > index 049d32296475..a154e0f4f477 100644 > --- a/arch/arm/dts/armada-388-helios4.dts > +++ b/arch/arm/dts/armada-388-helios4.dts > @@ -248,7 +248,7 @@ > bus-width = <4>; > cd-gpios = <&gpio0 20 > GPIO_ACTIVE_LOW>; > no-1-8-v; > - pinctrl-0 = <&helios_sdhci_pins > + pinctrl-0 = <µsom_sdhci_pins > &helios_sdhci_cd_pins>; > pinctrl-names = "default"; > status = "okay"; > @@ -286,12 +286,6 @@ > marvell,pins = "mpp20"; > marvell,function = "gpio"; > }; > - helios_sdhci_pins: helios-sdhci-pins > { > - marvell,pins = "mpp21", > "mpp28", > - "mpp37", > "mpp38", > - "mpp39", > "mpp40"; > - marvell,function = "sd0"; > - }; > helios_led_pins: helios-led-pins { > marvell,pins = "mpp24", > "mpp25", > "mpp49", > "mpp50",
diff --git a/arch/arm/dts/armada-388-helios4.dts b/arch/arm/dts/armada-388-helios4.dts index 049d32296475..a154e0f4f477 100644 --- a/arch/arm/dts/armada-388-helios4.dts +++ b/arch/arm/dts/armada-388-helios4.dts @@ -248,7 +248,7 @@ bus-width = <4>; cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; no-1-8-v; - pinctrl-0 = <&helios_sdhci_pins + pinctrl-0 = <µsom_sdhci_pins &helios_sdhci_cd_pins>; pinctrl-names = "default"; status = "okay"; @@ -286,12 +286,6 @@ marvell,pins = "mpp20"; marvell,function = "gpio"; }; - helios_sdhci_pins: helios-sdhci-pins { - marvell,pins = "mpp21", "mpp28", - "mpp37", "mpp38", - "mpp39", "mpp40"; - marvell,function = "sd0"; - }; helios_led_pins: helios-led-pins { marvell,pins = "mpp24", "mpp25", "mpp49", "mpp50",
The same pinctrl node appears in the solidrun-microsom dtsi. Use that instead. Cc: Dennis Gilmore <dennis@ausil.us> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- arch/arm/dts/armada-388-helios4.dts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)