diff options
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 36 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap36xx.dtsi | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 3 |
3 files changed, 24 insertions, 29 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index a4767484a53..4d45679361b 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -227,26 +227,24 @@ /* <&omap3_pmx_core 26 0xd9 1>, */ /* <&omap3_pmx_core 28 0xc1 4>; */ }; - - /* - uart1: serial@4806a000 { - compatible = "ti,omap3-uart"; - ti,hwmods = "uart1"; - clock-frequency = <48000000>; - }; + /* uart1: serial@4806a000 { */ + /* compatible = "ti,omap3-uart"; */ + /* ti,hwmods = "uart1"; */ + /* clock-frequency = <48000000>; */ + /* }; */ - uart2: serial@4806c000 { - compatible = "ti,omap3-uart"; - ti,hwmods = "uart2"; - clock-frequency = <48000000>; - }; + /* uart2: serial@4806c000 { */ + /* compatible = "ti,omap3-uart"; */ + /* ti,hwmods = "uart2"; */ + /* clock-frequency = <48000000>; */ + /* }; */ - uart3: serial@49020000 { - compatible = "ti,omap3-uart"; - ti,hwmods = "uart3"; - clock-frequency = <48000000>; - };*/ + /* uart3: serial@49020000 { */ + /* compatible = "ti,omap3-uart"; */ + /* ti,hwmods = "uart3"; */ + /* clock-frequency = <48000000>; */ + /* }; */ /* i2c1: i2c@48070000 { @@ -583,8 +581,8 @@ };*/ glbl_prm: glbl_prm@48307250 { - /* - * disabled by default. becasue two required + /* + * disabled by default. because two required * values should be defined in board file */ status = "disabled"; diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi index 34392dbe1bd..2a25174167c 100644 --- a/arch/arm/boot/dts/omap36xx.dtsi +++ b/arch/arm/boot/dts/omap36xx.dtsi @@ -29,11 +29,11 @@ /* }; */ }; - /* ocp { */ - /* uart4: serial@49042000 { */ - /* compatible = "ti,omap3-uart"; */ - /* ti,hwmods = "uart4"; */ - /* clock-frequency = <48000000>; */ - /* }; */ - /* }; */ + /* ocp { */ + /* uart4: serial@49042000 { */ + /* compatible = "ti,omap3-uart"; */ + /* ti,hwmods = "uart4"; */ + /* clock-frequency = <48000000>; */ + /* }; */ + /* }; */ }; diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index cf07bae80c9..13a34e53ac7 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -33,8 +33,6 @@ }; }; - - &vc { ti,i2c-high-speed; ti,i2c-pad-load = <3>; @@ -47,7 +45,6 @@ }; }; - &glbl_prm { status = "ok"; sys_clk = "osc_sys_ck"; |