diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2014-12-24 13:06:39 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-01-12 17:03:40 -0800 |
| commit | 120c41695b8b8c7e68ef7cfdaa2bf4f965357b47 (patch) | |
| tree | 755bf06a89bf9d2f69e58604d213a2c263e4bf63 | |
| parent | 9ca5a0ca0e2c7d7c7029aa901db4184e9103efe1 (diff) | |
x86: Clean up the board dts files
This commits cleans up the board dts files.
- Correct the serial port register size to 8
- Remove the misleading status = "disabled" statement in the
serial.dtsi
- Move the inclusion of skeleton.dtsi from serial.dtsi to board
dts files
- Let the board dts file define stdout-path in the chosen node
- Remove device nodes in board dts files thar are duplicated to
skeleton.dtsi
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/dts/crownbay.dts | 11 | ||||
| -rw-r--r-- | arch/x86/dts/link.dts | 11 | ||||
| -rw-r--r-- | arch/x86/dts/serial.dtsi | 9 |
3 files changed, 7 insertions, 24 deletions
diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index c3e112f717..97f7a525aa 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -6,11 +6,10 @@ /dts-v1/; +/include/ "skeleton.dtsi" /include/ "serial.dtsi" / { - #address-cells = <1>; - #size-cells = <1>; model = "Intel Crown Bay"; compatible = "intel,crownbay", "intel,queensbay"; @@ -32,14 +31,10 @@ bank-name = "B"; }; - serial { - reg = <0x3f8 8>; - clock-frequency = <115200>; + chosen { + stdout-path = "/serial"; }; - chosen { }; - memory { device_type = "memory"; reg = <0 0>; }; - spi { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/x86/dts/link.dts b/arch/x86/dts/link.dts index c6b7d82b45..107af60004 100644 --- a/arch/x86/dts/link.dts +++ b/arch/x86/dts/link.dts @@ -1,10 +1,9 @@ /dts-v1/; +/include/ "skeleton.dtsi" /include/ "serial.dtsi" / { - #address-cells = <1>; - #size-cells = <1>; model = "Google Link"; compatible = "google,link", "intel,celeron-ivybridge"; @@ -33,14 +32,10 @@ bank-name = "C"; }; - serial { - reg = <0x3f8 8>; - clock-frequency = <115200>; + chosen { + stdout-path = "/serial"; }; - chosen { }; - memory { device_type = "memory"; reg = <0 0>; }; - spd { compatible = "memory-spd"; #address-cells = <1>; diff --git a/arch/x86/dts/serial.dtsi b/arch/x86/dts/serial.dtsi index 65a93acd3d..ebdda763df 100644 --- a/arch/x86/dts/serial.dtsi +++ b/arch/x86/dts/serial.dtsi @@ -1,17 +1,10 @@ -/include/ "skeleton.dtsi" - / { - chosen { - stdout-path = "/serial"; - }; - serial { compatible = "x86-uart"; - reg = <0x3f8 0x10>; + reg = <0x3f8 8>; reg-shift = <0>; io-mapped = <1>; multiplier = <1>; baudrate = <115200>; - status = "disabled"; }; }; |