diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 18:29:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 18:29:04 -0400 |
| commit | f83ccb93585d1f472c30fa2bbb8b56c23dbdb506 (patch) | |
| tree | 6548d92ff3f362f590bc96129df3e5cb5170ac02 /arch/arm/boot/dts/imx51-apf51dev.dts | |
| parent | 930b440cd8256f3861bdb0a59d26efaadac7941a (diff) | |
| parent | 50b4af414d414af9e4df6f64e613bb0ffe581055 (diff) | |
Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC device tree changes from Arnd Bergmann:
"A large part of the arm-soc patches are nowadays DT changes, adding
support for new SoCs, boards and devices without changing kernel
source. The plan is still to move the devicetree files out of the
kernel tree and reduce the amount of churn going on here, but we keep
finding reasons to delay doing that.
Changes are really all over the place, with little sticking out
particularly. We have contributions from a total of 116 people in
this branch.
Unfortunately, the size of this branch also causes a significant
number of conflicts at the moment, typically when subsystem
maintainers merge patches that change the driver at the same time as
the dts files. In most cases this could be avoided because the dts
changes are supposed to be compatible in both ways, and we are asking
everyone to send ARM dts changes through our tree only"
* tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
dts: stmmac: Document the clocks property in the stmmac base document
dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
ARM: STi: stih416: Add support for the FSM Serial Flash Controller
ARM: tegra: fix Dalmore pinctrl configuration
ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
ARM: dts: Build all keystone dt blobs
ARM: dts: keystone: Fix control register range for clktsip
ARM: dts: keystone: Fix domain register range for clkfftc1
ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
ARM: dts: bcm21664: Add device tree files.
ARM: DT: bcm21664: Device tree bindings
ARM: efm32: properly namespace i2c location property
ARM: efm32: fix unit address part in USART2 device nodes' names
ARM: mvebu: Enable NAND controller in Armada 385-DB
ARM: mvebu: Add support for NAND controller in Armada 38x SoC
ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
...
Diffstat (limited to 'arch/arm/boot/dts/imx51-apf51dev.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx51-apf51dev.dts | 102 |
1 files changed, 90 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts index d3f98141462c..c5a9a24c280a 100644 --- a/arch/arm/boot/dts/imx51-apf51dev.dts +++ b/arch/arm/boot/dts/imx51-apf51dev.dts | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | compatible = "fsl,imx-parallel-display"; | 20 | compatible = "fsl,imx-parallel-display"; |
| 21 | interface-pix-fmt = "bgr666"; | 21 | interface-pix-fmt = "bgr666"; |
| 22 | pinctrl-names = "default"; | 22 | pinctrl-names = "default"; |
| 23 | pinctrl-0 = <&pinctrl_ipu_disp1_1>; | 23 | pinctrl-0 = <&pinctrl_ipu_disp1>; |
| 24 | 24 | ||
| 25 | display-timings { | 25 | display-timings { |
| 26 | lw700 { | 26 | lw700 { |
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | user-key { | 54 | user-key { |
| 55 | label = "user"; | 55 | label = "user"; |
| 56 | gpios = <&gpio1 3 0>; | 56 | gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; |
| 57 | linux,code = <256>; /* BTN_0 */ | 57 | linux,code = <256>; /* BTN_0 */ |
| 58 | }; | 58 | }; |
| 59 | }; | 59 | }; |
| @@ -63,7 +63,7 @@ | |||
| 63 | 63 | ||
| 64 | user { | 64 | user { |
| 65 | label = "Heartbeat"; | 65 | label = "Heartbeat"; |
| 66 | gpios = <&gpio1 2 0>; | 66 | gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
| 67 | linux,default-trigger = "heartbeat"; | 67 | linux,default-trigger = "heartbeat"; |
| 68 | }; | 68 | }; |
| 69 | }; | 69 | }; |
| @@ -71,31 +71,33 @@ | |||
| 71 | 71 | ||
| 72 | &ecspi1 { | 72 | &ecspi1 { |
| 73 | pinctrl-names = "default"; | 73 | pinctrl-names = "default"; |
| 74 | pinctrl-0 = <&pinctrl_ecspi1_1>; | 74 | pinctrl-0 = <&pinctrl_ecspi1>; |
| 75 | fsl,spi-num-chipselects = <2>; | 75 | fsl,spi-num-chipselects = <2>; |
| 76 | cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>; | 76 | cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, |
| 77 | <&gpio4 25 GPIO_ACTIVE_HIGH>; | ||
| 77 | status = "okay"; | 78 | status = "okay"; |
| 78 | }; | 79 | }; |
| 79 | 80 | ||
| 80 | &ecspi2 { | 81 | &ecspi2 { |
| 81 | pinctrl-names = "default"; | 82 | pinctrl-names = "default"; |
| 82 | pinctrl-0 = <&pinctrl_ecspi2_1>; | 83 | pinctrl-0 = <&pinctrl_ecspi2>; |
| 83 | fsl,spi-num-chipselects = <2>; | 84 | fsl,spi-num-chipselects = <2>; |
| 84 | cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>; | 85 | cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>, |
| 86 | <&gpio3 27 GPIO_ACTIVE_LOW>; | ||
| 85 | status = "okay"; | 87 | status = "okay"; |
| 86 | }; | 88 | }; |
| 87 | 89 | ||
| 88 | &esdhc1 { | 90 | &esdhc1 { |
| 89 | pinctrl-names = "default"; | 91 | pinctrl-names = "default"; |
| 90 | pinctrl-0 = <&pinctrl_esdhc1_1>; | 92 | pinctrl-0 = <&pinctrl_esdhc1>; |
| 91 | cd-gpios = <&gpio2 29 0>; | 93 | cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; |
| 92 | bus-width = <4>; | 94 | bus-width = <4>; |
| 93 | status = "okay"; | 95 | status = "okay"; |
| 94 | }; | 96 | }; |
| 95 | 97 | ||
| 96 | &esdhc2 { | 98 | &esdhc2 { |
| 97 | pinctrl-names = "default"; | 99 | pinctrl-names = "default"; |
| 98 | pinctrl-0 = <&pinctrl_esdhc2_1>; | 100 | pinctrl-0 = <&pinctrl_esdhc2>; |
| 99 | bus-width = <4>; | 101 | bus-width = <4>; |
| 100 | non-removable; | 102 | non-removable; |
| 101 | status = "okay"; | 103 | status = "okay"; |
| @@ -103,7 +105,7 @@ | |||
| 103 | 105 | ||
| 104 | &i2c2 { | 106 | &i2c2 { |
| 105 | pinctrl-names = "default"; | 107 | pinctrl-names = "default"; |
| 106 | pinctrl-0 = <&pinctrl_i2c2_2>; | 108 | pinctrl-0 = <&pinctrl_i2c2>; |
| 107 | status = "okay"; | 109 | status = "okay"; |
| 108 | }; | 110 | }; |
| 109 | 111 | ||
| @@ -111,7 +113,7 @@ | |||
| 111 | pinctrl-names = "default"; | 113 | pinctrl-names = "default"; |
| 112 | pinctrl-0 = <&pinctrl_hog>; | 114 | pinctrl-0 = <&pinctrl_hog>; |
| 113 | 115 | ||
| 114 | hog { | 116 | imx51-apf51dev { |
| 115 | pinctrl_hog: hoggrp { | 117 | pinctrl_hog: hoggrp { |
| 116 | fsl,pins = < | 118 | fsl,pins = < |
| 117 | MX51_PAD_EIM_EB2__GPIO2_22 0x0C5 | 119 | MX51_PAD_EIM_EB2__GPIO2_22 0x0C5 |
| @@ -125,6 +127,82 @@ | |||
| 125 | MX51_PAD_GPIO1_3__GPIO1_3 0x0C5 | 127 | MX51_PAD_GPIO1_3__GPIO1_3 0x0C5 |
| 126 | >; | 128 | >; |
| 127 | }; | 129 | }; |
| 130 | |||
| 131 | pinctrl_ecspi1: ecspi1grp { | ||
| 132 | fsl,pins = < | ||
| 133 | MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185 | ||
| 134 | MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185 | ||
| 135 | MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185 | ||
| 136 | >; | ||
| 137 | }; | ||
| 138 | |||
| 139 | pinctrl_ecspi2: ecspi2grp { | ||
| 140 | fsl,pins = < | ||
| 141 | MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185 | ||
| 142 | MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185 | ||
| 143 | MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185 | ||
| 144 | >; | ||
| 145 | }; | ||
| 146 | |||
| 147 | pinctrl_esdhc1: esdhc1grp { | ||
| 148 | fsl,pins = < | ||
| 149 | MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5 | ||
| 150 | MX51_PAD_SD1_CLK__SD1_CLK 0x20d5 | ||
| 151 | MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5 | ||
| 152 | MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5 | ||
| 153 | MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5 | ||
| 154 | MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5 | ||
| 155 | >; | ||
| 156 | }; | ||
| 157 | |||
| 158 | pinctrl_esdhc2: esdhc2grp { | ||
| 159 | fsl,pins = < | ||
| 160 | MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5 | ||
| 161 | MX51_PAD_SD2_CLK__SD2_CLK 0x20d5 | ||
| 162 | MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5 | ||
| 163 | MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5 | ||
| 164 | MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5 | ||
| 165 | MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5 | ||
| 166 | >; | ||
| 167 | }; | ||
| 168 | |||
| 169 | pinctrl_i2c2: i2c2grp { | ||
| 170 | fsl,pins = < | ||
| 171 | MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed | ||
| 172 | MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed | ||
| 173 | >; | ||
| 174 | }; | ||
| 175 | |||
| 176 | pinctrl_ipu_disp1: ipudisp1grp { | ||
| 177 | fsl,pins = < | ||
| 178 | MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5 | ||
| 179 | MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5 | ||
| 180 | MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5 | ||
| 181 | MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5 | ||
| 182 | MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5 | ||
| 183 | MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5 | ||
| 184 | MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5 | ||
| 185 | MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5 | ||
| 186 | MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5 | ||
| 187 | MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5 | ||
| 188 | MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5 | ||
| 189 | MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5 | ||
| 190 | MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5 | ||
| 191 | MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5 | ||
| 192 | MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5 | ||
| 193 | MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5 | ||
| 194 | MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5 | ||
| 195 | MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5 | ||
| 196 | MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5 | ||
| 197 | MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5 | ||
| 198 | MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5 | ||
| 199 | MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5 | ||
| 200 | MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5 | ||
| 201 | MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5 | ||
| 202 | MX51_PAD_DI1_PIN2__DI1_PIN2 0x5 | ||
| 203 | MX51_PAD_DI1_PIN3__DI1_PIN3 0x5 | ||
| 204 | >; | ||
| 205 | }; | ||
| 128 | }; | 206 | }; |
| 129 | }; | 207 | }; |
| 130 | 208 | ||