mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-26 20:26:41 +00:00
Merge pull request #4220 from vpeter4/udoo
projects/imx6: update udoo system support
This commit is contained in:
commit
ab19923d77
22
projects/imx6/bootloader/uEnv-udoo_quad.txt
Normal file
22
projects/imx6/bootloader/uEnv-udoo_quad.txt
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
# enable only one video line
|
||||||
|
# HDMI
|
||||||
|
video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32
|
||||||
|
# 7" LVDS
|
||||||
|
#video=mxcfb0:dev=ldb,800x480M@60,if=RGB666,bpp=32
|
||||||
|
# 15.6" LVDS
|
||||||
|
#video=mxcfb0:dev=ldb,1368x768M@60,if=RGB24,bpp=32
|
||||||
|
|
||||||
|
# enable serial console
|
||||||
|
#console_arg=console=ttymxc1,115200
|
||||||
|
# or make boot more quiet
|
||||||
|
console_arg=quiet morequiet
|
||||||
|
# or having quiet console
|
||||||
|
#console_arg=console=ttymxc1,115200 quiet morequiet
|
||||||
|
|
||||||
|
# enable ssh
|
||||||
|
#ssh_arg=ssh
|
||||||
|
|
||||||
|
zImage=/KERNEL
|
||||||
|
bootfile=/KERNEL
|
||||||
|
mmcargs=setenv bootargs boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 ${ssh_arg} ${console_arg} video=${video} dmfc=3 consoleblank=0
|
@ -0,0 +1,15 @@
|
|||||||
|
#
|
||||||
|
# Configuration for iMX6 VT1613 analog output - /usr/share/alsa/cards/imx-vt1613-audio.conf
|
||||||
|
#
|
||||||
|
|
||||||
|
<confdir:pcm/front.conf>
|
||||||
|
|
||||||
|
imx-vt1613-audio.pcm.front.0 {
|
||||||
|
@args [ CARD ]
|
||||||
|
@args.CARD {
|
||||||
|
type string
|
||||||
|
}
|
||||||
|
type hw
|
||||||
|
card $CARD
|
||||||
|
device 0
|
||||||
|
}
|
@ -1,14 +1,14 @@
|
|||||||
From 206e92e6a26ca57aff2ceba09275f5c1441a155c Mon Sep 17 00:00:00 2001
|
From 2d08dc140cc5a0db518984a558ae31779ad65ca0 Mon Sep 17 00:00:00 2001
|
||||||
From: vpeter4 <peter.vicman@gmail.com>
|
From: vpeter4 <peter.vicman@gmail.com>
|
||||||
Date: Wed, 3 Jun 2015 17:58:54 +0200
|
Date: Thu, 18 Jun 2015 05:33:23 +0200
|
||||||
Subject: [PATCH] udoo quad device tree
|
Subject: [PATCH] udoo quad device tree
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm/boot/dts/imx6q-udoo.dts | 348 ++++++++++++++++++++++++++++++++++++++-
|
arch/arm/boot/dts/imx6q-udoo.dts | 452 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
1 file changed, 342 insertions(+), 6 deletions(-)
|
1 file changed, 446 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/imx6q-udoo.dts b/arch/arm/boot/dts/imx6q-udoo.dts
|
diff --git a/arch/arm/boot/dts/imx6q-udoo.dts b/arch/arm/boot/dts/imx6q-udoo.dts
|
||||||
index 7cc0267..d4f6acb 100644
|
index 7cc0267..26e56af 100644
|
||||||
--- a/arch/arm/boot/dts/imx6q-udoo.dts
|
--- a/arch/arm/boot/dts/imx6q-udoo.dts
|
||||||
+++ b/arch/arm/boot/dts/imx6q-udoo.dts
|
+++ b/arch/arm/boot/dts/imx6q-udoo.dts
|
||||||
@@ -2,6 +2,10 @@
|
@@ -2,6 +2,10 @@
|
||||||
@ -22,7 +22,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
@@ -17,12 +21,213 @@
|
@@ -17,12 +21,220 @@
|
||||||
compatible = "udoo,imx6q-udoo", "fsl,imx6q";
|
compatible = "udoo,imx6q-udoo", "fsl,imx6q";
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
@ -35,6 +35,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ mxcfb1 = &mxcfb2;
|
+ mxcfb1 = &mxcfb2;
|
||||||
+ mxcfb2 = &mxcfb3;
|
+ mxcfb2 = &mxcfb3;
|
||||||
+ mxcfb3 = &mxcfb4;
|
+ mxcfb3 = &mxcfb4;
|
||||||
|
+ ssi0 = &ssi1;
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
memory {
|
memory {
|
||||||
@ -106,16 +107,16 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ mxcfb2: fb@1 {
|
+ mxcfb2: fb@1 {
|
||||||
+ compatible = "fsl,mxc_sdc_fb";
|
+ compatible = "fsl,mxc_sdc_fb";
|
||||||
+ disp_dev = "hdmi";
|
+ disp_dev = "ldb";
|
||||||
+ interface_pix_fmt = "RGB24";
|
+ default_bpp = <24>;
|
||||||
+ mode_str ="1920x1080M@60";
|
+ interface_pix_fmt = "RGB24";
|
||||||
+ default_bpp = <24>;
|
+ mode_str ="";
|
||||||
+ int_clk = <0>;
|
+ int_clk = <0>;
|
||||||
+ late_init = <0>;
|
+ late_init = <1>;
|
||||||
+ status = "disabled";
|
+ status = "okay";
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ mxcfb3: fb@2 {
|
+ mxcfb3: fb@2 {
|
||||||
+ compatible = "fsl,mxc_sdc_fb";
|
+ compatible = "fsl,mxc_sdc_fb";
|
||||||
@ -140,30 +141,16 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ codec: vt1613 {
|
+ codec: vt1613 {
|
||||||
+ compatible = "wlf,vt1613";
|
+ compatible = "via,vt1613";
|
||||||
+ amic-mono;
|
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ sound {
|
+ sound {
|
||||||
+ compatible = "fsl,imx6q-udoo-vt1613",
|
+ compatible = "udoo,imx-vt1613-audio";
|
||||||
+ "fsl,imx-audio-vt1613";
|
|
||||||
+ model = "vt1613-audio";
|
|
||||||
+ ssi-controller = <&ssi1>;
|
+ ssi-controller = <&ssi1>;
|
||||||
+ audio-codec = <&codec>;
|
+ audio-codec = <&codec>;
|
||||||
+ audio-routing =
|
|
||||||
+ "Headphone Jack", "HPOUTL",
|
|
||||||
+ "Headphone Jack", "HPOUTR",
|
|
||||||
+ "Ext Spk", "SPKOUTL",
|
|
||||||
+ "Ext Spk", "SPKOUTR",
|
|
||||||
+ "MICBIAS", "AMIC",
|
|
||||||
+ "IN3R", "MICBIAS",
|
|
||||||
+ "DMIC", "MICBIAS",
|
|
||||||
+ "DMICDAT", "DMIC";
|
|
||||||
+ mux-int-port = <1>;
|
+ mux-int-port = <1>;
|
||||||
+ mux-ext-port = <6>;
|
+ mux-ext-port = <6>;
|
||||||
+ };
|
+ };
|
||||||
+// hp-det-gpios = <&gpio7 8 1>;
|
|
||||||
+// mic-det-gpios = <&gpio1 9 1>;
|
|
||||||
+
|
+
|
||||||
+ sound-hdmi {
|
+ sound-hdmi {
|
||||||
+ compatible = "fsl,imx6q-audio-hdmi",
|
+ compatible = "fsl,imx6q-audio-hdmi",
|
||||||
@ -185,6 +172,23 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ compatible = "fsl,mxc_v4l2_output";
|
+ compatible = "fsl,mxc_v4l2_output";
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+ };
|
+ };
|
||||||
|
+
|
||||||
|
+ poweroff {
|
||||||
|
+ compatible = "udoo,poweroff";
|
||||||
|
+ sam3x_rst_gpio = <&gpio1 0 GPIO_ACTIVE_LOW>;
|
||||||
|
+ pwr_5v_gpio = <&gpio2 4 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ arduino_mode = <0>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ldb {
|
||||||
|
+ ipu_id = <1>;
|
||||||
|
+ disp_id = <0>;
|
||||||
|
+ ext_ref = <1>;
|
||||||
|
+ mode = "sep0";
|
||||||
|
+ sec_ipu_id = <1>;
|
||||||
|
+ sec_disp_id = <1>;
|
||||||
|
+ status = "okay";
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+&hdmi_audio {
|
+&hdmi_audio {
|
||||||
@ -215,15 +219,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+ pinctrl-0 = <&pinctrl_i2c2_2>;
|
+ pinctrl-0 = <&pinctrl_i2c2_2>;
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+/*
|
+
|
||||||
+ egalax_ts@04 {
|
|
||||||
+ compatible = "eeti,egalax_ts";
|
|
||||||
+ reg = <0x04>;
|
|
||||||
+ interrupt-parent = <&gpio2>;
|
|
||||||
+ interrupts = <28 2>;
|
|
||||||
+ wakeup-gpios = <&gpio2 28 0>;
|
|
||||||
+ };
|
|
||||||
+*/
|
|
||||||
+ hdmi: edid@50 {
|
+ hdmi: edid@50 {
|
||||||
+ compatible = "fsl,imx6-hdmi-i2c";
|
+ compatible = "fsl,imx6-hdmi-i2c";
|
||||||
+ reg = <0x50>;
|
+ reg = <0x50>;
|
||||||
@ -234,10 +230,21 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+ pinctrl-0 = <&pinctrl_i2c3_5>;
|
+ pinctrl-0 = <&pinctrl_i2c3_5>;
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ touchscreen: st1232@55 {
|
||||||
|
+ compatible = "sitronix,st1232";
|
||||||
|
+ reg = <0x55>;
|
||||||
|
+ interrupt-parent = <&gpio1>;
|
||||||
|
+ interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
|
||||||
|
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||||
|
+ /* udoo poweroff driver */
|
||||||
|
+ lcd_panel_on_gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ lcd_backlight_gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ };
|
||||||
};
|
};
|
||||||
|
|
||||||
&fec {
|
&fec {
|
||||||
@@ -33,9 +238,68 @@
|
@@ -33,9 +245,62 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
&iomuxc {
|
&iomuxc {
|
||||||
@ -251,7 +258,6 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x80000000 /* 5v enable */
|
+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x80000000 /* 5v enable */
|
||||||
+ MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000 /* Vtt suspend */
|
+ MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000 /* Vtt suspend */
|
||||||
+ MX6QDL_PAD_SD2_DAT0__GPIO1_IO15 0x80000000 /* touch reset */
|
+ MX6QDL_PAD_SD2_DAT0__GPIO1_IO15 0x80000000 /* touch reset */
|
||||||
+ MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000 /* audio reset */
|
|
||||||
+ MX6QDL_PAD_EIM_EB3__GPIO2_IO31 0x80000000 /* ethernet power */
|
+ MX6QDL_PAD_EIM_EB3__GPIO2_IO31 0x80000000 /* ethernet power */
|
||||||
+
|
+
|
||||||
+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* usb hub reset */
|
+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* usb hub reset */
|
||||||
@ -273,16 +279,11 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x80000000 /* input mon serial*/
|
+ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x80000000 /* input mon serial*/
|
||||||
+ MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 /* writeprotect spi*/
|
+ MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 /* writeprotect spi*/
|
||||||
+ MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x30b1 /* arduino pinout */
|
+ MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x30b1 /* arduino pinout */
|
||||||
+
|
|
||||||
+ MX6QDL_PAD_DI0_PIN2__AUD6_TXD 0x80000000 /* audio audmux */
|
|
||||||
+ MX6QDL_PAD_DI0_PIN3__AUD6_TXFS 0x80000000 /* audio audmux */
|
|
||||||
+ MX6QDL_PAD_DI0_PIN4__AUD6_RXD 0x80000000 /* audio audmux */
|
|
||||||
+ MX6QDL_PAD_DI0_PIN15__AUD6_TXC 0x80000000 /* audio audmux */
|
|
||||||
+ >;
|
+ >;
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ pinctrl_i2c1_2: i2c1grp-2 {
|
+ pinctrl_i2c1_2: i2c1grp-2 {
|
||||||
fsl,pins = <
|
+ fsl,pins = <
|
||||||
+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
|
+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
|
||||||
+ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
|
+ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
|
||||||
+ >;
|
+ >;
|
||||||
@ -296,7 +297,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ pinctrl_i2c3_5: i2c3grp-5 {
|
+ pinctrl_i2c3_5: i2c3grp-5 {
|
||||||
+ fsl,pins = <
|
fsl,pins = <
|
||||||
+ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
|
+ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
|
||||||
+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
|
+ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
|
||||||
+ >;
|
+ >;
|
||||||
@ -307,7 +308,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
|
MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
|
||||||
MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
|
MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
|
||||||
MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
|
MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
|
||||||
@@ -51,10 +315,10 @@
|
@@ -51,10 +316,10 @@
|
||||||
MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
|
MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
|
||||||
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
|
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
|
||||||
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
|
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
|
||||||
@ -320,7 +321,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
pinctrl_uart2: uart2grp {
|
pinctrl_uart2: uart2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
|
MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
|
||||||
@@ -62,19 +326,51 @@
|
@@ -62,19 +327,90 @@
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -362,9 +363,48 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0
|
+ MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0
|
||||||
+ >;
|
+ >;
|
||||||
+ };*/
|
+ };*/
|
||||||
|
+
|
||||||
|
+ ac97link_running: ac97link_runninggrp {
|
||||||
|
+ fsl,pins = <
|
||||||
|
+ MX6QDL_PAD_DI0_PIN2__AUD6_TXD 0x80000000
|
||||||
|
+ MX6QDL_PAD_DI0_PIN3__AUD6_TXFS 0x80000000
|
||||||
|
+ MX6QDL_PAD_DI0_PIN4__AUD6_RXD 0x80000000
|
||||||
|
+ MX6QDL_PAD_DI0_PIN15__AUD6_TXC 0x80000000
|
||||||
|
+ >;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ ac97link_reset: ac97link_resetgrp {
|
||||||
|
+ fsl,pins = <
|
||||||
|
+ MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000
|
||||||
|
+ MX6QDL_PAD_DI0_PIN3__GPIO4_IO19 0x80000000
|
||||||
|
+ MX6QDL_PAD_DI0_PIN2__GPIO4_IO18 0x80000000
|
||||||
|
+ >;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ ac97link_warm_reset: ac97link_warm_resetgrp {
|
||||||
|
+ fsl,pins = <
|
||||||
|
+ MX6QDL_PAD_DI0_PIN3__GPIO4_IO19 0x80000000
|
||||||
|
+ >;
|
||||||
|
+ };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
+&audmux {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ssi1 {
|
||||||
|
+ fsl,mode = "ac97-slave";
|
||||||
|
+ pinctrl-names = "default", "ac97-running", "ac97-reset", "ac97-warm-reset";
|
||||||
|
+ pinctrl-0 = <&ac97link_running>;
|
||||||
|
+ pinctrl-1 = <&ac97link_running>;
|
||||||
|
+ pinctrl-2 = <&ac97link_reset>;
|
||||||
|
+ pinctrl-3 = <&ac97link_warm_reset>;
|
||||||
|
+ /* sync, sdata (output), reset */
|
||||||
|
+ ac97-gpios = <&gpio4 19 0 &gpio4 18 0 &gpio2 30 0>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
+&spdif {
|
+&spdif {
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+ pinctrl-0 = <&pinctrl_spdif_1>;
|
+ pinctrl-0 = <&pinctrl_spdif_1>;
|
||||||
@ -374,7 +414,7 @@ index 7cc0267..d4f6acb 100644
|
|||||||
&sata {
|
&sata {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
@@ -85,9 +381,49 @@
|
@@ -85,9 +421,33 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -400,29 +440,13 @@ index 7cc0267..d4f6acb 100644
|
|||||||
+ vbus-supply = <®_usb_h1_vbus>;
|
+ vbus-supply = <®_usb_h1_vbus>;
|
||||||
+ clocks = <&clks 201>;
|
+ clocks = <&clks 201>;
|
||||||
+ clock-names = "phy";
|
+ clock-names = "phy";
|
||||||
+ status = "okay";
|
status = "okay";
|
||||||
+};
|
};
|
||||||
+
|
+
|
||||||
+&hdmi_cec {
|
+&hdmi_cec {
|
||||||
+ /*pinctrl-names = "default";
|
+ /*pinctrl-names = "default";
|
||||||
+ pinctrl-0 = <&pinctrl_hdmi_cec_1>;*/
|
+ pinctrl-0 = <&pinctrl_hdmi_cec_1>;*/
|
||||||
+ status = "disabled";
|
+ status = "disabled";
|
||||||
+};
|
+};
|
||||||
+
|
|
||||||
+&mxcfb1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&mxcfb2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&mxcfb3 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&mxcfb4 {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
--
|
--
|
||||||
1.8.1.2
|
1.8.1.2
|
||||||
|
@ -18,114 +18,12 @@ TODO: Not the cleanest solution but it works, should revisit.
|
|||||||
Overwriting power_off function with udoo_power_off in case uddo is used.
|
Overwriting power_off function with udoo_power_off in case uddo is used.
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm/boot/dts/imx6q-udoo.dts | 83 +++++++++++++++++++
|
|
||||||
drivers/power/reset/Kconfig | 8 ++
|
drivers/power/reset/Kconfig | 8 ++
|
||||||
drivers/power/reset/Makefile | 1 +
|
drivers/power/reset/Makefile | 1 +
|
||||||
drivers/power/reset/udoo-poweroff.c | 159 ++++++++++++++++++++++++++++++++++++
|
drivers/power/reset/udoo-poweroff.c | 159 ++++++++++++++++++++++++++++++++++++
|
||||||
4 files changed, 251 insertions(+)
|
3 files changed, 168 insertions(+)
|
||||||
create mode 100644 drivers/power/reset/udoo-poweroff.c
|
create mode 100644 drivers/power/reset/udoo-poweroff.c
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/imx6q-udoo.dts b/arch/arm/boot/dts/imx6q-udoo.dts
|
|
||||||
index d4f6acb..078a983 100644
|
|
||||||
--- a/arch/arm/boot/dts/imx6q-udoo.dts
|
|
||||||
+++ b/arch/arm/boot/dts/imx6q-udoo.dts
|
|
||||||
@@ -179,6 +179,78 @@
|
|
||||||
compatible = "fsl,mxc_v4l2_output";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ poweroff {
|
|
||||||
+ compatible = "udoo,poweroff";
|
|
||||||
+ sam3x_rst_gpio = <&gpio1 0 GPIO_ACTIVE_LOW>;
|
|
||||||
+ pwr_5v_gpio = <&gpio2 4 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ arduino_mode = <0>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&ldb {
|
|
||||||
+ ipu_id = <1>;
|
|
||||||
+ disp_id = <0>;
|
|
||||||
+ ext_ref = <1>;
|
|
||||||
+ mode = "sep0";
|
|
||||||
+ sec_ipu_id = <1>;
|
|
||||||
+ sec_disp_id = <1>;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ lvds0: lvds-channel@0 {
|
|
||||||
+ fsl,data-mapping = "spwg";
|
|
||||||
+ fsl,data-width = <18>;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ display-timings {
|
|
||||||
+ native-mode = <&timing0>;
|
|
||||||
+ timing0: 800x480 { /* 60 Hz */
|
|
||||||
+ clock-frequency = <30000000>;
|
|
||||||
+ hactive = <800>;
|
|
||||||
+ vactive = <480>;
|
|
||||||
+ hback-porch = <50>;
|
|
||||||
+ hfront-porch = <50>;
|
|
||||||
+ vback-porch = <21>;
|
|
||||||
+ vfront-porch = <7>;
|
|
||||||
+ hsync-len = <60>;
|
|
||||||
+ vsync-len = <10>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ timing1: 1024x768 { /* 60 Hz */
|
|
||||||
+ /* from u-boot-unico/board/udoo/udoo.c */
|
|
||||||
+ /* Rif. Panel 1024x768 - UMSH-8596MD-15T - G156XW01V0 */
|
|
||||||
+ clock-frequency = <65000000>;
|
|
||||||
+ hactive = <1024>;
|
|
||||||
+ vactive = <768>;
|
|
||||||
+ hback-porch = <220>;
|
|
||||||
+ hfront-porch = <40>;
|
|
||||||
+ vback-porch = <21>;
|
|
||||||
+ vfront-porch = <7>;
|
|
||||||
+ hsync-len = <60>;
|
|
||||||
+ vsync-len = <10>;
|
|
||||||
+ de-active = <0>;
|
|
||||||
+ pixelclk-active = <1>;
|
|
||||||
+ interlaced = <0>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ timing2: 1366x768 { /* 59 Hz */
|
|
||||||
+ /* from u-boot-unico/board/udoo/udoo.c */
|
|
||||||
+ /* Rif. 1366x768 Panel CHIMEI M156B3-LA1 */
|
|
||||||
+ clock-frequency = <72000000>;
|
|
||||||
+ hactive = <1368>;
|
|
||||||
+ vactive = <768>;
|
|
||||||
+ hback-porch = <93>;
|
|
||||||
+ hfront-porch = <33>;
|
|
||||||
+ vback-porch = <22>;
|
|
||||||
+ vfront-porch = <7>;
|
|
||||||
+ hsync-len = <40>;
|
|
||||||
+ vsync-len = <4>;
|
|
||||||
+ de-active = <0>;
|
|
||||||
+ pixelclk-active = <1>;
|
|
||||||
+ interlaced = <0>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&hdmi_audio {
|
|
||||||
@@ -228,6 +300,17 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&pinctrl_i2c3_5>;
|
|
||||||
status = "okay";
|
|
||||||
+
|
|
||||||
+ touchscreen: st1232@55 {
|
|
||||||
+ compatible = "sitronix,st1232";
|
|
||||||
+ reg = <0x55>;
|
|
||||||
+ interrupt-parent = <&gpio1>;
|
|
||||||
+ interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
|
|
||||||
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
|
||||||
+ /* udoo poweroff driver */
|
|
||||||
+ lcd_panel_on_gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ lcd_backlight_gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&fec {
|
|
||||||
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
|
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
|
||||||
index 6d452a7..1a0620f 100644
|
index 6d452a7..1a0620f 100644
|
||||||
--- a/drivers/power/reset/Kconfig
|
--- a/drivers/power/reset/Kconfig
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
--- a/drivers/video/mxc/ldb.c 2015-05-06 19:05:42.000000000 +0200
|
||||||
|
+++ b/drivers/video/mxc/ldb.c 2015-06-18 17:14:52.241638700 +0200
|
||||||
|
@@ -159,6 +159,22 @@
|
||||||
|
0,
|
||||||
|
FB_VMODE_NONINTERLACED,
|
||||||
|
FB_MODE_IS_DETAILED,},
|
||||||
|
+ {
|
||||||
|
+ "LDB-WVGA-UDOO", 57, 800, 480, 30060, // Rif. 800x480 Panel DATAVISION dtfs070d0shlx
|
||||||
|
+ 56, 50,
|
||||||
|
+ 23, 20,
|
||||||
|
+ 150, 2,
|
||||||
|
+ 0,
|
||||||
|
+ FB_VMODE_NONINTERLACED,
|
||||||
|
+ FB_MODE_IS_DETAILED,},
|
||||||
|
+ {
|
||||||
|
+ "LDB-WXGA-UDOO", 60, 1368, 768, 12960, // Rif. 1366x768 Panel G156XW01V0
|
||||||
|
+ 9, 3,
|
||||||
|
+ 2, 7,
|
||||||
|
+ 200, 38,
|
||||||
|
+ 0,
|
||||||
|
+ FB_VMODE_NONINTERLACED,
|
||||||
|
+ FB_MODE_IS_DETAILED,},
|
||||||
|
};
|
||||||
|
static int ldb_modedb_sz = ARRAY_SIZE(ldb_modedb);
|
||||||
|
|
1456
projects/imx6/patches/linux/linux-335-udoo-vt1613-audio-driver.patch
Normal file
1456
projects/imx6/patches/linux/linux-335-udoo-vt1613-audio-driver.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1027,7 +1027,7 @@ index 0000000..239f0d8
|
|||||||
+} }, {
|
+} }, {
|
||||||
+ .bus = -1,
|
+ .bus = -1,
|
||||||
+ .addr = -1,
|
+ .addr = -1,
|
||||||
+ .pixfmt = IPU_PIX_FMT_RGB666,
|
+ .pixfmt = IPU_PIX_FMT_RGB24,
|
||||||
+ .detect = detect_lvds,
|
+ .detect = detect_lvds,
|
||||||
+ .enable = do_enable_lvds,
|
+ .enable = do_enable_lvds,
|
||||||
+ .mode = {
|
+ .mode = {
|
||||||
@ -1038,12 +1038,12 @@ index 0000000..239f0d8
|
|||||||
+ .xres = 1368,
|
+ .xres = 1368,
|
||||||
+ .yres = 768,
|
+ .yres = 768,
|
||||||
+ .pixclock = 13890,
|
+ .pixclock = 13890,
|
||||||
+ .left_margin = 93,
|
+ .left_margin = 220,
|
||||||
+ .right_margin = 33,
|
+ .right_margin = 40,
|
||||||
+ .upper_margin = 22,
|
+ .upper_margin = 21,
|
||||||
+ .lower_margin = 7,
|
+ .lower_margin = 7,
|
||||||
+ .hsync_len = 40,
|
+ .hsync_len = 60,
|
||||||
+ .vsync_len = 4,
|
+ .vsync_len = 10,
|
||||||
+ .sync = 0,
|
+ .sync = 0,
|
||||||
+ .vmode = FB_VMODE_NONINTERLACED
|
+ .vmode = FB_VMODE_NONINTERLACED
|
||||||
+} },
|
+} },
|
||||||
|
26
projects/imx6/patches/u-boot/103-udoo_disable_lvds.patch
Normal file
26
projects/imx6/patches/u-boot/103-udoo_disable_lvds.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -aurN u-boot-imx6-144b1e9/arch/arm/cpu/armv7/cpu.c a-u/arch/arm/cpu/armv7/cpu.c
|
||||||
|
--- u-boot-imx6-144b1e9/arch/arm/cpu/armv7/cpu.c 2015-05-31 21:32:52.821314218 +0200
|
||||||
|
+++ a-u/arch/arm/cpu/armv7/cpu.c 2015-05-31 21:27:12.292623257 +0200
|
||||||
|
@@ -77,7 +77,7 @@
|
||||||
|
cpu_cache_initialization();
|
||||||
|
|
||||||
|
#if (defined(MACH_TYPE_UDOO) || defined(CONFIG_VIDEO_ENABLED))
|
||||||
|
- do_disable_lvds();
|
||||||
|
+ /*do_disable_lvds();*/
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
diff -aurN u-boot-imx6-144b1e9/board/udoo/udoo.c a-u/board/udoo/udoo.c
|
||||||
|
--- u-boot-imx6-144b1e9/board/udoo/udoo.c 2015-05-31 21:32:52.821314218 +0200
|
||||||
|
+++ a-u/board/udoo/udoo.c 2015-05-31 21:36:41.524566717 +0200
|
||||||
|
@@ -260,8 +260,8 @@
|
||||||
|
static void do_enable_lvds(struct display_info_t const *dev)
|
||||||
|
{
|
||||||
|
imx_iomux_v3_setup_multiple_pads(lvds_pads, ARRAY_SIZE(lvds_pads));
|
||||||
|
- gpio_direction_output(IMX_GPIO_NR(1, 2), 1); /* LVDS power On */
|
||||||
|
- gpio_direction_output(IMX_GPIO_NR(1, 4), 1); /* LVDS backlight On */
|
||||||
|
+ /*gpio_direction_output(IMX_GPIO_NR(1, 2), 1);*/ /* LVDS power On */
|
||||||
|
+ /*gpio_direction_output(IMX_GPIO_NR(1, 4), 1);*/ /* LVDS backlight On */
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user