Message ID | 20190716133803.1174-14-andrei@gherzan.ro |
---|---|
State | Superseded |
Delegated to: | Matthias Brugger |
Headers | show |
Series | Raspberry Pi 32/64 support | expand |
On 16/07/2019 15:38, andrei@gherzan.ro wrote: > From: Andrei Gherzan <andrei@balena.io> > > Signed-off-by: Andrei Gherzan <andrei@balena.io> Commit message. You fix a file that you introduced in this series. Any reason why you don't just send the file already fixed? > --- > arch/arm/dts/bcm2838-rpi-4-b.dts | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts > index 07e9a78e8d..168179c17c 100644 > --- a/arch/arm/dts/bcm2838-rpi-4-b.dts > +++ b/arch/arm/dts/bcm2838-rpi-4-b.dts > @@ -30,21 +30,17 @@ > status = "okay"; > }; > > -/* SDHCI is used to control the SDIO for wireless */ > &sdhci { > - pinctrl-names = "default"; > - pinctrl-0 = <&emmc_gpio34>; > - status = "okay"; > - bus-width = <4>; > - non-removable; > + status = "disabled"; > }; > > -/* SDHOST is used to drive the SD card */ > &sdhost { > - pinctrl-names = "default"; > - pinctrl-0 = <&sdhost_gpio48>; > + status = "disabled"; > +}; > + > +&emmc2 { > + compatible = "brcm,bcm2835-sdhci"; > status = "okay"; > - bus-width = <4>; > }; > > &gpio { >
diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts index 07e9a78e8d..168179c17c 100644 --- a/arch/arm/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/dts/bcm2838-rpi-4-b.dts @@ -30,21 +30,17 @@ status = "okay"; }; -/* SDHCI is used to control the SDIO for wireless */ &sdhci { - pinctrl-names = "default"; - pinctrl-0 = <&emmc_gpio34>; - status = "okay"; - bus-width = <4>; - non-removable; + status = "disabled"; }; -/* SDHOST is used to drive the SD card */ &sdhost { - pinctrl-names = "default"; - pinctrl-0 = <&sdhost_gpio48>; + status = "disabled"; +}; + +&emmc2 { + compatible = "brcm,bcm2835-sdhci"; status = "okay"; - bus-width = <4>; }; &gpio {