diff options
author | Bill Pringlemeir <bpringlemeir@nbsps.com> | 2014-01-08 18:07:20 -0500 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2014-11-19 12:39:12 +0100 |
commit | 82a0b846588ea318fabad0a0a66435a39c12c158 (patch) | |
tree | 6633994bb7dffbeeaba3950f04146b298a4721a8 /arch | |
parent | 1395c7ef3132eabcb05a72ea941b12a0a351d35b (diff) |
imx:vf610: Add device tree support for the fsl_nfc driver and NAND interface.
Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
Conflicts:
arch/arm/boot/dts/vf610.dtsi
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/vf500.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf610-twr.dts | 41 | ||||
-rw-r--r-- | arch/arm/boot/dts/vfxxx.dtsi | 7 |
3 files changed, 52 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi index de6700542714..fec2d8a4ffa5 100644 --- a/arch/arm/boot/dts/vf500.dtsi +++ b/arch/arm/boot/dts/vf500.dtsi @@ -118,6 +118,10 @@ interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; }; +&nfc { + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; +}; + &pit { interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; }; diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index a0f762159cb2..c54b5a0d1fd2 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -272,6 +272,47 @@ status = "okay"; }; +&iomuxc { + vf610-twr { + pinctrl_nfc_1: nfcgrp_1 { + fsl,pins = < + VF610_PAD_PTD31__NF_IO15 0x28df + VF610_PAD_PTD30__NF_IO14 0x28df + VF610_PAD_PTD29__NF_IO13 0x28df + VF610_PAD_PTD28__NF_IO12 0x28df + VF610_PAD_PTD27__NF_IO11 0x28df + VF610_PAD_PTD26__NF_IO10 0x28df + VF610_PAD_PTD25__NF_IO9 0x28df + VF610_PAD_PTD24__NF_IO8 0x28df + VF610_PAD_PTD23__NF_IO7 0x28df + VF610_PAD_PTD22__NF_IO6 0x28df + VF610_PAD_PTD21__NF_IO5 0x28df + VF610_PAD_PTD20__NF_IO4 0x28df + VF610_PAD_PTD19__NF_IO3 0x28df + VF610_PAD_PTD18__NF_IO2 0x28df + VF610_PAD_PTD17__NF_IO1 0x28df + VF610_PAD_PTD16__NF_IO0 0x28df + VF610_PAD_PTB24__NF_WE_B 0x28c2 + VF610_PAD_PTB25__NF_CE0_B 0x28c2 + VF610_PAD_PTB27__NF_RE_B 0x28c2 + VF610_PAD_PTC26__NF_RB_B 0x283d + VF610_PAD_PTC27__NF_ALE 0x28c2 + VF610_PAD_PTC28__NF_CLE 0x28c2 + >; + }; + }; +}; + +&nfc { + nand-bus-width = <16>; + nand-ecc-mode = "hw"; + nand-on-flash-bbt; + clock-frequency = <33000000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nfc_1>; + status = "okay"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index 505969ae8093..9498fa86dccc 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -432,6 +432,13 @@ status = "disabled"; }; + nfc: nand@400e0000 { + compatible = "fsl,vf610-nfc"; + reg = <0x400e0000 0x4000>; + clocks = <&clks VF610_CLK_NFC>; + clock-names = "nfc"; + status = "disabled"; + }; }; }; }; |