[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-90-gf94a3a4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-90-gf94a3a4
|
From: Julien B a. A. <ar...@us...> - 2016-06-02 16:15: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 f94a3a4bec40b0e623744e26ca2717aa6d5f8b16 (commit)
from ff5c0ef882bad0015d34e1bce2abc52afab63108 (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 f94a3a4bec40b0e623744e26ca2717aa6d5f8b16
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Jun 2 18:11:00 2016 +0200
[LINUX] 3.19+: APF27: activate spidev by default on SPI3 (J8 connector)
-----------------------------------------------------------------------
Summary of changes:
...-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch | 50 +++++++++++++++
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 16 +++---
...-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch | 50 +++++++++++++++
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 64 ++++++++++----------
4 files changed, 140 insertions(+), 40 deletions(-)
create mode 100644 patches/linux/3.19/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
create mode 100644 patches/linux/4.4/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
diff --git a/patches/linux/3.19/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch b/patches/linux/3.19/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
new file mode 100644
index 0000000..898dbf6
--- /dev/null
+++ b/patches/linux/3.19/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
@@ -0,0 +1,50 @@
+Activate spidev on SPI3 by default (J8 connector of APF27Dev).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -102,6 +102,22 @@
+ };
+ };
+
++&cspi3 {
++ fsl,spi-num-chipselects = <1>;
++ cs-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cspi3 &pinctrl_cspi3_cs>;
++ status = "okay";
++ spidev@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <8000000>;
++ /* SPI mode = 2 */
++ spi-cpol = <1>;
++ spi-cpha = <0>;
++ };
++};
++
+ &fb {
+ display = <&display>;
+ fsl,lpccr = <0x00a90580>;
+@@ -159,6 +175,18 @@
+ >;
+ };
+
++ pinctrl_cspi3: cspi3grp {
++ fsl,pins = <
++ MX27_PAD_SD1_D0__CSPI3_MISO 0x0
++ MX27_PAD_SD1_CMD__CSPI3_MOSI 0x0
++ MX27_PAD_SD1_CLK__CSPI3_SCLK 0x0
++ >;
++ };
++
++ pinctrl_cspi3_cs: cspi3csgrp {
++ fsl,pins = <MX27_PAD_SD1_D3__GPIO5_21 0x0>;
++ };
++
+ pinctrl_gpio_leds: gpioledsgrp {
+ fsl,pins = <MX27_PAD_PC_VS1__GPIO6_14 0x0>;
+ };
diff --git a/patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index 6c23dcd..5f45d64 100644
--- a/patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,10 +2,10 @@ Add APF27 APF27dev USB to device tree
Signed-off-by: Eric Jarrige <eri...@ar...>
---
-Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27.dts
-+++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
@@ -33,6 +33,26 @@
clock-frequency = <0>;
};
@@ -78,10 +78,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_fec1>;
-Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -60,6 +60,25 @@
linux,default-trigger = "heartbeat";
};
@@ -108,7 +108,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
};
&cspi1 {
-@@ -223,6 +242,22 @@
+@@ -268,6 +287,22 @@
pinctrl_sdhc2_cd: sdhc2cdgrp {
fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
};
@@ -131,7 +131,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
};
};
-@@ -238,3 +273,16 @@
+@@ -283,3 +318,16 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm>;
};
diff --git a/patches/linux/4.4/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch b/patches/linux/4.4/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
new file mode 100644
index 0000000..898dbf6
--- /dev/null
+++ b/patches/linux/4.4/0224-armadeus-dts-apf27dev-add-spidev-on-SPI3.patch
@@ -0,0 +1,50 @@
+Activate spidev on SPI3 by default (J8 connector of APF27Dev).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -102,6 +102,22 @@
+ };
+ };
+
++&cspi3 {
++ fsl,spi-num-chipselects = <1>;
++ cs-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_cspi3 &pinctrl_cspi3_cs>;
++ status = "okay";
++ spidev@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <8000000>;
++ /* SPI mode = 2 */
++ spi-cpol = <1>;
++ spi-cpha = <0>;
++ };
++};
++
+ &fb {
+ display = <&display>;
+ fsl,lpccr = <0x00a90580>;
+@@ -159,6 +175,18 @@
+ >;
+ };
+
++ pinctrl_cspi3: cspi3grp {
++ fsl,pins = <
++ MX27_PAD_SD1_D0__CSPI3_MISO 0x0
++ MX27_PAD_SD1_CMD__CSPI3_MOSI 0x0
++ MX27_PAD_SD1_CLK__CSPI3_SCLK 0x0
++ >;
++ };
++
++ pinctrl_cspi3_cs: cspi3csgrp {
++ fsl,pins = <MX27_PAD_SD1_D3__GPIO5_21 0x0>;
++ };
++
+ pinctrl_gpio_leds: gpioledsgrp {
+ fsl,pins = <MX27_PAD_PC_VS1__GPIO6_14 0x0>;
+ };
diff --git a/patches/linux/4.4/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/4.4/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index 108c919..5f45d64 100644
--- a/patches/linux/4.4/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/4.4/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,14 +2,14 @@ Add APF27 APF27dev USB to device tree
Signed-off-by: Eric Jarrige <eri...@ar...>
---
-Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27.dts
-+++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
@@ -33,6 +33,26 @@
- clock-frequency = <0>;
- };
- };
+ clock-frequency = <0>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -31,12 +31,12 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+ status = "okay";
+ };
};
-
+
&iomuxc {
@@ -66,6 +86,23 @@
- MX27_PAD_UART1_RXD__UART1_RXD 0x0
- >;
- };
+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ >;
+ };
+
+ pinctrl_usbotg: usbotg {
+ fsl,pins = <
@@ -54,13 +54,13 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
+ >;
+ };
- };
+ };
};
-
+
@@ -75,6 +112,20 @@
- status = "okay";
+ status = "okay";
};
-
+
+&usbmisc {
+ status = "okay";
+};
@@ -76,16 +76,16 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+ status = "okay";
+};
&fec {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_fec1>;
-Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec1>;
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -60,6 +60,25 @@
- linux,default-trigger = "heartbeat";
- };
- };
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -106,12 +106,12 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+ };
+
};
-
+
&cspi1 {
-@@ -223,6 +242,22 @@
- pinctrl_sdhc2_cd: sdhc2cdgrp {
- fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
- };
+@@ -268,6 +287,22 @@
+ pinctrl_sdhc2_cd: sdhc2cdgrp {
+ fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
+ };
+
+ pinctrl_usbh1: usbh1 {
+ fsl,pins = <
@@ -128,12 +128,12 @@ Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+ >;
+ };
+
- };
+ };
};
-
-@@ -238,3 +273,16 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm>;
+
+@@ -283,3 +318,16 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm>;
};
+
+&usbh1 {
hooks/post-receive
--
armadeus
|