diff options
-rw-r--r-- | arch/arm/boot/dts/da850-evm.dts | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/da850.dtsi | 10 | ||||
-rw-r--r-- | arch/arm/mach-davinci/Kconfig | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 37dc5a3243b8..087ba28285d2 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts | |||
@@ -15,6 +15,9 @@ | |||
15 | model = "DA850/AM1808/OMAP-L138 EVM"; | 15 | model = "DA850/AM1808/OMAP-L138 EVM"; |
16 | 16 | ||
17 | soc { | 17 | soc { |
18 | pmx_core: pinmux@1c14120 { | ||
19 | status = "okay"; | ||
20 | }; | ||
18 | serial0: serial@1c42000 { | 21 | serial0: serial@1c42000 { |
19 | status = "okay"; | 22 | status = "okay"; |
20 | }; | 23 | }; |
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 640ab75c20db..f74740d0994b 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi | |||
@@ -29,6 +29,16 @@ | |||
29 | #size-cells = <1>; | 29 | #size-cells = <1>; |
30 | ranges = <0x0 0x01c00000 0x400000>; | 30 | ranges = <0x0 0x01c00000 0x400000>; |
31 | 31 | ||
32 | pmx_core: pinmux@1c14120 { | ||
33 | compatible = "pinctrl-single"; | ||
34 | reg = <0x14120 0x50>; | ||
35 | #address-cells = <1>; | ||
36 | #size-cells = <0>; | ||
37 | pinctrl-single,bit-per-mux; | ||
38 | pinctrl-single,register-width = <32>; | ||
39 | pinctrl-single,function-mask = <0xffffffff>; | ||
40 | status = "disabled"; | ||
41 | }; | ||
32 | serial0: serial@1c42000 { | 42 | serial0: serial@1c42000 { |
33 | compatible = "ns16550a"; | 43 | compatible = "ns16550a"; |
34 | reg = <0x42000 0x100>; | 44 | reg = <0x42000 0x100>; |
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 0153950f6068..a075b3e0c5c7 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
@@ -62,6 +62,7 @@ config MACH_DA8XX_DT | |||
62 | bool "Support DA8XX platforms using device tree" | 62 | bool "Support DA8XX platforms using device tree" |
63 | default y | 63 | default y |
64 | depends on ARCH_DAVINCI_DA8XX | 64 | depends on ARCH_DAVINCI_DA8XX |
65 | select PINCTRL | ||
65 | help | 66 | help |
66 | Say y here to include support for TI DaVinci DA850 based using | 67 | Say y here to include support for TI DaVinci DA850 based using |
67 | Flattened Device Tree. More information at Documentation/devicetree | 68 | Flattened Device Tree. More information at Documentation/devicetree |