[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-43-g2a96830
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-43-g2a96830
|
From: Julien B a. A. <ar...@us...> - 2012-09-26 17:33:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2a968308b1c5f0b05e09e5092a1dfc7405ee5e3a (commit)
from e2d9a61cff4c51b9ca01eb78568f8469355d6584 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2a968308b1c5f0b05e09e5092a1dfc7405ee5e3a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 26 19:30:53 2012 +0200
[LINUX] 3.6: add apf28dev support (LCD, backlight & USB host working). APF28 & APF28Dev now have disctincts DTS
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-linux-3.6.config | 45 ++---
.../3.6/0403-armadeus-Add-apf28-dts-files.patch | 124 -----------
.../3.6/0403-armadeus-Add-apf28-support-dts.patch | 144 +++++++++++++
...04-armadeus-mx28_Initialize_fec_phy_clock.patch | 30 ---
...rmadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch | 35 ++++
...eus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch | 39 ++++
.../linux/3.6/0420-armadeus-Add-apf28dev-dts.patch | 216 ++++++++++++++++++++
7 files changed, 452 insertions(+), 181 deletions(-)
delete mode 100644 patches/linux/3.6/0403-armadeus-Add-apf28-dts-files.patch
create mode 100644 patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
delete mode 100644 patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
create mode 100644 patches/linux/3.6/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
create mode 100644 patches/linux/3.6/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch
create mode 100644 patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
index 54c5792..4e75dc9 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
@@ -85,6 +85,7 @@ CONFIG_RT73USB=m
CONFIG_ZD1211RW=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
@@ -104,36 +105,14 @@ CONFIG_GPIO_SYSFS=y
CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_XC4000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-# CONFIG_MEDIA_TUNER_TDA18212 is not set
+CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_VIDEO_VIVI=m
-# CONFIG_RADIO_ADAPTERS is not set
CONFIG_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -143,9 +122,9 @@ CONFIG_LOGO=y
CONFIG_USB=y
CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_MON=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
@@ -154,12 +133,25 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
CONFIG_USB_ULPI=y
+CONFIG_USB_MXS_PHY=y
CONFIG_MMC=y
CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y
+CONFIG_PWM=y
+CONFIG_PWM_MXS=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -181,7 +173,6 @@ CONFIG_JFFS2_LZO=y
CONFIG_JFFS2_CMODE_NONE=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
CONFIG_NLS_CODEPAGE_437=y
diff --git a/patches/linux/3.6/0403-armadeus-Add-apf28-dts-files.patch b/patches/linux/3.6/0403-armadeus-Add-apf28-dts-files.patch
deleted file mode 100644
index 681522f..0000000
--- a/patches/linux/3.6/0403-armadeus-Add-apf28-dts-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: linux-3.5/arch/arm/boot/dts/imx28-apf28.dts
-===================================================================
---- /dev/null
-+++ linux-3.5/arch/arm/boot/dts/imx28-apf28.dts
-@@ -0,0 +1,119 @@
-+/*
-+ * Copyright 2012 Armadeus Systems - <su...@ar...>
-+ *
-+ * Based on code which is:
-+ * 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/ "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@1 {
-+ label = "env";
-+ reg = <0x300000 0x80000>;
-+ };
-+ partition@2 {
-+ label = "env2";
-+ reg = <0x380000 0x20000>;
-+ };
-+ partition@3 {
-+ label = "dtb";
-+ reg = <0x400000 0x80000>;
-+ };
-+ partition@4 {
-+ label = "splash";
-+ reg = <0x480000 0x20000>;
-+ };
-+ partition@5 {
-+ label = "kernel";
-+ reg = <0x500000 0x800000>;
-+ };
-+ partition@6 {
-+ label = "rootfs";
-+ reg = <0xd00000 0xf300000>;
-+ };
-+ };
-+
-+ ssp0: ssp@80010000 {
-+ compatible = "fsl,imx28-mmc";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&mmc0_8bit_pins_a
-+ &mmc0_cd_cfg &mmc0_sck_cfg>;
-+ bus-width = <8>;
-+ wp-gpios = <&gpio2 12 0>;
-+ vmmc-supply = <®_vddio_sd0>;
-+ status = "okay";
-+ };
-+
-+ ssp2: ssp@80014000 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "fsl,imx28-spi";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&spi2_pins_a>;
-+ status = "okay";
-+ device@0 {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ compatible = "spidev";
-+ reg = <0>; //Chip select 0
-+ spi-max-frequency = <3125000>;
-+ };
-+ };
-+ };
-+
-+ 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";
-+ };
-+ };
-+ 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 = <&gpio3 28 0>;
-+ };
-+ };
-+};
diff --git a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch b/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
new file mode 100644
index 0000000..2b028c0
--- /dev/null
+++ b/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
@@ -0,0 +1,144 @@
+Add APF28 module support (device tree based).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts 2012-09-24 17:38:15.000000000 +0200
+@@ -0,0 +1,79 @@
++/*
++ * Copyright 2012 Armadeus Systems - <su...@ar...>
++ *
++ * 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@1 {
++ label = "env";
++ reg = <0x300000 0x80000>;
++ };
++ partition@2 {
++ label = "env2";
++ reg = <0x380000 0x20000>;
++ };
++ partition@3 {
++ label = "dtb";
++ reg = <0x400000 0x80000>;
++ };
++ partition@4 {
++ label = "splash";
++ reg = <0x480000 0x20000>;
++ };
++ partition@5 {
++ label = "kernel";
++ reg = <0x500000 0x800000>;
++ };
++ partition@6 {
++ 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";
++ };
++ };
++};
+Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
+===================================================================
+--- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c 2012-09-16 23:58:51.000000000 +0200
++++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c 2012-09-25 19:30:47.000000000 +0200
+@@ -157,6 +157,7 @@
+ enum mac_oui {
+ OUI_FSL,
+ OUI_DENX,
++ /*OUI_ARMADEUS,*/
+ };
+
+ static void __init update_fec_mac_prop(enum mac_oui oui)
+@@ -202,6 +203,11 @@
+ macaddr[1] = 0xe5;
+ macaddr[2] = 0x4e;
+ break;
++ /*case OUI_ARMADEUS:
++ macaddr[0] = 0x??;
++ macaddr[1] = 0x??;
++ macaddr[2] = 0x??;
++ break;*/
+ }
+ val = ocotp[i];
+ macaddr[3] = (val >> 16) & 0xff;
+@@ -270,6 +276,12 @@
+ mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
+ }
+
++static void __init apf28_init(void)
++{
++ enable_clk_enet_out();
++ /*update_fec_mac_prop(OUI_ARMADEUS);TBDL*/
++}
++
+ static void __init mxs_machine_init(void)
+ {
+ if (of_machine_is_compatible("fsl,imx28-evk"))
+@@ -280,6 +292,8 @@
+ m28evk_init();
+ else if (of_machine_is_compatible("bluegiga,apx4devkit"))
+ apx4devkit_init();
++ else if (of_machine_is_compatible("armadeus,imx28-apf28"))
++ apf28_init();
+
+ of_platform_populate(NULL, of_default_bus_match_table,
+ mxs_auxdata_lookup, NULL);
+@@ -299,6 +313,7 @@
+ "denx,m28evk",
+ "fsl,imx28-evk",
+ "karo,tx28",
++ "armadeus,apf28",
+ "fsl,imx28",
+ NULL,
+ };
diff --git a/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch b/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
deleted file mode 100644
index 735e99d..0000000
--- a/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fec phy clock needs to be enabled to have the interface working.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-
-Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
-===================================================================
---- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c
-+++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
-@@ -270,6 +270,11 @@ static void __init apx4devkit_init(void)
- mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
- }
-
-+static void __init apf28_init(void)
-+{
-+ enable_clk_enet_out();
-+}
-+
- static void __init mxs_machine_init(void)
- {
- if (of_machine_is_compatible("fsl,imx28-evk"))
-@@ -280,6 +285,8 @@ static void __init mxs_machine_init(void
- m28evk_init();
- else if (of_machine_is_compatible("bluegiga,apx4devkit"))
- apx4devkit_init();
-+ else if (of_machine_is_compatible("armadeus,imx28-apf28"))
-+ apf28_init();
-
- of_platform_populate(NULL, of_default_bus_match_table,
- mxs_auxdata_lookup, NULL);
diff --git a/patches/linux/3.6/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch b/patches/linux/3.6/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
new file mode 100644
index 0000000..c669cd0
--- /dev/null
+++ b/patches/linux/3.6/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
@@ -0,0 +1,35 @@
+
+Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.6-rc6/arch/arm/boot/dts/imx28.dtsi
+===================================================================
+--- linux-3.6-rc6.orig/arch/arm/boot/dts/imx28.dtsi 2012-09-25 19:10:09.000000000 +0200
++++ linux-3.6-rc6/arch/arm/boot/dts/imx28.dtsi 2012-09-25 19:12:38.000000000 +0200
+@@ -453,6 +453,26 @@
+ fsl,pull-up = <0>;
+ };
+
++ pwm3_pins_a: pwm3@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <
++ 0x31C0 /* MX28_PAD_PWM3__PWM_3 */
++ >;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
++ pwm4_pins_a: pwm4@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <
++ 0x31d0 /* MX28_PAD_PWM4__PWM_4 */
++ >;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
+ lcdif_24bit_pins_a: lcdif-24bit@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
diff --git a/patches/linux/3.6/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch b/patches/linux/3.6/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch
new file mode 100644
index 0000000..506f88d
--- /dev/null
+++ b/patches/linux/3.6/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch
@@ -0,0 +1,39 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.6-rc6/arch/arm/boot/dts/imx28.dtsi
+===================================================================
+--- linux-3.6-rc6.orig/arch/arm/boot/dts/imx28.dtsi 2012-09-25 20:36:57.000000000 +0200
++++ linux-3.6-rc6/arch/arm/boot/dts/imx28.dtsi 2012-09-25 20:38:38.000000000 +0200
+@@ -506,6 +506,31 @@
+ fsl,pull-up = <0>;
+ };
+
++ lcdif_16bit_pins_a: lcdif-16bit@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <
++ 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */
++ 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */
++ 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */
++ 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */
++ 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */
++ 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */
++ 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */
++ 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */
++ 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */
++ 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */
++ 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */
++ 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */
++ 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */
++ 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */
++ 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */
++ 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */
++ >;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
+ can0_pins_a: can0@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
diff --git a/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
new file mode 100644
index 0000000..6da70f2
--- /dev/null
+++ b/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
@@ -0,0 +1,216 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28dev.dts
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28dev.dts 2012-09-25 21:23:27.000000000 +0200
+@@ -0,0 +1,165 @@
++/*
++ * Copyright 2012 Armadeus Systems - <su...@ar...>
++ *
++ * 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_8bit_pins_a
++ &mmc0_cd_cfg &mmc0_sck_cfg>;
++ bus-width = <8>;
++ wp-gpios = <&gpio2 12 0>;
++ vmmc-supply = <®_vddio_sd0>;
++ status = "okay";
++ };
++
++ ssp2: ssp@80014000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "fsl,imx28-spi";
++ pinctrl-names = "default";
++ pinctrl-0 = <&spi2_pins_a>;
++ status = "okay";
++ device@0 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "spidev";
++ reg = <0>; //Chip select 0
++ spi-max-frequency = <3125000>;
++ };
++ };
++
++ pinctrl@80018000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&hog_pins_apf28dev>;
++
++ hog_pins_apf28dev: hog-gpios@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 */
++ 0x1173 /* MX28_PAD_LCD_D23__GPIO_1_23 */
++ >;
++ fsl,drive-strength = <0>;
++ fsl,voltage = <1>;
++ fsl,pull-up = <0>;
++ };
++
++ lcdif_pins_apf28dev: lcdif-gpios@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>;
++ /* panel-enable-gpios = <&gpio3 30 0>; */
++ status = "okay";
++ };
++ };
++
++ apbx@80040000 {
++ 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_vddio_sd0: vddio-sd0 {
++ compatible = "regulator-fixed";
++ regulator-name = "vddio-sd0";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ gpio = <&gpio3 28 0>;
++ };
++
++ 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 5000000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <6>;
++ };
++};
+Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
+===================================================================
+--- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c 2012-09-25 20:36:06.000000000 +0200
++++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c 2012-09-25 20:38:49.000000000 +0200
+@@ -97,6 +97,25 @@
+ },
+ };
+
++static struct fb_videomode apf28dev_video_modes[] = {
++ {
++ .name = "LW700",
++ .refresh = 60,
++ .xres = 800,
++ .yres = 480,
++ .pixclock = 30303, /* picosecond */
++ .left_margin = 96,
++ .right_margin = 96, /* at least 3 & 1 */
++ .upper_margin = 0x14,
++ .lower_margin = 0x15,
++ .hsync_len = 64,
++ .vsync_len = 4,
++ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
++ FB_SYNC_DATA_ENABLE_HIGH_ACT |
++ FB_SYNC_DOTCLK_FAILING_ACT,
++ },
++};
++
+ static struct mxsfb_platform_data mxsfb_pdata __initdata;
+
+ static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = {
+@@ -280,6 +299,12 @@
+ {
+ enable_clk_enet_out();
+ /*update_fec_mac_prop(OUI_ARMADEUS);TBDL*/
++ printk("--------############\n");
++
++ mxsfb_pdata.mode_list = apf28dev_video_modes;
++ mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);
++ mxsfb_pdata.default_bpp = 16;
++ mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT;
+ }
+
+ static void __init mxs_machine_init(void)
hooks/post-receive
--
armadeus
|
