diff options
| author | Sekhar Nori <nsekhar@ti.com> | 2017-08-30 16:49:34 +0530 |
|---|---|---|
| committer | David Huang <d-huang@ti.com> | 2017-10-30 15:29:23 -0600 |
| commit | 963653346d62b2e350b48b1a25913d6bde6f50f8 (patch) | |
| tree | 517f400afd0dd6e6239be4f2624ebebc4160e724 | |
| parent | 0442ac211a61466f5e63c6253c3a1516069b8d2f (diff) | |
| download | omap-omapzoom-963653346d62b2e350b48b1a25913d6bde6f50f8.tar.gz | |
ARM: dts: dra7-evm-common: only DRA74x EVM has DCAN
commit 9fefc31539fa ("ARM: dts: dra7-evm-common: only DRA74x EVM has DCAN") branch ti-linux-4.9.y
dra7-evm-common.dtsi serves as common file for both
DRA74x and DRA76x EVMs. But DCAN1 is used only on
DRA74x EVM and should not be enabled on DRA76x EVM.
Move dcan1 node to dra7-evm.dts where it actually belongs.
Also remove duplicated dcan1 pins from dra7-evm-common.dtsi
Acked-by: Franklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm-common.dtsi | 24 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 22 |
2 files changed, 22 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi index 02029c86737b..8ea4d57a6d3b 100644 --- a/arch/arm/boot/dts/dra7-evm-common.dtsi +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi @@ -149,22 +149,6 @@ }; }; -&dra7_pmx_core { - dcan1_pins_default: dcan1_pins_default { - pinctrl-single,pins = < - 0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */ - 0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */ - >; - }; - - dcan1_pins_sleep: dcan1_pins_sleep { - pinctrl-single,pins = < - 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ - 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */ - >; - }; -}; - &i2c3 { status = "okay"; clock-frequency = <400000>; @@ -253,14 +237,6 @@ dr_mode = "host"; }; -&dcan1 { - status = "ok"; - pinctrl-names = "default", "sleep", "active"; - pinctrl-0 = <&dcan1_pins_sleep>; - pinctrl-1 = <&dcan1_pins_sleep>; - pinctrl-2 = <&dcan1_pins_default>; -}; - &atl { assigned-clocks = <&abe_dpll_sys_clk_mux>, <&atl_gfclk_mux>, diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 8c1f285022b2..3f27909b7b46 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -156,6 +156,20 @@ >; }; + dcan1_pins_default: dcan1_pins_default { + pinctrl-single,pins = < + 0x3d0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */ + 0x418 (PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */ + >; + }; + + dcan1_pins_sleep: dcan1_pins_sleep { + pinctrl-single,pins = < + 0x3d0 (MUX_MODE15 | PULL_UP) /* dcan1_tx.off */ + 0x418 (MUX_MODE15 | PULL_UP) /* wakeup0.off */ + >; + }; + mmc1_pins_default: pinmux_mmc1_default_pins { pinctrl-single,pins = < 0x354 (PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ @@ -1118,6 +1132,14 @@ i2c_p3_exp: &i2c2 { watchdog-timers = <&timer7>, <&timer8>; }; +&dcan1 { + status = "ok"; + pinctrl-names = "default", "sleep", "active"; + pinctrl-0 = <&dcan1_pins_sleep>; + pinctrl-1 = <&dcan1_pins_sleep>; + pinctrl-2 = <&dcan1_pins_default>; +}; + &dsp1 { status = "okay"; memory-region = <&dsp1_cma_pool>; |