-
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 tag 'mxs-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-…
…2.6 into next/dt From Shawn Guo <shawn.guo@linaro.org>: It's mxs device tree changes for 3.8. The majority is device tree source updates. One timer improvement and one defconfig update are also included there. * tag 'mxs-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs_defconfig: Improve USB related support ARM: mxs: apf28dev: Add I2C and SPI support ARM: mxs: Setup scheduler clock ARM: dts: mxs: Add hog pins to Crystalfontz boards ARM: dts: cfa10036: Use pinctrl for power led ARM: mxs: apf28dev: Add LCD and backlight support ARM: mxs: apf28dev: Add pinctrl and gpios ARM: dts: mxs: Add 16 bits LCD screen muxing options for I.MX28 ARM: dts: cfa10049: Add the DH2228FV DAC to the DTS ARM: mxs: Add support for the Armadeus Systems APF28Dev docking board ARM: mx28: Skip OCOTP FEC MAC setup if in DT ARM: dts: mxs: Add PWM3 muxing options for i.MX28 ARM: mxs: Add support for the Armadeus Systems APF28 module ARM: dts: cfa10049: Add FEC to the CFA-10049 expansion board ARM: dts: imx23-olinuxino: Use pinctrl for gpio-led ARM: dts: imx23-olinuxino: Remove unneeded "default-on" ARM: dts: imx28-evk: Use pinctrl for gpio-led Signed-off-by: Arnd Bergmann <arnd@arndb.de>
- Loading branch information
Showing
11 changed files
with
424 additions
and
4 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
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
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,85 @@ | ||
| /* | ||
| * Copyright 2012 Armadeus Systems - <support@armadeus.com> | ||
| * | ||
| * 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/ "imx28.dtsi" | ||
|
|
||
| / { | ||
| model = "Armadeus Systems APF28 module"; | ||
| compatible = "armadeus,imx28-apf28", "fsl,imx28"; | ||
|
|
||
| memory { | ||
| reg = <0x40000000 0x08000000>; | ||
| }; | ||
|
|
||
| apb@80000000 { | ||
| apbh@80000000 { | ||
| gpmi-nand@8000c000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; | ||
| status = "okay"; | ||
|
|
||
| partition@0 { | ||
| label = "u-boot"; | ||
| reg = <0x0 0x300000>; | ||
| }; | ||
|
|
||
| partition@300000 { | ||
| label = "env"; | ||
| reg = <0x300000 0x80000>; | ||
| }; | ||
|
|
||
| partition@380000 { | ||
| label = "env2"; | ||
| reg = <0x380000 0x80000>; | ||
| }; | ||
|
|
||
| partition@400000 { | ||
| label = "dtb"; | ||
| reg = <0x400000 0x80000>; | ||
| }; | ||
|
|
||
| partition@480000 { | ||
| label = "splash"; | ||
| reg = <0x480000 0x80000>; | ||
| }; | ||
|
|
||
| partition@500000 { | ||
| label = "kernel"; | ||
| reg = <0x500000 0x800000>; | ||
| }; | ||
|
|
||
| partition@d00000 { | ||
| label = "rootfs"; | ||
| reg = <0xd00000 0xf300000>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| apbx@80040000 { | ||
| duart: serial@80074000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&duart_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| ahb@80080000 { | ||
| mac0: ethernet@800f0000 { | ||
| phy-mode = "rmii"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mac0_pins_a>; | ||
| phy-reset-gpios = <&gpio4 13 0>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; |
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,154 @@ | ||
| /* | ||
| * Copyright 2012 Armadeus Systems - <support@armadeus.com> | ||
| * | ||
| * 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 | ||
| */ | ||
|
|
||
| /* APF28Dev is a docking board for the APF28 SOM */ | ||
| /include/ "imx28-apf28.dts" | ||
|
|
||
| / { | ||
| model = "Armadeus Systems APF28Dev docking/development board"; | ||
| compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28"; | ||
|
|
||
| apb@80000000 { | ||
| apbh@80000000 { | ||
| ssp0: ssp@80010000 { | ||
| compatible = "fsl,imx28-mmc"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc0_4bit_pins_a | ||
| &mmc0_cd_cfg &mmc0_sck_cfg>; | ||
| bus-width = <4>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| ssp2: ssp@80014000 { | ||
| compatible = "fsl,imx28-spi"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&spi2_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| pinctrl@80018000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&hog_pins_apf28dev>; | ||
|
|
||
| hog_pins_apf28dev: hog@0 { | ||
| reg = <0>; | ||
| fsl,pinmux-ids = < | ||
| 0x1103 /* MX28_PAD_LCD_D16__GPIO_1_16 */ | ||
| 0x1113 /* MX28_PAD_LCD_D17__GPIO_1_17 */ | ||
| 0x1123 /* MX28_PAD_LCD_D18__GPIO_1_18 */ | ||
| 0x1133 /* MX28_PAD_LCD_D19__GPIO_1_19 */ | ||
| 0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */ | ||
| 0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */ | ||
| 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */ | ||
| >; | ||
| fsl,drive-strength = <0>; | ||
| fsl,voltage = <1>; | ||
| fsl,pull-up = <0>; | ||
| }; | ||
|
|
||
| lcdif_pins_apf28dev: lcdif-apf28dev@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>; | ||
| }; | ||
| }; | ||
|
|
||
| lcdif@80030000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&lcdif_16bit_pins_a | ||
| &lcdif_pins_apf28dev>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| apbx@80040000 { | ||
| lradc@80050000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| i2c0: i2c@80058000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2c0_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| pwm: pwm@80064000 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pwm3_pins_a &pwm4_pins_a>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| usbphy0: usbphy@8007c000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| usbphy1: usbphy@8007e000 { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| ahb@80080000 { | ||
| usb0: usb@80080000 { | ||
| vbus-supply = <®_usb0_vbus>; | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| usb1: usb@80090000 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| mac1: ethernet@800f4000 { | ||
| phy-mode = "rmii"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mac1_pins_a>; | ||
| phy-reset-gpios = <&gpio0 23 0>; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| regulators { | ||
| compatible = "simple-bus"; | ||
|
|
||
| reg_usb0_vbus: usb0_vbus { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "usb0_vbus"; | ||
| regulator-min-microvolt = <5000000>; | ||
| regulator-max-microvolt = <5000000>; | ||
| gpio = <&gpio1 23 1>; | ||
| }; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
|
|
||
| user { | ||
| label = "Heartbeat"; | ||
| gpios = <&gpio0 21 0>; | ||
| linux,default-trigger = "heartbeat"; | ||
| }; | ||
| }; | ||
|
|
||
| backlight { | ||
| compatible = "pwm-backlight"; | ||
|
|
||
| pwms = <&pwm 3 191000>; | ||
| brightness-levels = <0 4 8 16 32 64 128 255>; | ||
| default-brightness-level = <6>; | ||
| }; | ||
| }; |
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
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.