[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-173-g88afcd6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-173-g88afcd6
|
From: Julien B a. A. <ar...@us...> - 2014-02-28 16:11:06
|
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 88afcd6af32cde4848d603c2e08a2f84a995507f (commit)
via 442e5be46b6092ffbc3a700803a47f105ee52481 (commit)
from 3ecb729f757d745df13a4a2cc19fa2aa2edfb961 (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 88afcd6af32cde4848d603c2e08a2f84a995507f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 28 17:10:29 2014 +0100
[LINUX] 3.14: merges all 3.14-rc4 stuff back in 3.14 (part 3, re-creation of the symlink)
commit 442e5be46b6092ffbc3a700803a47f105ee52481
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 28 17:07:35 2014 +0100
[LINUX] 3.14: merges all 3.14-rc4 stuff back in 3.14 (part 4, the deletion 2, the revenge :-))
-----------------------------------------------------------------------
Summary of changes:
patches/linux/3.14-rc4 | 1 +
.../3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch | 85 -----
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 331 --------------------
...dc-MXS-LRADC-fix-touchscreen-statemachine.patch | 0
4 files changed, 1 insertions(+), 416 deletions(-)
create mode 120000 patches/linux/3.14-rc4
delete mode 100644 patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
delete mode 100644 patches/linux/3.14-rc4/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
rename patches/linux/{3.14-rc4 => 3.14}/0504-staging-iio-adc-MXS-LRADC-fix-touchscreen-statemachine.patch (100%)
diff --git a/patches/linux/3.14-rc4 b/patches/linux/3.14-rc4
new file mode 120000
index 0000000..3767b4b
--- /dev/null
+++ b/patches/linux/3.14-rc4
@@ -0,0 +1 @@
+3.14
\ No newline at end of file
diff --git a/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
deleted file mode 100644
index 5ce039d..0000000
--- a/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8262b3cd32259533556e6dd8d1cd0a4c77c6acfe Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 15 Jul 2013 15:26:14 +0200
-Subject: [PATCH] Fix spidev
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
-Index: linux-3.14-rc4/arch/arm/boot/dts/imx28-apf28dev.dts
-===================================================================
---- linux-3.14-rc4.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.14-rc4/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -32,6 +32,13 @@
- pinctrl-names = "default";
- pinctrl-0 = <&spi2_pins_a>;
- status = "okay";
-+/* Uncomment to have spidev on SPI2 (ChipSelect 0):
-+ device@0 {
-+ compatible = "spidev";
-+ reg = <0>;
-+ spi-max-frequency = <3125000>;
-+ };
-+*/
- };
-
- pinctrl@80018000 {
-@@ -48,6 +55,8 @@
- MX28_PAD_LCD_D20__GPIO_1_20
- MX28_PAD_LCD_D21__GPIO_1_21
- MX28_PAD_LCD_D22__GPIO_1_22
-+ MX28_PAD_LCD_D23__GPIO_1_23
-+ MX28_PAD_GPMI_CE1N__GPIO_0_17
- >;
- fsl,drive-strength = <MXS_DRIVE_4mA>;
- fsl,voltage = <MXS_VOLTAGE_HIGH>;
-@@ -66,6 +75,15 @@
- fsl,voltage = <MXS_VOLTAGE_HIGH>;
- fsl,pull-up = <MXS_PULL_DISABLE>;
- };
-+
-+ apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
-+ reg = <0>;
-+ fsl,pinmux-ids = <
-+ MX28_PAD_PWM2__USB0_ID
-+ >;
-+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
-+ fsl,pull-up = <MXS_PULL_ENABLE>;
-+ };
- };
-
- lcdif@80030000 {
-@@ -131,7 +149,10 @@
-
- ahb@80080000 {
- usb0: usb@80080000 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&apf28dev_usb0_id_pins>;
- vbus-supply = <®_usb0_vbus>;
-+ dr_mode = "otg";
- status = "okay";
- };
-
-@@ -157,6 +178,7 @@
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio1 23 1>;
-+ enable-active-high;
- };
- };
-
-@@ -177,4 +199,15 @@
- brightness-levels = <0 4 8 16 32 64 128 255>;
- default-brightness-level = <6>;
- };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio0 17 0>;
-+ linux,code = <0x100>;
-+ gpio-key,wakeup;
-+ };
-+ };
- };
diff --git a/patches/linux/3.14-rc4/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14-rc4/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
deleted file mode 100644
index 0c87e22..0000000
--- a/patches/linux/3.14-rc4/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
-===================================================================
---- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,28 @@
-+/*
-+ * Copyright 2014 Armadeus Systems
-+ *
-+ * Author: Armadeus Systems <su...@ar...>
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
-+
-+/ {
-+ model = "Armadeus APF6 i.MX6 Quad / Dual Module on APF6Dev Board";
-+ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+};
-+
-+&sata {
-+ status = "okay";
-+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-===================================================================
---- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,87 @@
-+/*
-+ * Copyright 2014 Armadeus Systems
-+ *
-+ * Author: Armadeus Systems <su...@ar...>
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <dt-bindings/interrupt-controller/irq.h>
-+
-+/ {
-+ wlan {
-+ compatible = "ti,wilink6";
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio line 42, high level triggered */
-+ clocks = <&refclock>, <&tcxoclock>;
-+ clock-names = "refclock", "tcxoclock";
-+
-+ refclock: refclock {
-+ compatible = "ti,wilink-clock";
-+ #clock-cells = <0>;
-+ clock-frequency = <38400000>;
-+ };
-+
-+ tcxoclock: tcxoclock {
-+ compatible = "ti,wilink-clock";
-+ #clock-cells = <0>;
-+ clock-frequency = <38400000>;
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
-+ >;
-+ };
-+
-+ pinctrl_uart2_3: uart2grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
-+};
-+
-+/* Bluetooth */
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_3>;
-+ status = "okay";
-+};
-+
-+/* Wi-Fi */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1_2>;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3_1>;
-+ //non-removable;
-+ status = "okay";
-+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-===================================================================
---- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,172 @@
-+/*
-+ * Copyright 2014 Armadeus Systems
-+ *
-+ * Author: Armadeus Systems <su...@ar...>
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+/ {
-+ regulators {
-+ compatible = "simple-bus";
-+
-+ reg_2p5v: 2p5v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: 3p3v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ user-led {
-+ label = "User LED";
-+ gpios = <&gpio7 12 0>;
-+ linux,default-trigger = "heartbeat";
-+ default-state = "on";
-+ };
-+ };
-+
-+ keys {
-+ compatible = "gpio-keys";
-+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio1 9 0>;
-+ linux,code = <100>;
-+ };
-+ };
-+};
-+
-+&can2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan2_1>;
-+ status = "okay";
-+};
-+
-+&ecspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1_2>;
-+ fsl,spi-num-chipselects = <3>;
-+ cs-gpios = <&gpio4 9 0>, <&gpio4 10 0>, <&gpio4 11 0>;
-+ status = "okay";
-+};
-+
-+&hdmi {
-+ ddc = <&i2c1>;
-+ status = "okay";
-+};
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_1>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2_2>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
-+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
-+ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
-+ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
-+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart3_3: uart3grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
-+};
-+
-+&pcie {
-+ reset-gpio = <&gpio6 2 0>;
-+ status = "okay";
-+};
-+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3_1>;
-+ status = "okay";
-+};
-+
-+/* GPS */
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1_1>;
-+ status = "okay";
-+};
-+
-+/* GSM */
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3_3>;
-+ status = "okay";
-+};
-+
-+/* console */
-+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4_2>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg_1>;
-+ disable-over-current;
-+ dr_mode = "otg";
-+ status = "okay";
-+};
-+
-+/* microSD */
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2_2>;
-+ cd-gpios = <&gpio1 2 0>;
-+ status = "okay";
-+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
-===================================================================
---- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
-@@ -0,0 +1,24 @@
-+/*
-+ * Copyright 2014 Armadeus Systems
-+ *
-+ * Author: Armadeus Systems <su...@ar...>
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+/dts-v1/;
-+#include "imx6dl.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
-+
-+/ {
-+ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
-+ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
-+
-+ memory {
-+ reg = <0x10000000 0x40000000>;
-+ };
-+};
diff --git a/patches/linux/3.14-rc4/0504-staging-iio-adc-MXS-LRADC-fix-touchscreen-statemachine.patch b/patches/linux/3.14/0504-staging-iio-adc-MXS-LRADC-fix-touchscreen-statemachine.patch
similarity index 100%
rename from patches/linux/3.14-rc4/0504-staging-iio-adc-MXS-LRADC-fix-touchscreen-statemachine.patch
rename to patches/linux/3.14/0504-staging-iio-adc-MXS-LRADC-fix-touchscreen-statemachine.patch
hooks/post-receive
--
armadeus
|
