| Message ID | 1453884994-30241-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 81aaa3d9fce5ce9641e5f0c3354da876d859b3b6 |
| Delegated to: | Bin Meng |
| Headers | show |
On 27 January 2016 at 01:56, Bin Meng <bmeng.cn@gmail.com> wrote: > With recent changes spi node was moved to a place as a subnode under > pch, so update the alias to refer to its correct place as well. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/dts/bayleybay.dts | 4 ++-- > arch/x86/dts/broadwell_som-6896.dts | 4 ++-- > arch/x86/dts/chromebook_link.dts | 4 ++-- > arch/x86/dts/chromebox_panther.dts | 4 ++-- > arch/x86/dts/crownbay.dts | 4 ++-- > arch/x86/dts/galileo.dts | 4 ++-- > arch/x86/dts/minnowmax.dts | 4 ++-- > 7 files changed, 14 insertions(+), 14 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Thu, Jan 28, 2016 at 6:53 AM, Simon Glass <sjg@chromium.org> wrote: > On 27 January 2016 at 01:56, Bin Meng <bmeng.cn@gmail.com> wrote: >> With recent changes spi node was moved to a place as a subnode under >> pch, so update the alias to refer to its correct place as well. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/dts/bayleybay.dts | 4 ++-- >> arch/x86/dts/broadwell_som-6896.dts | 4 ++-- >> arch/x86/dts/chromebook_link.dts | 4 ++-- >> arch/x86/dts/chromebox_panther.dts | 4 ++-- >> arch/x86/dts/crownbay.dts | 4 ++-- >> arch/x86/dts/galileo.dts | 4 ++-- >> arch/x86/dts/minnowmax.dts | 4 ++-- >> 7 files changed, 14 insertions(+), 14 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/master, thanks!
diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index 9bf707b..fbca467 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -21,7 +21,7 @@ aliases { serial0 = &serial; - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -184,7 +184,7 @@ >; }; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts index 4e9e410..7b2c515 100644 --- a/arch/x86/dts/broadwell_som-6896.dts +++ b/arch/x86/dts/broadwell_som-6896.dts @@ -10,7 +10,7 @@ compatible = "advantech,som-6896", "intel,broadwell"; aliases { - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -34,7 +34,7 @@ reg = <0x0000f800 0 0 0 0>; compatible = "intel,pch9"; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts index d148d6e..5807203 100644 --- a/arch/x86/dts/chromebook_link.dts +++ b/arch/x86/dts/chromebook_link.dts @@ -11,7 +11,7 @@ compatible = "google,link", "intel,celeron-ivybridge"; aliases { - spi0 = "/pci/pch/spi"; + spi0 = &spi; usb0 = &usb_0; usb1 = &usb_1; }; @@ -252,7 +252,7 @@ /* Enable EC SMI source */ intel,alt-gp-smi-enable = <0x0100>; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts index 2302701..48f0c77 100644 --- a/arch/x86/dts/chromebox_panther.dts +++ b/arch/x86/dts/chromebox_panther.dts @@ -10,7 +10,7 @@ compatible = "google,panther", "intel,haswell"; aliases { - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -56,7 +56,7 @@ reg = <0x0000f800 0 0 0 0>; compatible = "intel,pch9"; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index d6dd0b4..47fab0f 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -19,7 +19,7 @@ compatible = "intel,crownbay", "intel,queensbay"; aliases { - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -227,7 +227,7 @@ >; }; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts index a2f5a1f..dd75fc4 100644 --- a/arch/x86/dts/galileo.dts +++ b/arch/x86/dts/galileo.dts @@ -18,7 +18,7 @@ compatible = "intel,galileo", "intel,quark"; aliases { - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -115,7 +115,7 @@ >; }; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi"; diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index e7ef7c9..7afdf6c 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -20,7 +20,7 @@ aliases { serial0 = &serial; - spi0 = "/spi"; + spi0 = &spi; }; config { @@ -218,7 +218,7 @@ >; }; - spi { + spi: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich-spi";
With recent changes spi node was moved to a place as a subnode under pch, so update the alias to refer to its correct place as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/dts/bayleybay.dts | 4 ++-- arch/x86/dts/broadwell_som-6896.dts | 4 ++-- arch/x86/dts/chromebook_link.dts | 4 ++-- arch/x86/dts/chromebox_panther.dts | 4 ++-- arch/x86/dts/crownbay.dts | 4 ++-- arch/x86/dts/galileo.dts | 4 ++-- arch/x86/dts/minnowmax.dts | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-)