armadeus-commitlog Mailing List for armadeus (Page 51)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jorasse <jo...@us...> - 2014-01-19 20:33:00
|
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 fa2d09eef9d23980620bf17941134607cb35f7c5 (commit)
from 99b8d3f70edf3e276111626f6d53ca102e06c45a (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 fa2d09eef9d23980620bf17941134607cb35f7c5
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 19 21:32:47 2014 +0100
[LINUX] 3.13: put apf27 USB aside: work still in progress
-----------------------------------------------------------------------
Summary of changes:
...tch => 0444-armadeus-imx27-add-usb.patch.tofix} | 0
...eus-add-apf27-apf27dev-dts-for-USB.patch.tofix} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename patches/linux/3.13/{0444-armadeus-imx27-add-usb.patch => 0444-armadeus-imx27-add-usb.patch.tofix} (100%)
rename patches/linux/3.13/{0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch => 0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix} (100%)
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix
similarity index 100%
rename from patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
rename to patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
similarity index 100%
rename from patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
rename to patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-19 16:58:25
|
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 99b8d3f70edf3e276111626f6d53ca102e06c45a (commit)
from e42ef7b5b3aa671e6ab14ebff2f3cd017a1dca20 (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 99b8d3f70edf3e276111626f6d53ca102e06c45a
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 19 17:58:12 2014 +0100
[LINUX] 3.13: APF27: Add missing USB drivers to the APF27 linux config
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.13.config | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
index d6ed683..e05962f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
@@ -79,6 +79,12 @@ CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_NETDEVICES=y
CONFIG_MII=y
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -170,13 +176,16 @@ CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_CHIPIDEA_DEBUG=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_PL2303=y
+CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
+CONFIG_USB_FSL_USB2=y
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-19 16:54:45
|
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 e42ef7b5b3aa671e6ab14ebff2f3cd017a1dca20 (commit)
from ddb695ab54d17434c9059bb7848af164c6077b2c (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 e42ef7b5b3aa671e6ab14ebff2f3cd017a1dca20
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 19 17:54:22 2014 +0100
[LINUX] 3.13: APF27: first draft adding USB to device tree
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.13/0444-armadeus-imx27-add-usb.patch | 254 ++++++++++++++++++++
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 87 +++++++
2 files changed, 341 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
create mode 100644 patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
new file mode 100644
index 0000000..8178231
--- /dev/null
+++ b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
@@ -0,0 +1,254 @@
+Add i.MX27 and i.MX31 to the usbmisc driver. (based on Alexexander Shiyan patches)
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
+@@ -31,6 +31,9 @@
+ spi0 = &cspi1;
+ spi1 = &cspi2;
+ spi2 = &cspi3;
++ usb0 = &usbotg;
++ usb1 = &usbh1;
++ usb2 = &usbh2;
+ };
+
+ aitc: aitc-interrupt-controller@e0000000 {
+@@ -68,6 +71,7 @@
+ };
+ };
+
++
+ soc {
+ #address-cells = <1>;
+ #size-cells = <1>;
+@@ -411,6 +415,67 @@
+ iram = <&iram>;
+ };
+
++ usbphy0: usbphy@0 {
++ compatible = "usb-nop-xceiv";
++ clocks = <&clks 75>;
++ clock-names = "main_clk";
++ };
++
++ usbphy1: usbphy@1 {
++ compatible = "usb-nop-xceiv";
++ clocks = <&clks 75>;
++ clock-names = "main_clk";
++ };
++
++ usbphy2: usbphy@2 {
++ compatible = "usb-nop-xceiv";
++ clocks = <&clks 75>;
++ clock-names = "main_clk";
++ };
++
++
++ usbotg: usb@10024000 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024000 0x200>;
++ interrupts = <56>;
++ clocks = <&clks 75>, <&clks 62>;
++ clock-names = "ipg", "ahb";
++ fsl,usbmisc = <&usbmisc 0>;
++ fsl,usbphy = <&usbphy0>;
++ dr_mode = "host";
++ phy_type = "ulpi";
++ status = "disabled";
++ };
++
++ usbh1: usb@10024200 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024200 0x200>;
++ interrupts = <54>;
++ clocks = <&clks 75>, <&clks 62>;
++ clock-names = "ipg", "ahb";
++ fsl,usbmisc = <&usbmisc 1>;
++ fsl,usbphy = <&usbphy1>;
++ status = "disabled";
++ };
++
++ usbh2: usb@10024400 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024400 0x200>;
++ interrupts = <55>;
++ clocks = <&clks 75>, <&clks 62>;
++ clock-names = "ipg", "ahb";
++ fsl,usbmisc = <&usbmisc 2>;
++ fsl,usbphy = <&usbphy2>;
++ status = "disabled";
++ };
++
++ usbmisc: usbmisc@10024600 {
++ #index-cells = <1>;
++ compatible = "fsl,imx27-usbmisc";
++ reg = <0x10024600 0x4>;
++ clocks = <&clks 62>;
++ };
++
+ sahara2: sahara@10025000 {
+ compatible = "fsl,imx27-sahara";
+ reg = <0x10025000 0x1000>;
+
+--- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-pinfunc.h
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27-pinfunc.h
+@@ -195,19 +195,19 @@
+ #define MX27_PAD_I2C2_SDA__GPIO3_5 0x45 0x036
+ #define MX27_PAD_I2C2_SCL__I2C2_SCL 0x46 0x004
+ #define MX27_PAD_I2C2_SCL__GPIO3_6 0x46 0x036
+-#define MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x47 0x004
++#define MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x47 0x000
+ #define MX27_PAD_USBOTG_DATA5__GPIO3_7 0x47 0x036
+-#define MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x48 0x004
++#define MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x48 0x000
+ #define MX27_PAD_USBOTG_DATA6__GPIO3_8 0x48 0x036
+-#define MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x49 0x004
++#define MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x49 0x000
+ #define MX27_PAD_USBOTG_DATA0__GPIO3_9 0x49 0x036
+-#define MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x4a 0x004
++#define MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x4a 0x000
+ #define MX27_PAD_USBOTG_DATA2__GPIO3_10 0x4a 0x036
+-#define MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x4b 0x004
++#define MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x4b 0x000
+ #define MX27_PAD_USBOTG_DATA1__GPIO3_11 0x4b 0x036
+-#define MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x4c 0x004
++#define MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x4c 0x000
+ #define MX27_PAD_USBOTG_DATA4__GPIO3_12 0x4c 0x036
+-#define MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x4d 0x004
++#define MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x4d 0x000
+ #define MX27_PAD_USBOTG_DATA3__GPIO3_13 0x4d 0x036
+ #define MX27_PAD_TOUT__TOUT 0x4e 0x004
+ #define MX27_PAD_TOUT__GPIO3_14 0x4e 0x036
+@@ -359,7 +359,7 @@
+ #define MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x80 0x000
+ #define MX27_PAD_USBOTG_NXT__KP_COL6A 0x80 0x005
+ #define MX27_PAD_USBOTG_NXT__GPIO5_0 0x80 0x036
+-#define MX27_PAD_USBOTG_STP__USBOTG_STP 0x81 0x004
++#define MX27_PAD_USBOTG_STP__USBOTG_STP 0x81 0x000
+ #define MX27_PAD_USBOTG_STP__KP_ROW6A 0x81 0x005
+ #define MX27_PAD_USBOTG_STP__GPIO5_1 0x81 0x036
+ #define MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x82 0x000
+@@ -418,7 +418,7 @@
+ #define MX27_PAD_SD1_CLK__GPIO5_23 0x97 0x036
+ #define MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x98 0x000
+ #define MX27_PAD_USBOTG_CLK__GPIO5_24 0x98 0x036
+-#define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x99 0x004
++#define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x99 0x000
+ #define MX27_PAD_USBOTG_DATA7__GPIO5_25 0x99 0x036
+ #define MX27_PAD_UNUSED9__UNUSED9 0x9a 0x004
+ #define MX27_PAD_UNUSED9__GPIO5_26 0x9a 0x036
+--- linux-3.13-rc8.ref/arch/arm/mach-imx/iomux-mx27.h
++++ linux-3.13-rc8/arch/arm/mach-imx/iomux-mx27.h
+@@ -33,13 +33,13 @@
+ #define PB25_PF_USBH1_RCV (GPIO_PORTB | GPIO_PF | 25)
+ #define PC5_PF_I2C2_SDA (GPIO_PORTC | GPIO_PF | GPIO_IN | 5)
+ #define PC6_PF_I2C2_SCL (GPIO_PORTC | GPIO_PF | GPIO_IN | 6)
+-#define PC7_PF_USBOTG_DATA5 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 7)
+-#define PC8_PF_USBOTG_DATA6 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 8)
+-#define PC9_PF_USBOTG_DATA0 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 9)
+-#define PC10_PF_USBOTG_DATA2 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 10)
+-#define PC11_PF_USBOTG_DATA1 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 11)
+-#define PC12_PF_USBOTG_DATA4 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 12)
+-#define PC13_PF_USBOTG_DATA3 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 13)
++#define PC7_PF_USBOTG_DATA5 (GPIO_PORTC | GPIO_PF | 7)
++#define PC8_PF_USBOTG_DATA6 (GPIO_PORTC | GPIO_PF | 8)
++#define PC9_PF_USBOTG_DATA0 (GPIO_PORTC | GPIO_PF | 9)
++#define PC10_PF_USBOTG_DATA2 (GPIO_PORTC | GPIO_PF | 10)
++#define PC11_PF_USBOTG_DATA1 (GPIO_PORTC | GPIO_PF | 11)
++#define PC12_PF_USBOTG_DATA4 (GPIO_PORTC | GPIO_PF | 12)
++#define PC13_PF_USBOTG_DATA3 (GPIO_PORTC | GPIO_PF | 13)
+ #define PC16_PF_SSI4_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 16)
+ #define PC17_PF_SSI4_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 17)
+ #define PC18_PF_SSI4_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 18)
+@@ -61,11 +61,11 @@
+ #define PD14_PF_ATA_DATA12 (GPIO_PORTD | GPIO_PF | 14)
+ #define PD15_PF_ATA_DATA13 (GPIO_PORTD | GPIO_PF | 15)
+ #define PD16_PF_ATA_DATA14 (GPIO_PORTD | GPIO_PF | 16)
+-#define PE0_PF_USBOTG_NXT (GPIO_PORTE | GPIO_PF | GPIO_OUT | 0)
+-#define PE1_PF_USBOTG_STP (GPIO_PORTE | GPIO_PF | GPIO_OUT | 1)
+-#define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_PF | GPIO_OUT | 2)
+-#define PE24_PF_USBOTG_CLK (GPIO_PORTE | GPIO_PF | GPIO_OUT | 24)
+-#define PE25_PF_USBOTG_DATA7 (GPIO_PORTE | GPIO_PF | GPIO_OUT | 25)
++#define PE0_PF_USBOTG_NXT (GPIO_PORTE | GPIO_PF | 0)
++#define PE1_PF_USBOTG_STP (GPIO_PORTE | GPIO_PF | 1)
++#define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_PF | 2)
++#define PE24_PF_USBOTG_CLK (GPIO_PORTE | GPIO_PF | 24)
++#define PE25_PF_USBOTG_DATA7 (GPIO_PORTE | GPIO_PF | 25)
+ #define PF1_PF_NFCLE (GPIO_PORTF | GPIO_PF | 1)
+ #define PF3_PF_NFCE (GPIO_PORTF | GPIO_PF | 3)
+ #define PF7_PF_PC_POE (GPIO_PORTF | GPIO_PF | 7)
+diff -purN linux-3.13-rc8.ref/drivers/usb/chipidea/usbmisc_imx.c linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
+--- linux-3.13-rc8.ref/drivers/usb/chipidea/usbmisc_imx.c 2014-01-17 16:34:15.000000000 +0100
++++ linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c 2014-01-19 13:54:14.000000000 +0100
+@@ -20,6 +20,9 @@
+
+ #define MX25_USB_PHY_CTRL_OFFSET 0x08
+ #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
++#define MX27_H1_PM_BIT BIT(8)
++#define MX27_H2_PM_BIT BIT(16)
++#define MX27_OTG_PM_BIT BIT(24)
+
+ #define MX51_USB_OTG_PHY_CTRL_OFFSET 0x00
+ #define MX51_USB_OTG_PHY_CTRL_0_OFFSET 0x08
+@@ -170,6 +173,36 @@ static int usbmisc_imx51_post(struct imx
+ return 0;
+ }
+
++static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
++{
++ unsigned long flags;
++ u32 val;
++
++ switch (data->index) {
++ case 0:
++ val = MX27_OTG_PM_BIT;
++ break;
++ case 1:
++ val = MX27_H1_PM_BIT;
++ break;
++ case 2:
++ val = MX27_H2_PM_BIT;
++ break;
++ default:
++ return -EINVAL;
++ };
++
++ spin_lock_irqsave(&usbmisc->lock, flags);
++ if (data->disable_oc)
++ val = readl(usbmisc->base) | val;
++ else
++ val = readl(usbmisc->base) & ~val;
++ writel(val, usbmisc->base);
++ spin_unlock_irqrestore(&usbmisc->lock, flags);
++
++ return 0;
++}
++
+ static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
+ {
+ void __iomem *reg = NULL;
+@@ -235,6 +268,10 @@ static const struct usbmisc_ops imx51_us
+ .post = usbmisc_imx51_post,
+ };
+
++static const struct usbmisc_ops imx27_usbmisc_ops = {
++ .init = usbmisc_imx27_init,
++};
++
+ static const struct usbmisc_ops imx53_usbmisc_ops = {
+ .init = usbmisc_imx53_init,
+ };
+@@ -273,7 +310,10 @@ static const struct of_device_id usbmisc
+ .data = &imx51_usbmisc_ops,
+ },
+ {
+- .compatible = "fsl,imx53-usbmisc",
++ .compatible = "fsl,imx27-usbmisc",
++ .data = &imx27_usbmisc_ops,
++ },
++ { .compatible = "fsl,imx53-usbmisc",
+ .data = &imx53_usbmisc_ops,
+ },
+ {
+--
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
new file mode 100644
index 0000000..ee3c42e
--- /dev/null
+++ b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -0,0 +1,87 @@
+Add APF27 APF27dev USB to DTS
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -130,6 +130,23 @@
+ >;
+ };
+ };
++
++ usbh2 {
++ pinctrl_usbh2: usbh2 {
++ fsl,pins = <
++ MX27_PAD_USBH1_SUSP__USBH1_SUSP 0
++ MX27_PAD_USB_PWR__USB_PWR 0
++ MX27_PAD_USB_OC_B__USB_OC_B 1
++ MX27_PAD_USBH1_RCV__USBH1_RCV 0
++ MX27_PAD_USBH1_FS__USBH1_FS 0
++ MX27_PAD_USBH1_OE_B__USBH1_OE_B 0
++ MX27_PAD_USBH1_TXDM__USBH1_TXDM 0
++ MX27_PAD_USBH1_TXDP__USBH1_TXDP 0
++ MX27_PAD_USBH1_RXDM__USBH1_RXDM 0
++ MX27_PAD_USBH1_RXDP__USBH1_RXDP 0
++ >;
++ };
++ };
+ };
+
+ &sdhci2 {
+@@ -139,3 +156,15 @@
+ pinctrl-0 = <&pinctrl_sdhc2_1>;
+ status = "okay";
+ };
++
++&usbphy2 {
++ status = "okay";
++};
++
++&usbh2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbh2>;
++ phy_type = "serial";
++ dr_mode = "host";
++ status = "okay";
++};
+
+--- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
+@@ -87,3 +87,36 @@
+ reg = <0x800000 0xf800000>;
+ };
+ };
++
++&usbphy0 {
++ status = "okay";
++};
++
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ phy_type = "ulpi";
++ dr_mode = "host";
++ status = "okay";
++};
++
++&iomuxc {
++ usbotg {
++ pinctrl_usbotg: usbotg {
++ fsl,pins = <
++ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0
++ MX27_PAD_USBOTG_STP__USBOTG_STP 0
++ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0
++ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0
++ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0
++ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0
++ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0
++ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0
++ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0
++ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0
++ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0
++ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0
++ >;
++ };
++ };
++};
+--
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-17 17:44:38
|
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 ddb695ab54d17434c9059bb7848af164c6077b2c (commit)
via 4a2a164229aa1574f7b9337f82ba436e2f2db554 (commit)
via da8a30414f0024acc3501b1bbf3e87d5d524528b (commit)
from d8962e4c2fb0f78e3e0cff4815f1d8ab339cf5cf (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 ddb695ab54d17434c9059bb7848af164c6077b2c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 17 18:44:07 2014 +0100
[LINUX] 3.13: apf27dev: fixes heartbeat LED polarity and build drivers to test VPU and CSI
commit 4a2a164229aa1574f7b9337f82ba436e2f2db554
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 17 17:59:10 2014 +0100
[LINUX] 3.12: apf27 config: add stuff to test VPU and CSI drivers
commit da8a30414f0024acc3501b1bbf3e87d5d524528b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 17 17:57:25 2014 +0100
[LINUX] 3.12: apf27dev: dts: fixes heartbeat LED polarity
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.12.config | 19 ++++++++++++-------
.../device/armadeus/apf27/apf27-linux-3.13.config | 19 ++++++++++++-------
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 17 +++++++++++++++++
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 17 +++++++++++++++++
4 files changed, 58 insertions(+), 14 deletions(-)
create mode 100644 patches/linux/3.12/0229-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
create mode 100644 patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
index c75a3ad..d6ed683 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
@@ -74,6 +74,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
CONFIG_PROC_DEVICETREE=y
+CONFIG_SRAM=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
@@ -136,7 +137,11 @@ CONFIG_USB_PWC=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=m
CONFIG_VIDEO_MX2=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_MX2_EMMAPRP=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_DVB_AU8522_V4L is not set
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
@@ -147,8 +152,6 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
CONFIG_LOGO=y
CONFIG_SOUND=m
CONFIG_SND=m
@@ -163,21 +166,21 @@ CONFIG_SND_IMX_SOC=m
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_HID=m
-CONFIG_USB_ULPI=y
CONFIG_MMC=y
CONFIG_MMC_MXC=y
CONFIG_NEW_LEDS=y
@@ -225,11 +228,13 @@ CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
index c75a3ad..d6ed683 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
@@ -74,6 +74,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
CONFIG_PROC_DEVICETREE=y
+CONFIG_SRAM=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
@@ -136,7 +137,11 @@ CONFIG_USB_PWC=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=m
CONFIG_VIDEO_MX2=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_MX2_EMMAPRP=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_DVB_AU8522_V4L is not set
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
@@ -147,8 +152,6 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
CONFIG_LOGO=y
CONFIG_SOUND=m
CONFIG_SND=m
@@ -163,21 +166,21 @@ CONFIG_SND_IMX_SOC=m
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_FTDI_SIO=y
CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_HID=m
-CONFIG_USB_ULPI=y
CONFIG_MMC=y
CONFIG_MMC_MXC=y
CONFIG_NEW_LEDS=y
@@ -225,11 +228,13 @@ CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/patches/linux/3.12/0229-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.12/0229-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
new file mode 100644
index 0000000..2fe2700
--- /dev/null
+++ b/patches/linux/3.12/0229-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
@@ -0,0 +1,17 @@
+Inverted logic on APF27Dev user LED.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.12.7/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.12.7.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-01-17 17:54:18.915096591 +0100
++++ linux-3.12.7/arch/arm/boot/dts/imx27-apf27dev.dts 2014-01-17 17:54:28.635144789 +0100
+@@ -31,7 +31,7 @@
+
+ user {
+ label = "Heartbeat";
+- gpios = <&gpio6 14 0>;
++ gpios = <&gpio6 14 1>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
diff --git a/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
new file mode 100644
index 0000000..2fe2700
--- /dev/null
+++ b/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
@@ -0,0 +1,17 @@
+Inverted logic on APF27Dev user LED.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.12.7/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.12.7.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-01-17 17:54:18.915096591 +0100
++++ linux-3.12.7/arch/arm/boot/dts/imx27-apf27dev.dts 2014-01-17 17:54:28.635144789 +0100
+@@ -31,7 +31,7 @@
+
+ user {
+ label = "Heartbeat";
+- gpios = <&gpio6 14 0>;
++ gpios = <&gpio6 14 1>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-17 15:41:01
|
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 d8962e4c2fb0f78e3e0cff4815f1d8ab339cf5cf (commit)
via ff59dbfc380f55570a365ef10d47b956e696f140 (commit)
from 82ec1b44ea72a475c72d997e673670a8ce0a7abf (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 d8962e4c2fb0f78e3e0cff4815f1d8ab339cf5cf
Author: Philippe Reynes <tr...@ya...>
Date: Fri Jan 17 14:41:29 2014 +0100
[LINUX] 3.10: move to 3.10.27
commit ff59dbfc380f55570a365ef10d47b956e696f140
Author: Philippe Reynes <tr...@ya...>
Date: Fri Jan 17 14:25:05 2014 +0100
[LINUX] 3.12: move to 3.12.8
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.26.config => apf27-linux-3.10.27.config} | 0
...nux-3.12.7.config => apf27-linux-3.12.8.config} | 0
...x-3.10.26.config => apf28-linux-3.10.27.config} | 0
...nux-3.12.7.config => apf28-linux-3.12.8.config} | 0
...x-3.10.26.config => apf51-linux-3.10.27.config} | 0
...nux-3.12.7.config => apf51-linux-3.12.8.config} | 0
patches/linux/{3.10.26 => 3.10.27} | 0
patches/linux/{3.12.7 => 3.12.8} | 0
11 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.26.config => apf27-linux-3.10.27.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.7.config => apf27-linux-3.12.8.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.26.config => apf28-linux-3.10.27.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.7.config => apf28-linux-3.12.8.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.26.config => apf51-linux-3.10.27.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.7.config => apf51-linux-3.12.8.config} (100%)
rename patches/linux/{3.10.26 => 3.10.27} (100%)
rename patches/linux/{3.12.7 => 3.12.8} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 709bec5..6e038c9 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.7"
+BR2_DEFAULT_KERNEL_VERSION="3.12.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 7c10d2b..7ba0d87 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.7"
+BR2_DEFAULT_KERNEL_VERSION="3.12.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 2920362..aacc6a5 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.7"
+BR2_DEFAULT_KERNEL_VERSION="3.12.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.26.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.26.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.27.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.7.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.8.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.26.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.26.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.27.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.7.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.26.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.26.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.27.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.7.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.8.config
diff --git a/patches/linux/3.10.26 b/patches/linux/3.10.27
similarity index 100%
rename from patches/linux/3.10.26
rename to patches/linux/3.10.27
diff --git a/patches/linux/3.12.7 b/patches/linux/3.12.8
similarity index 100%
rename from patches/linux/3.12.7
rename to patches/linux/3.12.8
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-17 10:43:15
|
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 82ec1b44ea72a475c72d997e673670a8ce0a7abf (commit)
from 67707b66217ab38a871021257cbf54e0d9216c83 (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 82ec1b44ea72a475c72d997e673670a8ce0a7abf
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 17 11:44:12 2014 +0100
[BUILDROOT] apf6q: add linux default config file
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 3 +-
.../armadeus/apf6q/apf6q-linux-3.13-rc8.config | 288 ++++++++++++++++++++
2 files changed, 290 insertions(+), 1 deletions(-)
create mode 100644 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index d1a770b..1ff9001 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -15,7 +15,8 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13-rc8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6"
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
new file mode 100644
index 0000000..c43a2e1
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
@@ -0,0 +1,288 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_MULTI_V6=y
+CONFIG_ARCH_MXC=y
+CONFIG_MACH_MX31LILLY=y
+CONFIG_MACH_MX31LITE=y
+CONFIG_MACH_PCM037=y
+CONFIG_MACH_PCM037_EET=y
+CONFIG_MACH_MX31_3DS=y
+CONFIG_MACH_MX31MOBOARD=y
+CONFIG_MACH_QONG=y
+CONFIG_MACH_ARMADILLO5X0=y
+CONFIG_MACH_KZM_ARM11_01=y
+CONFIG_MACH_IMX31_DT=y
+CONFIG_MACH_PCM043=y
+CONFIG_MACH_MX35_3DS=y
+CONFIG_MACH_VPR200=y
+CONFIG_MACH_IMX51_DT=y
+CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_VF610=y
+CONFIG_PCI=y
+CONFIG_PCI_IMX6=y
+CONFIG_SMP=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_AEABI=y
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_IPV6=y
+CONFIG_NETFILTER=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_IMX_WEIM=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
+CONFIG_PATA_IMX=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+CONFIG_CS89x0=y
+CONFIG_CS89x0_PLATFORM=y
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_SMC91X=y
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_BRCMFMAC=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_MC13783=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MMA8450=y
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_FSL_LPUART=y
+CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_MXC_RNGA=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_IMX=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MC9S08DZ60=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_IMX2_WDT=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_MC13XXX_SPI=y
+CONFIG_MFD_MC13XXX_I2C=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_MC13783=y
+CONFIG_REGULATOR_MC13892=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_MX3=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
+CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_DRM=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_PHYCORE_AC97=y
+CONFIG_SND_SOC_EUKREA_TLV320=y
+CONFIG_SND_SOC_IMX_WM8962=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_SND_SOC_IMX_MC13783=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=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_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_MC13XXX=y
+CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_SNVS=y
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
+CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_FB_HELPER=y
+CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
+CONFIG_DRM_IMX_TVE=y
+CONFIG_DRM_IMX_LDB=y
+CONFIG_DRM_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX_IPUV3=y
+CONFIG_DRM_IMX_HDMI=y
+CONFIG_COMMON_CLK_DEBUG=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_UTF8=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_ARM_UNWIND is not set
+CONFIG_SECURITYFS=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-17 10:13:21
|
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 67707b66217ab38a871021257cbf54e0d9216c83 (commit)
from bb72a46044daba0665966a31f3367358fb467d3a (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 67707b66217ab38a871021257cbf54e0d9216c83
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 17 11:14:15 2014 +0100
[LINUX] 3.13: apf6q: add author and details on patch 0481
-----------------------------------------------------------------------
Summary of changes:
...ess-hardirq-unsafe-lock-in-atomic-context.patch | 336 ++++++++++++++++++++
1 files changed, 336 insertions(+), 0 deletions(-)
diff --git a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
index 8c4dfe3..9ae9e82 100644
--- a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
+++ b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
@@ -1,3 +1,339 @@
+From patchwork Thu Dec 26 07:23:53 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [V2,
+ 1/2] mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic
+ context
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3406131
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: <lin...@li...>, <cj...@la...>,
+ <sha...@li...>, <s....@pe...>, <b2...@fr...>
+Date: Thu, 26 Dec 2013 15:23:53 +0800
+
+Sometimes we may meet the following lockdep issue.
+The root cause is .set_clock callback is executed with spin_lock_irqsave
+in sdhci_do_set_ios. However, the IMX set_clock callback will try to access
+clk_get_rate which is using a mutex lock.
+
+The fix avoids access mutex in .set_clock callback by initializing the
+pltfm_host->clock at probe time and use it later instead of calling
+clk_get_rate again in atomic context.
+
+[ INFO: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected ]
+3.13.0-rc1+ #285 Not tainted
+------------------------------------------------------
+kworker/u8:1/29 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
+ (prepare_lock){+.+...}, at: [<80480b08>] clk_prepare_lock+0x44/0xe4
+
+and this task is already holding:
+ (&(&host->lock)->rlock#2){-.-...}, at: [<804611f4>] sdhci_do_set_ios+0x20/0x720
+which would create a new lock dependency:
+ (&(&host->lock)->rlock#2){-.-...} -> (prepare_lock){+.+...}
+
+but this new dependency connects a HARDIRQ-irq-safe lock:
+ (&(&host->lock)->rlock#2){-.-...}
+... which became HARDIRQ-irq-safe at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<80060760>] __lock_acquire+0xb30/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061d2f0>] _raw_spin_lock+0x30/0x40
+ [<80460668>] sdhci_irq+0x24/0xa68
+ [<8006b1d4>] handle_irq_event_percpu+0x54/0x18c
+ [<8006b350>] handle_irq_event+0x44/0x64
+ [<8006e50c>] handle_fasteoi_irq+0xa0/0x170
+ [<8006a8f0>] generic_handle_irq+0x30/0x44
+ [<8000f238>] handle_IRQ+0x54/0xbc
+ [<8000864c>] gic_handle_irq+0x30/0x64
+ [<80013024>] __irq_svc+0x44/0x5c
+ [<80614c58>] printk+0x38/0x40
+ [<804622a8>] sdhci_add_host+0x844/0xbcc
+ [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
+ [<8032ee88>] platform_drv_probe+0x20/0x50
+ [<8032d48c>] driver_probe_device+0x118/0x234
+ [<8032d690>] __driver_attach+0x9c/0xa0
+ [<8032b89c>] bus_for_each_dev+0x68/0x9c
+ [<8032cf44>] driver_attach+0x20/0x28
+ [<8032cbc8>] bus_add_driver+0x148/0x1f4
+ [<8032dce0>] driver_register+0x80/0x100
+ [<8032ee54>] __platform_driver_register+0x50/0x64
+ [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+
+to a HARDIRQ-irq-unsafe lock:
+ (prepare_lock){+.+...}
+... which became HARDIRQ-irq-unsafe at:
+... [<8005f030>] mark_lock+0x140/0x6ac
+ [<8005f604>] mark_held_locks+0x68/0x12c
+ [<8005f780>] trace_hardirqs_on_caller+0xb8/0x1d8
+ [<8005f8b4>] trace_hardirqs_on+0x14/0x18
+ [<8061a130>] mutex_trylock+0x180/0x20c
+ [<80480ad8>] clk_prepare_lock+0x14/0xe4
+ [<804816a4>] clk_notifier_register+0x28/0xf0
+ [<80015120>] twd_clk_init+0x50/0x68
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+
+other info that might help us debug this:
+
+ Possible interrupt unsafe locking scenario:
+
+ CPU0 CPU1
+ ---- ----
+ lock(prepare_lock);
+ local_irq_disable();
+ lock(&(&host->lock)->rlock#2);
+ lock(prepare_lock);
+ <Interrupt>
+ lock(&(&host->lock)->rlock#2);
+
+ *** DEADLOCK ***
+
+3 locks held by kworker/u8:1/29:
+ #0: (kmmcd){.+.+.+}, at: [<8003db18>] process_one_work+0x128/0x468
+ #1: ((&(&host->detect)->work)){+.+.+.}, at: [<8003db18>] process_one_work+0x128/0x468
+ #2: (&(&host->lock)->rlock#2){-.-...}, at: [<804611f4>] sdhci_do_set_ios+0x20/0x720
+
+the dependencies between HARDIRQ-irq-safe lock and the holding lock:
+-> (&(&host->lock)->rlock#2){-.-...} ops: 330 {
+ IN-HARDIRQ-W at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<80060760>] __lock_acquire+0xb30/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061d2f0>] _raw_spin_lock+0x30/0x40
+ [<80460668>] sdhci_irq+0x24/0xa68
+ [<8006b1d4>] handle_irq_event_percpu+0x54/0x18c
+ [<8006b350>] handle_irq_event+0x44/0x64
+ [<8006e50c>] handle_fasteoi_irq+0xa0/0x170
+ [<8006a8f0>] generic_handle_irq+0x30/0x44
+ [<8000f238>] handle_IRQ+0x54/0xbc
+ [<8000864c>] gic_handle_irq+0x30/0x64
+ [<80013024>] __irq_svc+0x44/0x5c
+ [<80614c58>] printk+0x38/0x40
+ [<804622a8>] sdhci_add_host+0x844/0xbcc
+ [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
+ [<8032ee88>] platform_drv_probe+0x20/0x50
+ [<8032d48c>] driver_probe_device+0x118/0x234
+ [<8032d690>] __driver_attach+0x9c/0xa0
+ [<8032b89c>] bus_for_each_dev+0x68/0x9c
+ [<8032cf44>] driver_attach+0x20/0x28
+ [<8032cbc8>] bus_add_driver+0x148/0x1f4
+ [<8032dce0>] driver_register+0x80/0x100
+ [<8032ee54>] __platform_driver_register+0x50/0x64
+ [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+ IN-SOFTIRQ-W at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<80060204>] __lock_acquire+0x5d4/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061d40c>] _raw_spin_lock_irqsave+0x40/0x54
+ [<8045e4a4>] sdhci_tasklet_finish+0x1c/0x120
+ [<8002b538>] tasklet_action+0xa0/0x15c
+ [<8002b778>] __do_softirq+0x118/0x290
+ [<8002bcf4>] irq_exit+0xb4/0x10c
+ [<8000f240>] handle_IRQ+0x5c/0xbc
+ [<8000864c>] gic_handle_irq+0x30/0x64
+ [<80013024>] __irq_svc+0x44/0x5c
+ [<80614c58>] printk+0x38/0x40
+ [<804622a8>] sdhci_add_host+0x844/0xbcc
+ [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
+ [<8032ee88>] platform_drv_probe+0x20/0x50
+ [<8032d48c>] driver_probe_device+0x118/0x234
+ [<8032d690>] __driver_attach+0x9c/0xa0
+ [<8032b89c>] bus_for_each_dev+0x68/0x9c
+ [<8032cf44>] driver_attach+0x20/0x28
+ [<8032cbc8>] bus_add_driver+0x148/0x1f4
+ [<8032dce0>] driver_register+0x80/0x100
+ [<8032ee54>] __platform_driver_register+0x50/0x64
+ [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+ INITIAL USE at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<8005ff0c>] __lock_acquire+0x2dc/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061d40c>] _raw_spin_lock_irqsave+0x40/0x54
+ [<804611f4>] sdhci_do_set_ios+0x20/0x720
+ [<80461924>] sdhci_set_ios+0x30/0x3c
+ [<8044cea0>] mmc_power_up+0x6c/0xd0
+ [<8044dac4>] mmc_start_host+0x60/0x70
+ [<8044eb3c>] mmc_add_host+0x60/0x88
+ [<8046225c>] sdhci_add_host+0x7f8/0xbcc
+ [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
+ [<8032ee88>] platform_drv_probe+0x20/0x50
+ [<8032d48c>] driver_probe_device+0x118/0x234
+ [<8032d690>] __driver_attach+0x9c/0xa0
+ [<8032b89c>] bus_for_each_dev+0x68/0x9c
+ [<8032cf44>] driver_attach+0x20/0x28
+ [<8032cbc8>] bus_add_driver+0x148/0x1f4
+ [<8032dce0>] driver_register+0x80/0x100
+ [<8032ee54>] __platform_driver_register+0x50/0x64
+ [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+ }
+ ... key at: [<80e040e8>] __key.26952+0x0/0x8
+ ... acquired at:
+ [<8005eb60>] check_usage+0x3d0/0x5c0
+ [<8005edac>] check_irq_usage+0x5c/0xb8
+ [<80060d38>] __lock_acquire+0x1108/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061a210>] mutex_lock_nested+0x54/0x3c0
+ [<80480b08>] clk_prepare_lock+0x44/0xe4
+ [<8048188c>] clk_get_rate+0x14/0x64
+ [<8046374c>] esdhc_pltfm_set_clock+0x20/0x2a4
+ [<8045d70c>] sdhci_set_clock+0x4c/0x498
+ [<80461518>] sdhci_do_set_ios+0x344/0x720
+ [<80461924>] sdhci_set_ios+0x30/0x3c
+ [<8044c390>] __mmc_set_clock+0x44/0x60
+ [<8044cd4c>] mmc_set_clock+0x10/0x14
+ [<8044f8f4>] mmc_init_card+0x1b4/0x1520
+ [<80450f00>] mmc_attach_mmc+0xb4/0x194
+ [<8044da08>] mmc_rescan+0x294/0x2f0
+ [<8003db94>] process_one_work+0x1a4/0x468
+ [<8003e850>] worker_thread+0x118/0x3e0
+ [<80044de0>] kthread+0xd4/0xf0
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+
+the dependencies between the lock to be acquired and HARDIRQ-irq-unsafe lock:
+-> (prepare_lock){+.+...} ops: 395 {
+ HARDIRQ-ON-W at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<8005f604>] mark_held_locks+0x68/0x12c
+ [<8005f780>] trace_hardirqs_on_caller+0xb8/0x1d8
+ [<8005f8b4>] trace_hardirqs_on+0x14/0x18
+ [<8061a130>] mutex_trylock+0x180/0x20c
+ [<80480ad8>] clk_prepare_lock+0x14/0xe4
+ [<804816a4>] clk_notifier_register+0x28/0xf0
+ [<80015120>] twd_clk_init+0x50/0x68
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+ SOFTIRQ-ON-W at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<8005f604>] mark_held_locks+0x68/0x12c
+ [<8005f7c8>] trace_hardirqs_on_caller+0x100/0x1d8
+ [<8005f8b4>] trace_hardirqs_on+0x14/0x18
+ [<8061a130>] mutex_trylock+0x180/0x20c
+ [<80480ad8>] clk_prepare_lock+0x14/0xe4
+ [<804816a4>] clk_notifier_register+0x28/0xf0
+ [<80015120>] twd_clk_init+0x50/0x68
+ [<80008980>] do_one_initcall+0x108/0x16c
+ [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
+ [<80611c50>] kernel_init+0x10/0x120
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+ INITIAL USE at:
+ [<8005f030>] mark_lock+0x140/0x6ac
+ [<8005ff0c>] __lock_acquire+0x2dc/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061a0c8>] mutex_trylock+0x118/0x20c
+ [<80480ad8>] clk_prepare_lock+0x14/0xe4
+ [<80482af8>] __clk_init+0x1c/0x45c
+ [<8048306c>] _clk_register+0xd0/0x170
+ [<80483148>] clk_register+0x3c/0x7c
+ [<80483b4c>] clk_register_fixed_rate+0x88/0xd8
+ [<80483c04>] of_fixed_clk_setup+0x68/0x94
+ [<8084c6fc>] of_clk_init+0x44/0x68
+ [<808202b0>] time_init+0x2c/0x38
+ [<8081ca14>] start_kernel+0x1e4/0x368
+ [<10008074>] 0x10008074
+ }
+ ... key at: [<808afebc>] prepare_lock+0x38/0x48
+ ... acquired at:
+ [<8005eb94>] check_usage+0x404/0x5c0
+ [<8005edac>] check_irq_usage+0x5c/0xb8
+ [<80060d38>] __lock_acquire+0x1108/0x1cbc
+ [<800620d0>] lock_acquire+0x70/0x84
+ [<8061a210>] mutex_lock_nested+0x54/0x3c0
+ [<80480b08>] clk_prepare_lock+0x44/0xe4
+ [<8048188c>] clk_get_rate+0x14/0x64
+ [<8046374c>] esdhc_pltfm_set_clock+0x20/0x2a4
+ [<8045d70c>] sdhci_set_clock+0x4c/0x498
+ [<80461518>] sdhci_do_set_ios+0x344/0x720
+ [<80461924>] sdhci_set_ios+0x30/0x3c
+ [<8044c390>] __mmc_set_clock+0x44/0x60
+ [<8044cd4c>] mmc_set_clock+0x10/0x14
+ [<8044f8f4>] mmc_init_card+0x1b4/0x1520
+ [<80450f00>] mmc_attach_mmc+0xb4/0x194
+ [<8044da08>] mmc_rescan+0x294/0x2f0
+ [<8003db94>] process_one_work+0x1a4/0x468
+ [<8003e850>] worker_thread+0x118/0x3e0
+ [<80044de0>] kthread+0xd4/0xf0
+ [<8000e9c8>] ret_from_fork+0x14/0x2c
+
+stack backtrace:
+CPU: 2 PID: 29 Comm: kworker/u8:1 Not tainted 3.13.0-rc1+ #285
+Workqueue: kmmcd mmc_rescan
+Backtrace:
+[<80012160>] (dump_backtrace+0x0/0x10c) from [<80012438>] (show_stack+0x18/0x1c)
+ r6:00000000 r5:00000000 r4:8088ecc8 r3:bfa11200
+[<80012420>] (show_stack+0x0/0x1c) from [<80616b14>] (dump_stack+0x84/0x9c)
+[<80616a90>] (dump_stack+0x0/0x9c) from [<8005ebb4>] (check_usage+0x424/0x5c0)
+ r5:80979940 r4:bfa29b44
+[<8005e790>] (check_usage+0x0/0x5c0) from [<8005edac>] (check_irq_usage+0x5c/0xb8)
+[<8005ed50>] (check_irq_usage+0x0/0xb8) from [<80060d38>] (__lock_acquire+0x1108/0x1cbc)
+ r8:bfa115e8 r7:80df9884 r6:80dafa9c r5:00000003 r4:bfa115d0
+[<8005fc30>] (__lock_acquire+0x0/0x1cbc) from [<800620d0>] (lock_acquire+0x70/0x84)
+[<80062060>] (lock_acquire+0x0/0x84) from [<8061a210>] (mutex_lock_nested+0x54/0x3c0)
+ r7:bfa11200 r6:80dafa9c r5:00000000 r4:80480b08
+[<8061a1bc>] (mutex_lock_nested+0x0/0x3c0) from [<80480b08>] (clk_prepare_lock+0x44/0xe4)
+[<80480ac4>] (clk_prepare_lock+0x0/0xe4) from [<8048188c>] (clk_get_rate+0x14/0x64)
+ r6:03197500 r5:bf0e9aa8 r4:bf827400 r3:808ae128
+[<80481878>] (clk_get_rate+0x0/0x64) from [<8046374c>] (esdhc_pltfm_set_clock+0x20/0x2a4)
+ r5:bf0e9aa8 r4:bf0e9c40
+[<8046372c>] (esdhc_pltfm_set_clock+0x0/0x2a4) from [<8045d70c>] (sdhci_set_clock+0x4c/0x498)
+[<8045d6c0>] (sdhci_set_clock+0x0/0x498) from [<80461518>] (sdhci_do_set_ios+0x344/0x720)
+ r8:0000003b r7:20000113 r6:bf0e9d68 r5:bf0e9aa8 r4:bf0e9c40
+r3:00000000
+[<804611d4>] (sdhci_do_set_ios+0x0/0x720) from [<80461924>] (sdhci_set_ios+0x30/0x3c)
+ r9:00000004 r8:bf131000 r7:bf131048 r6:00000000 r5:bf0e9aa8
+r4:bf0e9800
+[<804618f4>] (sdhci_set_ios+0x0/0x3c) from [<8044c390>] (__mmc_set_clock+0x44/0x60)
+ r5:03197500 r4:bf0e9800
+[<8044c34c>] (__mmc_set_clock+0x0/0x60) from [<8044cd4c>] (mmc_set_clock+0x10/0x14)
+ r5:00000000 r4:bf0e9800
+[<8044cd3c>] (mmc_set_clock+0x0/0x14) from [<8044f8f4>] (mmc_init_card+0x1b4/0x1520)
+[<8044f740>] (mmc_init_card+0x0/0x1520) from [<80450f00>] (mmc_attach_mmc+0xb4/0x194)
+[<80450e4c>] (mmc_attach_mmc+0x0/0x194) from [<8044da08>] (mmc_rescan+0x294/0x2f0)
+ r5:8065f358 r4:bf0e9af8
+[<8044d774>] (mmc_rescan+0x0/0x2f0) from [<8003db94>] (process_one_work+0x1a4/0x468)
+ r8:00000000 r7:bfa29eb0 r6:bf80dc00 r5:bf0e9af8 r4:bf9e3f00
+r3:8044d774
+[<8003d9f0>] (process_one_work+0x0/0x468) from [<8003e850>] (worker_thread+0x118/0x3e0)
+[<8003e738>] (worker_thread+0x0/0x3e0) from [<80044de0>] (kthread+0xd4/0xf0)
+[<80044d0c>] (kthread+0x0/0xf0) from [<8000e9c8>] (ret_from_fork+0x14/0x2c)
+ r7:00000000 r6:00000000 r5:80044d0c r4:bf9e7f00
+
+Cc: Chris Ball <cj...@la...>
+Cc: Fabio Estevam <fab...@fr...>
+Cc: Shawn Guo <sha...@li...>
+Fixes: 0ddf03c mmc: esdhc-imx: parse max-frequency from devicetree
+Signed-off-by: Dong Aisheng <b2...@fr...>
+Acked-by: Shawn Guo <sha...@li...>
+Tested-by: Philippe De Muyter <ph...@ma...>
+
+---
+ChangeLog:
+no changes
+---
+ drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 2a04847..745ee1e 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-17 08:37:50
|
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 bb72a46044daba0665966a31f3367358fb467d3a (commit)
via 000d4f69dbd31777ec2c0a8487294082acf7d9ea (commit)
via 0a441ee78102a2ffd4f79e97e8723d56b9154e56 (commit)
via 8f5a434090790b715fcb8ad36a565df6087672ce (commit)
from 2aaf4e9b02ee434b4d44f4cad82f30acc1432699 (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 bb72a46044daba0665966a31f3367358fb467d3a
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 17 09:37:11 2014 +0100
[LINUX] 3.13: apf6q: this patch fixes a lockdep warning
commit 000d4f69dbd31777ec2c0a8487294082acf7d9ea
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 17:45:50 2014 +0100
[LINUX] 3.13: apf6q: add pcie to device tree.
commit 0a441ee78102a2ffd4f79e97e8723d56b9154e56
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 15:04:49 2014 +0100
[BUILDROOT] apf6q: move to linux 3.13-rc8
commit 8f5a434090790b715fcb8ad36a565df6087672ce
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 16 14:32:59 2014 +0100
[LINUX] 3.12: apf6q: add wifi and bluetooth to device tree
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../3.12/0450-armadeus-add-apf6q-devicetree.patch | 40 +++++++++---
.../0450-armadeus-add-apf6q-devicetree.patch | 66 ++++++++++++++------
...-imx-drm-Add-mx6-hdmi-transmitter-support.patch | 22 +++---
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 0
...-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch | 0
...inux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch | 0
...479-linux-ARM-mmc-clear-auto-cmd-settings.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...ess-hardirq-unsafe-lock-in-atomic-context.patch | 45 +++++++++++++
10 files changed, 135 insertions(+), 40 deletions(-)
copy patches/linux/{3.12 => 3.13}/0450-armadeus-add-apf6q-devicetree.patch (73%)
copy patches/linux/{3.12 => 3.13}/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch (99%)
copy patches/linux/{3.12 => 3.13}/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch (100%)
copy patches/linux/{3.12 => 3.13}/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch (100%)
copy patches/linux/{3.12 => 3.13}/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch (100%)
copy patches/linux/{3.12 => 3.13}/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch (100%)
copy patches/linux/{3.12 => 3.13}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
create mode 100644 patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 2360993..d1a770b 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13-rc8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
index 13f3b65..6de95e4 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
@@ -2,7 +2,7 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
+++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,197 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -112,12 +112,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ 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
++ >;
++ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
@@ -126,8 +128,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ 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
++ >;
++ };
+ };
+};
+
@@ -145,6 +153,13 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
@@ -163,7 +178,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi + BT combo chip */
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
similarity index 73%
copy from patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
copy to patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index 13f3b65..82c17db 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
-+++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,175 @@
++++ linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,203 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -105,19 +105,22 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
++ 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
++ >;
++ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
@@ -126,8 +129,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ 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
++ >;
++ };
+ };
+};
+
@@ -138,6 +147,11 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++&pcie {
++ reset-gpio = <&gpio6 2 0>;
++ status = "okay";
++};
++
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
@@ -145,6 +159,13 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
@@ -163,7 +184,14 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi + BT combo chip */
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
@@ -178,11 +206,11 @@ Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.12.7/arch/arm/boot/dts/Makefile
+Index: linux-3.13-rc8/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.12.7.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.12.7/arch/arm/boot/dts/Makefile
-@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+--- linux-3.13-rc8.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13-rc8/arch/arm/boot/dts/Makefile
+@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
imx6dl-wandboard.dtb \
diff --git a/patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch b/patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
similarity index 99%
copy from patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
copy to patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
index a944038..63a5a0c 100644
--- a/patches/linux/3.12/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
+++ b/patches/linux/3.13/0452-linux-0001-imx-drm-Add-mx6-hdmi-transmitter-support.patch
@@ -1,7 +1,7 @@
-From 13039cb506f5e773d0f8eb467ec5dfd794506be2 Mon Sep 17 00:00:00 2001
+From 46229d8ba38b5a02faabbdbefd7553250a52e762 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fab...@fr...>
Date: Wed, 30 Oct 2013 22:51:44 -0200
-Subject: [PATCH 1/5] imx-drm: Add mx6 hdmi transmitter support
+Subject: [PATCH 1/3] imx-drm: Add mx6 hdmi transmitter support
Add mx6 hdmi transmitter support.
@@ -27,10 +27,10 @@ Signed-off-by: Fabio Estevam <fab...@fr...>
create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig
-index 394254f..9c85077 100644
+index 5032ff7..78319ad 100644
--- a/drivers/staging/imx-drm/Kconfig
+++ b/drivers/staging/imx-drm/Kconfig
-@@ -52,3 +52,9 @@ config DRM_IMX_IPUV3
+@@ -53,3 +53,9 @@ config DRM_IMX_IPUV3
depends on DRM_IMX_IPUV3_CORE
help
Choose this if you have a i.MX5 or i.MX6 processor.
@@ -41,13 +41,13 @@ index 394254f..9c85077 100644
+ help
+ Choose this if you want to use HDMI on i.MX6.
diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
-index bfaf693..79a5588 100644
+index 8742432..4677585 100644
--- a/drivers/staging/imx-drm/Makefile
+++ b/drivers/staging/imx-drm/Makefile
-@@ -9,3 +9,4 @@ obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
- obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
- obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
- obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o
+@@ -11,3 +11,4 @@ obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
+
+ imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
+ obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
+obj-$(CONFIG_DRM_IMX_HDMI) += imx-hdmi.o
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
new file mode 100644
@@ -3010,7 +3010,7 @@ index 0000000..39b6776
+};
+#endif /* __IMX_HDMI_H__ */
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
-index 7086b22..b4e60cf 100644
+index b6d36b3..866e355 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -212,6 +212,7 @@
@@ -3022,5 +3022,5 @@ index 7086b22..b4e60cf 100644
#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI0 (0x0 << 2)
#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI1 (0x1 << 2)
--
-1.8.4.rc3
+1.8.5.1
diff --git a/patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.13/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
similarity index 100%
copy from patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
copy to patches/linux/3.13/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
diff --git a/patches/linux/3.12/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch b/patches/linux/3.13/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
similarity index 100%
copy from patches/linux/3.12/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
copy to patches/linux/3.13/0454-linux-0002-imx-drm-ipuv3-crtc-Invert-IPU-DI0-clock-polarity.patch
diff --git a/patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/linux/3.13/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
similarity index 100%
copy from patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
copy to patches/linux/3.13/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
diff --git a/patches/linux/3.12/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch b/patches/linux/3.13/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
similarity index 100%
copy from patches/linux/3.12/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
copy to patches/linux/3.13/0479-linux-ARM-mmc-clear-auto-cmd-settings.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.13/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/3.13/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
new file mode 100644
index 0000000..8c4dfe3
--- /dev/null
+++ b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
@@ -0,0 +1,45 @@
+diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
+index 2a04847..745ee1e 100644
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -576,19 +576,17 @@ static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct esdhc_platform_data *boarddata = &imx_data->boarddata;
+
+- u32 f_host = clk_get_rate(pltfm_host->clk);
+-
+- if (boarddata->f_max && (boarddata->f_max < f_host))
++ if (boarddata->f_max && (boarddata->f_max < pltfm_host->clock))
+ return boarddata->f_max;
+ else
+- return f_host;
++ return pltfm_host->clock;
+ }
+
+ static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
+ {
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+
+- return clk_get_rate(pltfm_host->clk) / 256 / 16;
++ return pltfm_host->clock / 256 / 16;
+ }
+
+ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
+@@ -596,7 +594,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
+ {
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
+- unsigned int host_clock = clk_get_rate(pltfm_host->clk);
++ unsigned int host_clock = pltfm_host->clock;
+ int pre_div = 2;
+ int div = 1;
+ u32 temp, val;
+@@ -1017,7 +1015,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
+ }
+
+ pltfm_host->clk = imx_data->clk_per;
+-
++ pltfm_host->clock = clk_get_rate(pltfm_host->clk);
+ clk_prepare_enable(imx_data->clk_per);
+ clk_prepare_enable(imx_data->clk_ipg);
+ clk_prepare_enable(imx_data->clk_ahb);
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-15 10:31:47
|
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 2aaf4e9b02ee434b4d44f4cad82f30acc1432699 (commit)
via 05de65f9a05c88f9738cf303e0885d7dba9488a9 (commit)
from 5c838a79591a3bbb1f9e59878de2d9f3fd350964 (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 2aaf4e9b02ee434b4d44f4cad82f30acc1432699
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 15 11:12:38 2014 +0100
[LINUX] 3.12: dts: add GSM, GPS, User button and User led
commit 05de65f9a05c88f9738cf303e0885d7dba9488a9
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 15 11:07:39 2014 +0100
[BUILDROOT] mmc-utils: add largefile dependency
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/215-mmc-utils-add_package.patch | 6 ++-
.../3.12/0450-armadeus-add-apf6q-devicetree.patch | 59 ++++++++++++++++++--
2 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/215-mmc-utils-add_package.patch b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
index 37d59f9..d7bec2a 100644
--- a/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
+++ b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
@@ -2,13 +2,17 @@ Index: buildroot/package/mmc-utils/Config.in
===================================================================
--- /dev/null
+++ buildroot/package/mmc-utils/Config.in
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MMC_UTILS
+ bool "mmc-utils"
++ depends on BR2_LARGEFILE
+ help
+ MMC utils
+
+ https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
++
++comment "mmc-utils needs a toolchain w/ largefile"
++ depends on !BR2_LARGEFILE
Index: buildroot/package/mmc-utils/mmc-utils.mk
===================================================================
--- /dev/null
diff --git a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
index 57ee991..13f3b65 100644
--- a/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.12/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
-+++ linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,128 @@
++++ linux-3.12.7/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,175 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -44,6 +44,27 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ 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>;
++ };
++ };
+};
+
+&sata {
@@ -86,6 +107,8 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ >;
+ };
+
@@ -95,6 +118,16 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
++
++ 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
++ >;
++ };
++
+ };
+};
+
@@ -105,6 +138,20 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ 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";
@@ -131,10 +178,10 @@ Index: linux-3.12.6/arch/arm/boot/dts/imx6q-apf6.dts
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.12.6/arch/arm/boot/dts/Makefile
+Index: linux-3.12.7/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.12.6.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.12.6/arch/arm/boot/dts/Makefile
+--- linux-3.12.7.orig/arch/arm/boot/dts/Makefile
++++ linux-3.12.7/arch/arm/boot/dts/Makefile
@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-01-15 07:20:42
|
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 5c838a79591a3bbb1f9e59878de2d9f3fd350964 (commit)
via 6dfeb748407a43d3eb1c86f04f7eb1f90f2d30ae (commit)
via 0e17f378afb50f2721eef89b76f52ebcdd2ef2ee (commit)
via 832ebe554261007a846cd723319e4bb08f3bd5a3 (commit)
from e9b329e1784bb245e8cc1f170576c4a324899732 (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 5c838a79591a3bbb1f9e59878de2d9f3fd350964
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 15 08:20:16 2014 +0100
[DEBUG]fpgaregs: compile without warnings with g++
commit 6dfeb748407a43d3eb1c86f04f7eb1f90f2d30ae
Merge: 0e17f37 e9b329e
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 15 08:12:14 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 0e17f378afb50f2721eef89b76f52ebcdd2ef2ee
Merge: 832ebe5 4559456
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 28 18:10:27 2013 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 832ebe554261007a846cd723319e4bb08f3bd5a3
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 28 18:10:10 2013 +0100
[linux][pod_gpio] set output value in pod_gpio_direction_out()
-----------------------------------------------------------------------
Summary of changes:
target/linux/debug/fpgaregs/fpgaregs.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/linux/debug/fpgaregs/fpgaregs.c b/target/linux/debug/fpgaregs/fpgaregs.c
index 2e139ce..9b72918 100644
--- a/target/linux/debug/fpgaregs/fpgaregs.c
+++ b/target/linux/debug/fpgaregs/fpgaregs.c
@@ -49,7 +49,7 @@
#define LONG_ACCESS (4)
-void displayResult(char* text, unsigned int accesstype, unsigned int value, unsigned int address)
+void displayResult(const char* text, unsigned int accesstype, unsigned int value, unsigned int address)
{
if (accesstype == WORD_ACCESS)
printf("%s 0x%04x at 0x%08x\n", text, (unsigned short)value, address);
@@ -116,17 +116,17 @@ int main(int argc, char *argv[])
if (argc == 4) {
value = strtoul(argv[3], (char **)NULL, 16);
if (accesstype == WORD_ACCESS)
- *(unsigned short*)(ptr_fpga+(address)) = (unsigned short)value;
+ *((unsigned short*)ptr_fpga + address) = (unsigned short)value;
else
- *(unsigned int*)(ptr_fpga+(address)) = (unsigned int)value;
+ *((unsigned int*)ptr_fpga + address) = (unsigned int)value;
displayResult("Write", accesstype, value, address);
/* read at given address */
} else if (argc == 3) {
if (accesstype == WORD_ACCESS)
- value = *(unsigned short*)(ptr_fpga+(address));
+ value = *((unsigned short*)ptr_fpga + address);
else
- value = *(unsigned int*)(ptr_fpga+(address));
+ value = *((unsigned int*)ptr_fpga + address);
displayResult("Read", accesstype, value, address);
}
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-13 18:36:03
|
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 e9b329e1784bb245e8cc1f170576c4a324899732 (commit)
from 3fbc500217a6609a464e81abb740bb0537839b8a (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 e9b329e1784bb245e8cc1f170576c4a324899732
Author: Philippe Reynes <tr...@ya...>
Date: Mon Jan 13 19:08:43 2014 +0100
[LINUX] 3.13: move to 3.13-rc8
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...3.13-rc7.config => apf27-linux-3.13-rc8.config} | 0
...3.13-rc7.config => apf28-linux-3.13-rc8.config} | 0
...3.13-rc7.config => apf51-linux-3.13-rc8.config} | 0
patches/linux/{3.13-rc7 => 3.13-rc8} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13-rc7.config => apf27-linux-3.13-rc8.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13-rc7.config => apf28-linux-3.13-rc8.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13-rc7.config => apf51-linux-3.13-rc8.config} (100%)
rename patches/linux/{3.13-rc7 => 3.13-rc8} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc7.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc7.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc7.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config
diff --git a/patches/linux/3.13-rc7 b/patches/linux/3.13-rc8
similarity index 100%
rename from patches/linux/3.13-rc7
rename to patches/linux/3.13-rc8
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-13 15:33:12
|
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 3fbc500217a6609a464e81abb740bb0537839b8a (commit)
from f247a49aa689b368b2e517f40a5be950843b283e (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 3fbc500217a6609a464e81abb740bb0537839b8a
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 13 16:32:59 2014 +0100
[BUILDROOT] apf51: update apf51mainline_defconfig configs to safely use ccache
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51mainline_defconfig | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index a94d4bc..2920362 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -3,6 +3,8 @@ BR2_cortex_a8=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.12.7"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-13 15:30:19
|
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 f247a49aa689b368b2e517f40a5be950843b283e (commit)
from ad748e539252dfab8ff90a63e3147747a94a427f (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 f247a49aa689b368b2e517f40a5be950843b283e
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 13 16:29:57 2014 +0100
[BUILDROOT] apf27: update apf27mainline_defconfig configs to safely use ccache
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 44d157d..709bec5 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.12.7"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-13 15:26:59
|
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 ad748e539252dfab8ff90a63e3147747a94a427f (commit)
from e6c65e9b7d8a261e27b74be520d336488e2f19d8 (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 ad748e539252dfab8ff90a63e3147747a94a427f
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 13 16:26:47 2014 +0100
[BUILDROOT] apf9328: update configs to ccache
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 7ff767b..a1fce98 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -4,6 +4,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 941b027..d6cc866 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -3,6 +3,8 @@ BR2_arm920t=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-13 15:23:13
|
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 e6c65e9b7d8a261e27b74be520d336488e2f19d8 (commit)
from ef755487f6e48889b393f16737a4ef77db2706cb (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 e6c65e9b7d8a261e27b74be520d336488e2f19d8
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 13 16:22:52 2014 +0100
[BUILDROOT] apf28: update configs to ccache
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf28mainline_defconfig | 2 ++
buildroot/configs/apf28test_defconfig | 2 ++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 5a91dfd..02da1dc 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 62824c0..7c10d2b 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -2,6 +2,8 @@ BR2_arm=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.12.7"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index b6fa0ae..a486f0b 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -2,6 +2,8 @@ BR2_arm=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-13 12:46:16
|
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 ef755487f6e48889b393f16737a4ef77db2706cb (commit)
from baba7687191cc3ef5f2908354e3e1b41bf4e10f2 (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 ef755487f6e48889b393f16737a4ef77db2706cb
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 13 13:45:30 2014 +0100
[LINUX] 3.12: add author name and details on patch 0480.
-----------------------------------------------------------------------
Summary of changes:
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 57 ++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
index 6ddfb29..6ceeb97 100644
--- a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
+++ b/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
@@ -1,3 +1,60 @@
+From patchwork Wed Sep 11 05:26:46 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [RFC] mmc: core: Update ext_csd if touched by ioctl
+From: Dirk Behme <dir...@gm...>
+X-Patchwork-Id: 2870291
+Message-Id: <137...@gm...>
+To: lin...@vg...
+Cc: Chris Ball <cj...@la...>, Dirk Behme <dir...@gm...>
+Date: Wed, 11 Sep 2013 07:26:46 +0200
+
+In case an ioctl changes an EXT_CSD register, update the internal ext_csd
+data structure, too. Else the driver's internal ext_csd data structure and
+the EXT_CSD register content doesn't match any more. In this case additional
+ioctls changing the ext_csd would revert the initial one due to the old data
+in the driver's internal ext_csd data.
+
+E.g. using the mmc utils utility to enable the bootpart
+
+mmc bootpart enable 1 0 /dev/mmcblk1
+
+correctly writes to the EXT_CSD structure of the device, but
+doesn't update
+
+card->ext_csd.part_config
+
+Issuing additional MMC_SWITCH commands afterwards use the then (wrong)
+card->ext_csd.part_config. Resulting in an undo of the initial mmc bootpart
+enable.
+
+Fix this by updating the ext_csd in case of an EXT_CSD update ioctl.
+
+Signed-off-by: Dirk Behme <dir...@gm...>
+
+---
+Notes:
+
+This fixes the issue discussed in
+
+http://marc.info/?l=linux-mmc&m=137820629730918
+
+This patch is marked as RFC due to two reasons:
+
+* exporting mmc_update_ext_csd() in core/mmc.c and calling it directly from
+ card/block.c
+* It seems it's not allowed to call mmc_part_add() in mmc_read_ext_csd()
+ several times. So this is disabled by passing an 'update' variable to
+ mmc_read_ext_csd() disabling the mmc_part_add() in case we just want to
+ update the ext_csd variables.
+
+How can this be done better/cleaner?
+
+ drivers/mmc/card/block.c | 14 ++++++++++++++
+ drivers/mmc/core/mmc.c | 26 ++++++++++++++++++++++----
+ 2 files changed, 36 insertions(+), 4 deletions(-)
+
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 1a3163f..0a4bd62 100644
--- a/drivers/mmc/card/block.c
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-13 09:48:40
|
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 baba7687191cc3ef5f2908354e3e1b41bf4e10f2 (commit)
from 4b40e916a922b6b3e8e9ff7e3440ace918174e6c (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 baba7687191cc3ef5f2908354e3e1b41bf4e10f2
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 13 10:48:16 2014 +0100
[LINUX] 3.12: apf6q: fix mmc driver to be able to enable emmc boot
partition.
-----------------------------------------------------------------------
Summary of changes:
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 97 ++++++++++++++++++++
1 files changed, 97 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
new file mode 100644
index 0000000..6ddfb29
--- /dev/null
+++ b/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
@@ -0,0 +1,97 @@
+diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
+index 1a3163f..0a4bd62 100644
+--- a/drivers/mmc/card/block.c
++++ b/drivers/mmc/card/block.c
+@@ -132,6 +132,8 @@ enum {
+ module_param(perdev_minors, int, 0444);
+ MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
+
++int mmc_update_ext_csd(struct mmc_card *card);
++
+ static inline int mmc_blk_part_switch(struct mmc_card *card,
+ struct mmc_blk_data *md);
+ static int get_card_status(struct mmc_card *card, u32 *status, int retries);
+@@ -600,6 +602,18 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
+ __func__, status, err);
+ }
+
++ if ((cmd.opcode == MMC_SWITCH) && ((cmd.arg >> 24) & 0x3)) {
++ /*
++ * In case the IOCTL has modified the EXT_CSD,
++ * update it, i.e. re-read the EXT_CSD.
++ */
++ err = mmc_update_ext_csd(card);
++ if (err)
++ dev_err(mmc_dev(card->host),
++ "%s: EXT_CSD update failed, error %d\n",
++ __func__, err);
++ }
++
+ cmd_rel_host:
+ mmc_put_card(card);
+
+diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
+index 6d02012..5db9d8c 100644
+--- a/drivers/mmc/core/mmc.c
++++ b/drivers/mmc/core/mmc.c
+@@ -269,7 +269,7 @@ static void mmc_select_card_type(struct mmc_card *card)
+ /*
+ * Decode extended CSD.
+ */
+-static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
++static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd, int update)
+ {
+ int err = 0, idx;
+ unsigned int part_size;
+@@ -348,7 +348,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+ * There are two boot regions of equal size, defined in
+ * multiples of 128K.
+ */
+- if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host)) {
++ if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host) &&
++ !update) {
+ for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
+ part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
+ mmc_part_add(card, part_size,
+@@ -519,7 +520,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+ * RPMB regions are defined in multiples of 128K.
+ */
+ card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
+- if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host)) {
++ if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host) &&
++ !update) {
+ mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
+ EXT_CSD_PART_CONFIG_ACC_RPMB,
+ "rpmb", 0, false,
+@@ -983,7 +985,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
+ err = mmc_get_ext_csd(card, &ext_csd);
+ if (err)
+ goto free_card;
+- err = mmc_read_ext_csd(card, ext_csd);
++ err = mmc_read_ext_csd(card, ext_csd, 0);
+ if (err)
+ goto free_card;
+
+@@ -1634,6 +1636,22 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
+ mmc_attach_bus(host, bus_ops);
+ }
+
++int mmc_update_ext_csd(struct mmc_card *card)
++{
++ u8 *new_ext_csd;
++ int err;
++
++ err = mmc_get_ext_csd(card, &new_ext_csd);
++ if (err || new_ext_csd == NULL)
++ goto out;
++
++ err = mmc_read_ext_csd(card, new_ext_csd, 1);
++
++out:
++ mmc_free_ext_csd(new_ext_csd);
++ return err;
++}
++
+ /*
+ * Starting point for MMC card init.
+ */
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-13 09:00:52
|
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 4b40e916a922b6b3e8e9ff7e3440ace918174e6c (commit)
via 2f8c5a73204cd49eece09a28f692935332ff7e1f (commit)
via 3f078e3530f9acb469e1ea6adcd9ee89c0333f9e (commit)
from 8cf5c213debe7c988e97283f45772f7e646968d6 (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 4b40e916a922b6b3e8e9ff7e3440ace918174e6c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 13 10:00:16 2014 +0100
[BUILDROOT] APF27: fixes ccache dirname to allow successive and parallel builds
commit 2f8c5a73204cd49eece09a28f692935332ff7e1f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 13 09:58:00 2014 +0100
[BUILDROOT] Fixes images symlink generation to unbreak automatic build
commit 3f078e3530f9acb469e1ea6adcd9ee89c0333f9e
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 13 09:40:49 2014 +0100
[BUILDROOT] APF51: fixes ccache dirname to allow successive and parallel builds
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27_webradio_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 2 ++
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 2 ++
buildroot/configs/pps51_defconfig | 1 +
buildroot/configs/pps_defconfig | 1 +
.../device/armadeus/rootfs/post_image_creation.sh | 18 ++++++++++++------
8 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index f8a121c..2de1fc3 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index d441a1b..28a56a0 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 3a54784..96a6adc 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -2,6 +2,8 @@ BR2_arm=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index bd725f1..db06d14 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -4,6 +4,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 83b9105..c845d01 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -3,6 +3,8 @@ BR2_cortex_a8=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 79e75ad..82a3cd1 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -4,6 +4,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_OPTIMIZE_2=y
BR2_KERNEL_HEADERS_VERSION=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index f7f596c..8c3c367 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 1b32ccb..f8a067a 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -4,26 +4,32 @@
# arg2: board name
# arg3: i.MX processor type
-#BR2_CPU_NAME
-
if [ ! -d "$1" ]; then
echo "Images directory ($1) not valid !"
exit 1
fi
+symlink_image()
+{
+ # $1 = dir, $2 = filename, $3 = symlink
+ if [ -f "$1/$2" ]; then
+ cd $1; ln -sf $2 $3
+ fi
+}
+
# images symbolic links according to board name, for compatibility with older armadeus versions:
if [ "$2" != "" ]; then
# New BR
# Cleanup if previous build
- rm $1/$2*
+ rm -f $1/$2*
# rootfs
for rootfstype in ubi ubifs tar jffs2; do
- cd $1; ln -sf rootfs.$rootfstype $2-rootfs.$rootfstype
+ symlink_image $1 rootfs.$rootfstype $2-rootfs.$rootfstype
done
# linux
- cd $1; ln -sf uImage $2-linux.bin
- cd $1; ln -sf $3-$2dev.dtb $2.dtb
+ symlink_image $1 uImage $2-linux.bin
+ symlink_image $1 $3-$2dev.dtb $2.dtb
else
# Old BR compat
BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-12 22:56:12
|
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, BR2012.02 has been deleted
was 45919116aa39f6807f6b0b92ad8726da5fdafdea
-----------------------------------------------------------------------
45919116aa39f6807f6b0b92ad8726da5fdafdea [BUILDROOT] 2013.05: port armadeus modifications to imx-lib
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-12 22:53:41
|
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, v3 has been deleted
was e794601b4e23e1e1c60758790af2b2bb03755c34
-----------------------------------------------------------------------
e794601b4e23e1e1c60758790af2b2bb03755c34 Start branch v3.x for maintenance.
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-12 13:13: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 8cf5c213debe7c988e97283f45772f7e646968d6 (commit)
from 8c11f1ae6a6c1ebfd33080793c1d9e7915a84e22 (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 8cf5c213debe7c988e97283f45772f7e646968d6
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 12 14:12:49 2014 +0100
[LINUX] 3.13: apf27dev: add tsc2102 device tree support. Thx Yvan
-----------------------------------------------------------------------
Summary of changes:
.../0076-Add-tsc210x-device-tree-support.patch | 0
...-tsc210x-device-tree-support-for-apf27dev.patch | 0
2 files changed, 0 insertions(+), 0 deletions(-)
copy patches/linux/{3.12 => 3.13}/0076-Add-tsc210x-device-tree-support.patch (100%)
copy patches/linux/{3.12 => 3.13}/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch (100%)
diff --git a/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.13/0076-Add-tsc210x-device-tree-support.patch
similarity index 100%
copy from patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
copy to patches/linux/3.13/0076-Add-tsc210x-device-tree-support.patch
diff --git a/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.13/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
copy to patches/linux/3.13/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-12 13:10:21
|
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 8c11f1ae6a6c1ebfd33080793c1d9e7915a84e22 (commit)
via 6745a4016f12eb642b87693dad3fe33a78d717e6 (commit)
from 9822ec4dca10f90ce2486e356f8edcd33028d87f (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 8c11f1ae6a6c1ebfd33080793c1d9e7915a84e22
Author: Eric Jarrige <eri...@ar...>
Date: Sun Jan 12 14:09:48 2014 +0100
[LINUX] 3.12: apf27dev: rename touchscreen patch
commit 6745a4016f12eb642b87693dad3fe33a78d717e6
Author: Yvan Roch <yva...@gm...>
Date: Thu Jan 9 17:58:21 2014 +0100
[LINUX] 3.12.6: APF27: Touchscreen tsc210x: support with device tree
Hello,
First,I wish you an happy new year!
These days, I have try the mainline kernel 3.12.6 for APF27 with the
device tree.
The framebuffer works well, but the touchscreen doesn't work due to
lack of device tree support in the tsc210x driver.
I attach 2 patches to fix this issue.
The first patch the APF27Dev DTS.
The second patch the tsc210x driver.
To use them, patch the armadeus git repo with git am and make
apf27mainline_defconfig.
Have fun,
Yvan.
From b346df64424efd3994ee3be3e499e087b838f119 Mon Sep 17 00:00:00 2001
From: Yvan Roch <yva...@gm...>
Date: Thu, 9 Jan 2014 17:19:38 +0100
Subject: [PATCH 1/2] Add tsc210x device tree support for apf27dev
Signed-off-by: Yvan Roch <yva...@gm...>
-----------------------------------------------------------------------
Summary of changes:
.../0076-Add-tsc210x-device-tree-support.patch | 117 ++++++++++++++++++++
...-tsc210x-device-tree-support-for-apf27dev.patch | 34 ++++++
2 files changed, 151 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
create mode 100644 patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
diff --git a/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
new file mode 100644
index 0000000..7f1f0c2
--- /dev/null
+++ b/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
@@ -0,0 +1,117 @@
+
+Add tsc210x device tree support for apf27dev
+
+Signed-off-by: Yvan Roch <yva...@gm...>
+---
+ drivers/spi/tsc2102.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 64 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/spi/tsc2102.c b/drivers/spi/tsc2102.c
+index 47e67a3..d19cba2 100644
+--- a/drivers/spi/tsc2102.c
++++ b/drivers/spi/tsc2102.c
+@@ -41,6 +41,10 @@
+ #include <asm/irq.h>
+ #include <asm/io.h>
+
++#ifdef CONFIG_OF
++#include <linux/of_device.h>
++#endif
++
+ #ifdef CONFIG_APM
+ #include <asm/apm.h>
+ #endif
+@@ -83,6 +87,16 @@
+ #define SM_TEMP1 1
+ #define SM_SUSPENDED 2
+
++#ifdef CONFIG_OF
++static struct of_device_id tsc210x_spi_of_match[] = {
++ {
++ .compatible = "tsc210x",
++ },
++ { },
++};
++MODULE_DEVICE_TABLE(of, tsc210x_spi_of_match);
++#endif
++
+ struct tsc210x_spi_req {
+ struct spi_device *dev;
+ uint16_t command;
+@@ -380,7 +394,6 @@ static irqreturn_t tsc2102_handler(int irq, void *dev_id)
+
+ schedule_work(&dev->work);
+ }
+-
+ return IRQ_HANDLED;
+ }
+
+@@ -1075,7 +1088,54 @@ static int tsc210x_probe(struct spi_device *spi)
+ struct spi_transfer *spi_buffer;
+ int err = -EINVAL;
+ u16 rev_id = 0;
++#ifdef CONFIG_OF
++ const struct of_device_id *match;
++ int status;
+
++ pdata = kzalloc(sizeof(struct tsc210x_config), GFP_KERNEL);
++ if (!pdata) {
++ dev_err(&spi->dev, "No memory for tsc210x_config\n");
++ return -ENOMEM;
++ }
++ spi->dev.platform_data = pdata;
++ match = of_match_device(of_match_ptr(tsc210x_spi_of_match), &spi->dev);
++ if (match) {
++ status = of_property_read_u32(spi->dev.of_node,
++ "tsc210x-mclk", &pdata->mclk);
++ if (status) {
++ dev_err(&spi->dev, "DT has no tsc210x-mclk\n");
++ return -ENODEV;
++ }
++ dev_dbg(&spi->dev,"mclk %d\n",pdata->mclk);
++
++ status = of_property_read_u32(spi->dev.of_node,
++ "tsc210x-use_internal", &pdata->use_internal);
++ if (status) {
++ dev_err(&spi->dev, "DT has no tsc210x-use_internal\n");
++ return -ENODEV;
++ }
++ dev_dbg(&spi->dev,"use_internal %d\n",pdata->use_internal);
++
++ status = of_property_read_u32(spi->dev.of_node,
++ "tsc210x-monitor", &pdata->monitor);
++ if (status) {
++ dev_err(&spi->dev, "DT has no tsc210x-monitor\n");
++ return -ENODEV;
++ }
++ dev_dbg(&spi->dev,"monitor %d\n",pdata->monitor);
++
++ status = of_property_read_u32(spi->dev.of_node,
++ "tsc210x-irq", &spi->irq);
++ if (status) {
++ dev_err(&spi->dev, "DT has no tsc210x-irq\n");
++ return -ENODEV;
++ }
++ dev_dbg(&spi->dev,"irq %d\n",spi->irq);
++ } else {
++ dev_err(&spi->dev,"DT has no tsc210x node\n");
++ return -ENODEV;
++ }
++#endif
+ if (!pdata) {
+ printk(KERN_ERR "TSC210x: Platform data not supplied\n");
+ return -ENOENT;
+@@ -1263,7 +1323,9 @@ static int tsc210x_remove(struct spi_device *spi)
+ apm_get_power_status = 0;
+ #endif
+ free_irq(spi->irq, &tsc);
+-
++#ifdef CONFIG_OF
++ kfree(dev->pdata);
++#endif
+ mutex_unlock(&dev->lock_sync);
+
+ return 0;
+--
+1.8.4.2
+
diff --git a/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
new file mode 100644
index 0000000..08babe4
--- /dev/null
+++ b/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
@@ -0,0 +1,34 @@
+
+Add tsc210x device tree support for apf27dev
+
+Signed-off-by: Yvan Roch <yva...@gm...>
+---
+ arch/arm/boot/dts/imx27-apf27dev.dts | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
+index 39a8cb4..cfa797f 100644
+--- a/arch/arm/boot/dts/imx27-apf27dev.dts
++++ b/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -72,6 +72,18 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_cspi2_1>;
+ status = "okay";
++ tsc210x@0 {
++ compatible = "tsc210x";
++ reg = <0>;
++ spi-max-frequency = <8000000>;
++ /* SPI mode = 0 */
++ spi-cpol = <0>;
++ spi-cpha = <0>;
++ tsc210x-mclk = <12288000>; /* MCLK value in Master mode */
++ tsc210x-use_internal = <1>; /* Use internal voltage reference */
++ tsc210x-monitor = <21>; /* TSC_BAT1 | TSC_AUX | TSC_TEMP */
++ tsc210x-irq = <257>; /* GPIO port 6 pin 17 (6-1)*32 + 17 + 64 + 16 */
++ };
+ };
+
+ &i2c1 {
+--
+1.8.4.2
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-12 11:20:20
|
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 9822ec4dca10f90ce2486e356f8edcd33028d87f (commit)
via b6a307660084128a8c232cf5faca28280c3d51f6 (commit)
from c31fd537e085ae317185509a1aaa883f5ec9af63 (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 9822ec4dca10f90ce2486e356f8edcd33028d87f
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jan 11 14:21:40 2014 +0100
[LINUX] 3.12: move to 3.12.7
Signed-off-by: Philippe Reynes <tr...@ya...>
commit b6a307660084128a8c232cf5faca28280c3d51f6
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jan 11 21:19:36 2014 +0100
[LINUX] 3.10: move to 3.10.26
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
buildroot/configs/apf6q_defconfig | 2 +-
...x-3.10.25.config => apf27-linux-3.10.26.config} | 0
...nux-3.12.6.config => apf27-linux-3.12.7.config} | 0
...x-3.10.25.config => apf28-linux-3.10.26.config} | 0
...nux-3.12.6.config => apf28-linux-3.12.7.config} | 0
...x-3.10.25.config => apf51-linux-3.10.26.config} | 0
...nux-3.12.6.config => apf51-linux-3.12.7.config} | 0
patches/linux/{3.10.25 => 3.10.26} | 0
patches/linux/{3.12.6 => 3.12.7} | 0
12 files changed, 7 insertions(+), 7 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.25.config => apf27-linux-3.10.26.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.6.config => apf27-linux-3.12.7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.25.config => apf28-linux-3.10.26.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.6.config => apf28-linux-3.12.7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.25.config => apf51-linux-3.10.26.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.6.config => apf51-linux-3.12.7.config} (100%)
rename patches/linux/{3.10.25 => 3.10.26} (100%)
rename patches/linux/{3.12.6 => 3.12.7} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index f7a2ea5..44d157d 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -5,7 +5,7 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.6"
+BR2_DEFAULT_KERNEL_VERSION="3.12.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -33,7 +33,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 0248b86..62824c0 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -4,7 +4,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.6"
+BR2_DEFAULT_KERNEL_VERSION="3.12.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -33,7 +33,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 44ab6b6..a94d4bc 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -5,7 +5,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.6"
+BR2_DEFAULT_KERNEL_VERSION="3.12.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -95,7 +95,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 951789f..2360993 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.25.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.25.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.26.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.25.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.25.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.26.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.25.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.25.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.26.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.7.config
diff --git a/patches/linux/3.10.25 b/patches/linux/3.10.26
similarity index 100%
rename from patches/linux/3.10.25
rename to patches/linux/3.10.26
diff --git a/patches/linux/3.12.6 b/patches/linux/3.12.7
similarity index 100%
rename from patches/linux/3.12.6
rename to patches/linux/3.12.7
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-10 17:40:33
|
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 c31fd537e085ae317185509a1aaa883f5ec9af63 (commit)
from 27543ad72aea18ec44e3d7418bd37380d7818eb7 (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 c31fd537e085ae317185509a1aaa883f5ec9af63
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 10 18:39:48 2014 +0100
[BUILDROOT] Fixes U-Boot build on APF51 after BR 2013.11 migration
-----------------------------------------------------------------------
Summary of changes:
...add_support_for_custom_binary_file_format.patch | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/051-U-Boot-add_support_for_custom_binary_file_format.patch
diff --git a/patches/buildroot/2013.11/051-U-Boot-add_support_for_custom_binary_file_format.patch b/patches/buildroot/2013.11/051-U-Boot-add_support_for_custom_binary_file_format.patch
new file mode 100644
index 0000000..a4d42d0
--- /dev/null
+++ b/patches/buildroot/2013.11/051-U-Boot-add_support_for_custom_binary_file_format.patch
@@ -0,0 +1,18 @@
+Fixes "u-boot: support custom u-boot.bin name" mainline commit of our
+patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/boot/uboot/uboot.mk
+===================================================================
+--- buildroot.orig/boot/uboot/uboot.mk 2014-01-10 18:33:02.685318081 +0100
++++ buildroot/boot/uboot/uboot.mk 2014-01-10 18:33:20.409405965 +0100
+@@ -51,6 +51,7 @@
+ UBOOT_DEPENDENCIES += host-elftosb
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
+ UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
++UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+ else
+ UBOOT_BIN = u-boot.bin
+ UBOOT_BIN_IFT = $(UBOOT_BIN).ift
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-10 16:03:16
|
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 27543ad72aea18ec44e3d7418bd37380d7818eb7 (commit)
from 02d2e62868977e7ed250d025267dc274dcc246ba (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 27543ad72aea18ec44e3d7418bd37380d7818eb7
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 10 17:01:11 2014 +0100
[BUILDROOT] add mmc-utils package.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/215-mmc-utils-add_package.patch | 51 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 52 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/215-mmc-utils-add_package.patch
diff --git a/patches/buildroot/2013.11/215-mmc-utils-add_package.patch b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
new file mode 100644
index 0000000..37d59f9
--- /dev/null
+++ b/patches/buildroot/2013.11/215-mmc-utils-add_package.patch
@@ -0,0 +1,51 @@
+Index: buildroot/package/mmc-utils/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/mmc-utils/Config.in
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_MMC_UTILS
++ bool "mmc-utils"
++ help
++ MMC utils
++
++ https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
+Index: buildroot/package/mmc-utils/mmc-utils.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/mmc-utils/mmc-utils.mk
+@@ -0,0 +1,23 @@
++################################################################################
++#
++# mmc-utils
++#
++################################################################################
++
++MMC_UTILS_VERSION = 11f2ceabc4ad3f0dd568e0ce68166e4803e0615b
++MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
++MMC_UTILS_LICENSE = GPLv2
++
++define MMC_UTILS_BUILD_CMDS
++ $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
++endef
++
++define MMC_UTILS_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/mmc $(TARGET_DIR)/usr/bin/mmc
++endef
++
++define MMC_UTILS_UNINSTALL_TARGET_CMDS
++ $(RM) $(TARGET_DIR)/usr/bin/mmc
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -328,6 +328,7 @@ source "package/mdadm/Config.in"
+ source "package/media-ctl/Config.in"
+ source "package/memtester/Config.in"
+ source "package/minicom/Config.in"
++source "package/mmc-utils/Config.in"
+ source "package/nanocom/Config.in"
+ source "package/neard/Config.in"
+ source "package/ofono/Config.in"
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 78e5e91..c8e16cc 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -79,3 +79,4 @@ rm -rf buildroot/package/gpsd/
rm -rf buildroot/linux/
rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
rm -rf buildroot/package/libpng/
+rm -rf buildroot/package/mmc-utils/
hooks/post-receive
--
armadeus
|
