| Message ID | BLU437-SMTP795A774C9A2E540CEA579CBFE50@phx.gbl |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 14 April 2015 at 22:00, Bin Meng <bmeng.cn@gmail.com> wrote: > Since Intel ICH SPI driver has been converted to driver model, we need > add an alias for SPI node in the board dts files otherwise SPI flash > won't be detected due to 'invalid bus' error. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/dts/crownbay.dts | 6 +++++- > arch/x86/dts/galileo.dts | 4 ++++ > arch/x86/dts/minnowmax.dts | 3 ++- > 3 files changed, 11 insertions(+), 2 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 19 April 2015 at 21:23, Simon Glass <sjg@chromium.org> wrote: > On 14 April 2015 at 22:00, Bin Meng <bmeng.cn@gmail.com> wrote: >> Since Intel ICH SPI driver has been converted to driver model, we need >> add an alias for SPI node in the board dts files otherwise SPI flash >> won't be detected due to 'invalid bus' error. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/dts/crownbay.dts | 6 +++++- >> arch/x86/dts/galileo.dts | 4 ++++ >> arch/x86/dts/minnowmax.dts | 3 ++- >> 3 files changed, 11 insertions(+), 2 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86, thanks!
diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index e81054e..fbdeade 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -13,6 +13,10 @@ model = "Intel Crown Bay"; compatible = "intel,crownbay", "intel,queensbay"; + aliases { + spi0 = "/spi"; + }; + config { silent_console = <0>; }; @@ -46,7 +50,7 @@ spi { #address-cells = <1>; #size-cells = <0>; - compatible = "intel,ich7"; + compatible = "intel,ich-spi"; spi-flash@0 { reg = <0>; compatible = "sst,25vf016b", "spi-flash"; diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts index 66af64a..60dbc5f 100644 --- a/arch/x86/dts/galileo.dts +++ b/arch/x86/dts/galileo.dts @@ -14,6 +14,10 @@ model = "Intel Galileo"; compatible = "intel,galileo", "intel,quark"; + aliases { + spi0 = "/spi"; + }; + config { silent_console = <0>; }; diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index 8f34369..ecd4a89 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -15,6 +15,7 @@ aliases { serial0 = &serial; + spi0 = "/spi"; }; config { @@ -28,7 +29,7 @@ spi { #address-cells = <1>; #size-cells = <0>; - compatible = "intel,ich"; + compatible = "intel,ich-spi"; spi-flash@0 { reg = <0>; compatible = "sst,25vf016b", "spi-flash";
Since Intel ICH SPI driver has been converted to driver model, we need add an alias for SPI node in the board dts files otherwise SPI flash won't be detected due to 'invalid bus' error. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/dts/crownbay.dts | 6 +++++- arch/x86/dts/galileo.dts | 4 ++++ arch/x86/dts/minnowmax.dts | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-)