-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo…
…/linux-2.6 into next/dt From Shawn Guo <shawn.guo@linaro.org>: Here is the second (last) batch of mxs mxs device tree changes for 3.6. * 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx28-evk: add usb devices ARM: mxs: rename dts files with soc name being the prefix ARM: apx4devkit: add pin muxing for GPIOs ARM: apx4devkit: remove AUART3 ARM: apx4devkit: add SSP2 support ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits ARM: apx4devkit: add display support ARM: apx4devkit: add NAND support ARM: mxs: add dtb-y target into Makefile.boot ARM: mxs: convert stmp378x_devb board to device tree ARM: mxs: convert tx28 board to device tree ARM: mxs: convert apx4devkit board to device tree ARM: mxs: convert m28evk board to device tree ARM: dts: imx28: move lcdif control pins into board dts ARM: dts: imx28: move extra gpmi-nand pins into board dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
9 changed files
with
831 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright 2012 Freescale Semiconductor, Inc. | ||
| * | ||
| * The code contained herein is licensed under the GNU General Public | ||
| * License. You may obtain a copy of the GNU General Public License | ||
| * Version 2 or later at the following locations: | ||
| * | ||
| * http://www.opensource.org/licenses/gpl-license.html | ||
| * http://www.gnu.org/copyleft/gpl.html | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| /include/ "imx23.dtsi" | ||
|
|
||
| / { | ||
| model = "Freescale STMP378x Development Board"; | ||
| compatible = "fsl,stmp378x-devb", "fsl,imx23"; | ||
|
|
||
| memory { | ||
| reg = <0x40000000 0x04000000>; | ||
| }; | ||
|
|
||
| apb@80000000 { | ||
| apbh@80000000 { | ||
| ssp0: ssp@80010000 { | ||
| compatible = "fsl,imx23-mmc"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; | ||
| bus-width = <4>; | ||
| wp-gpios = <&gpio1 30 0>; | ||
| vmmc-supply = <®_vddio_sd0>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| pinctrl@80018000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&hog_pins_a>; | ||
|
|
||
| hog_pins_a: hog-gpios@0 { | ||
| reg = <0>; | ||
| fsl,pinmux-ids = < | ||
| 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */ | ||
| 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */ | ||
| >; | ||
| fsl,drive-strength = <0>; | ||
| fsl,voltage = <1>; | ||
| fsl,pull-up = <0>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| apbx@80040000 { | ||
| auart0: serial@8006c000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&auart0_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| duart: serial@80070000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&duart_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| regulators { | ||
| compatible = "simple-bus"; | ||
|
|
||
| reg_vddio_sd0: vddio-sd0 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vddio-sd0"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| gpio = <&gpio1 29 0>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| /dts-v1/; | ||
| /include/ "imx28.dtsi" | ||
|
|
||
| / { | ||
| model = "Bluegiga APX4 Development Kit"; | ||
| compatible = "bluegiga,apx4devkit", "fsl,imx28"; | ||
|
|
||
| memory { | ||
| reg = <0x40000000 0x04000000>; | ||
| }; | ||
|
|
||
| apb@80000000 { | ||
| apbh@80000000 { | ||
| gpmi-nand@8000c000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| ssp0: ssp@80010000 { | ||
| compatible = "fsl,imx28-mmc"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>; | ||
| bus-width = <4>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| ssp2: ssp@80014000 { | ||
| compatible = "fsl,imx28-mmc"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>; | ||
| bus-width = <4>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| pinctrl@80018000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&hog_pins_a>; | ||
|
|
||
| hog_pins_a: hog-gpios@0 { | ||
| reg = <0>; | ||
| fsl,pinmux-ids = < | ||
| 0x0113 /* MX28_PAD_GPMI_CE1N__GPIO_0_17 */ | ||
| 0x0153 /* MX28_PAD_GPMI_RDY1__GPIO_0_21 */ | ||
| 0x2123 /* MX28_PAD_SSP2_MISO__GPIO_2_18 */ | ||
| 0x2131 /* MX28_PAD_SSP2_SS0__GPIO_2_19 */ | ||
| 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */ | ||
| 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ | ||
| 0x4143 /* MX28_PAD_JTAG_RTCK__GPIO_4_20 */ | ||
| >; | ||
| fsl,drive-strength = <0>; | ||
| fsl,voltage = <1>; | ||
| fsl,pull-up = <0>; | ||
| }; | ||
|
|
||
| lcdif_pins_apx4: lcdif-apx4@0 { | ||
| reg = <0>; | ||
| fsl,pinmux-ids = < | ||
| 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */ | ||
| 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */ | ||
| 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */ | ||
| 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */ | ||
| >; | ||
| fsl,drive-strength = <0>; | ||
| fsl,voltage = <1>; | ||
| fsl,pull-up = <0>; | ||
| }; | ||
|
|
||
| mmc2_4bit_pins_apx4: mmc2-4bit-apx4@0 { | ||
| reg = <0>; | ||
| fsl,pinmux-ids = < | ||
| 0x2041 /* MX28_PAD_SSP0_DATA4__SSP2_D0 */ | ||
| 0x2051 /* MX28_PAD_SSP0_DATA5__SSP2_D3 */ | ||
| 0x2061 /* MX28_PAD_SSP0_DATA6__SSP2_CMD */ | ||
| 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */ | ||
| 0x2141 /* MX28_PAD_SSP2_SS1__SSP2_D1 */ | ||
| 0x2151 /* MX28_PAD_SSP2_SS2__SSP2_D2 */ | ||
| >; | ||
| fsl,drive-strength = <1>; | ||
| fsl,voltage = <1>; | ||
| fsl,pull-up = <1>; | ||
| }; | ||
|
|
||
| mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 { | ||
| fsl,pinmux-ids = < | ||
| 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */ | ||
| >; | ||
| fsl,drive-strength = <2>; | ||
| fsl,pull-up = <0>; | ||
| }; | ||
| }; | ||
|
|
||
| lcdif@80030000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&lcdif_24bit_pins_a | ||
| &lcdif_pins_apx4>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| apbx@80040000 { | ||
| saif0: saif@80042000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&saif0_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| saif1: saif@80046000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&saif1_pins_a>; | ||
| fsl,saif-master = <&saif0>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| i2c0: i2c@80058000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2c0_pins_a>; | ||
| status = "okay"; | ||
|
|
||
| sgtl5000: codec@0a { | ||
| compatible = "fsl,sgtl5000"; | ||
| reg = <0x0a>; | ||
| VDDA-supply = <®_3p3v>; | ||
| VDDIO-supply = <®_3p3v>; | ||
|
|
||
| }; | ||
|
|
||
| pcf8563: rtc@51 { | ||
| compatible = "phg,pcf8563"; | ||
| reg = <0x51>; | ||
| }; | ||
| }; | ||
|
|
||
| duart: serial@80074000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&duart_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| auart0: serial@8006a000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&auart0_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| auart1: serial@8006c000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&auart1_2pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| auart2: serial@8006e000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&auart2_2pins_a>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| ahb@80080000 { | ||
| mac0: ethernet@800f0000 { | ||
| phy-mode = "rmii"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mac0_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| regulators { | ||
| compatible = "simple-bus"; | ||
|
|
||
| reg_3p3v: 3p3v { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "3P3V"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-always-on; | ||
| }; | ||
| }; | ||
|
|
||
| sound { | ||
| compatible = "bluegiga,apx4devkit-sgtl5000", | ||
| "fsl,mxs-audio-sgtl5000"; | ||
| model = "apx4devkit-sgtl5000"; | ||
| saif-controllers = <&saif0 &saif1>; | ||
| audio-codec = <&sgtl5000>; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
|
|
||
| user { | ||
| label = "Heartbeat"; | ||
| gpios = <&gpio3 28 0>; | ||
| linux,default-trigger = "heartbeat"; | ||
| }; | ||
| }; | ||
| }; |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.