[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-499-g065e155
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-499-g065e155
|
From: Julien B a. A. <ar...@us...> - 2013-10-28 19:47: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 065e155264768af6f303d3117062dfaa63bfe24a (commit)
via f729a9e03e2db62c1694f80747626834e751c3ca (commit)
via 6412723477fd88e51935e24534baa287666f52d8 (commit)
from 4cbf782be26ee57744a1d3ab8c862e2dcae99e16 (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 065e155264768af6f303d3117062dfaa63bfe24a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Oct 28 20:42:36 2013 +0100
[LINUX] [3.11+] APF51: Add possibility to declare UART1 pins without CTS/RTS
commit f729a9e03e2db62c1694f80747626834e751c3ca
Author: Julien Boibessot <jul...@ar...>
Date: Mon Oct 28 20:41:14 2013 +0100
[BUILDROOT] apf51mainline_defconfig: move to 3.11.6 kernel
commit 6412723477fd88e51935e24534baa287666f52d8
Author: Julien Boibessot <jul...@ar...>
Date: Mon Oct 28 20:40:16 2013 +0100
[LINUX] [3.11+] APF51: makes OTG USB port work better.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51mainline_defconfig | 2 +-
.../3.11/0400-Add-apf51-basic-dt-support.patch | 24 ++++++++++++++-----
...madeus-imx51-clock-fixes-otg-phy-clock-id.patch | 17 ++++++++++++++
...us-imx51-dts-add-pin-definition-for-uart1.patch | 21 +++++++++++++++++
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 17 ++++++++++++++
.../3.12/0400-Add-apf51-basic-dt-support.patch | 24 ++++++++++++++-----
...madeus-imx51-clock-fixes-otg-phy-clock-id.patch | 17 ++++++++++++++
...us-imx51-dts-add-pin-definition-for-uart1.patch | 21 +++++++++++++++++
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 17 ++++++++++++++
9 files changed, 145 insertions(+), 15 deletions(-)
create mode 100644 patches/linux/3.11/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
create mode 100644 patches/linux/3.11/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
create mode 100644 patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
create mode 100644 patches/linux/3.12/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
create mode 100644 patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
create mode 100644 patches/linux/3.12/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 79e197a..0091cc1 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -96,7 +96,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.11.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.6"
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/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
index 4561fca..40b2879 100644
--- a/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
@@ -3,11 +3,11 @@ Add apf51 basic support
Signed-off-by: Laurent Cans <lau...@gm...>
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+Index: linux-3.11.6/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.11-rc4.orig/arch/arm/boot/dts/imx51-apf51.dts
-+++ linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
-@@ -34,6 +34,15 @@
+--- linux-3.11.6.orig/arch/arm/boot/dts/imx51-apf51.dts 2013-10-18 20:24:16.000000000 +0200
++++ linux-3.11.6/arch/arm/boot/dts/imx51-apf51.dts 2013-10-28 20:35:10.000000000 +0100
+@@ -34,6 +34,24 @@
clock-frequency = <33554432>;
};
};
@@ -20,16 +20,25 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+ gpio = <&gpio3 1 0>;
+ enable-active-high;
+ };
++
++ usbotg_reset_regulator: usbotg_reset {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio1 8 0>;
++ enable-active-high;
++ };
};
&fec {
-@@ -57,3 +66,34 @@
+@@ -57,3 +75,35 @@
pinctrl-0 = <&pinctrl_uart3_2>;
status = "okay";
};
+
+&usbphy0 {
-+ reset-supply = <&hsusb_reset_regulator>;
++ reset-supply = <&usbotg_reset_regulator>;
+};
+
+&usbphy1 {
@@ -55,6 +64,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+};
+
+&usbotg {
-+ pinctrl-names = "default";
++ phy_type = "utmi_wide";
++ vbus-supply = <&usbotg_reset_regulator>;
+ status = "okay";
+};
diff --git a/patches/linux/3.11/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch b/patches/linux/3.11/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
new file mode 100644
index 0000000..5693150
--- /dev/null
+++ b/patches/linux/3.11/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
@@ -0,0 +1,17 @@
+Internal USB PHY clocks in arch/arm/boot/dts/imx51.dtsi are for i.MX53 !
+
+Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
+
+Index: linux-3.11.1/arch/arm/boot/dts/imx51.dtsi
+===================================================================
+--- linux-3.11.1.orig/arch/arm/boot/dts/imx51.dtsi 2013-10-23 11:06:16.201044459 +0200
++++ linux-3.11.1/arch/arm/boot/dts/imx51.dtsi 2013-10-28 12:19:52.758294405 +0100
+@@ -177,7 +177,7 @@
+
+ usbphy0: usbphy@0 {
+ compatible = "usb-nop-xceiv";
+- clocks = <&clks 124>;
++ clocks = <&clks 75>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
diff --git a/patches/linux/3.11/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.11/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
new file mode 100644
index 0000000..ace24a4
--- /dev/null
+++ b/patches/linux/3.11/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
@@ -0,0 +1,21 @@
+To use UART1 without CTS/RTS.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.11.1/arch/arm/boot/dts/imx51.dtsi
+===================================================================
+--- linux-3.11.1.orig/arch/arm/boot/dts/imx51.dtsi 2013-10-23 11:06:16.201044459 +0200
++++ linux-3.11.1/arch/arm/boot/dts/imx51.dtsi 2013-10-28 12:19:52.758294405 +0100
+@@ -535,6 +535,12 @@
+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+ >;
+ };
++ pinctrl_uart1_2: uart1grp-2 {
++ fsl,pins = <
++ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
++ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
++ >;
++ };
+ };
+
+ uart2 {
diff --git a/patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
new file mode 100644
index 0000000..a496055
--- /dev/null
+++ b/patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
@@ -0,0 +1,17 @@
+Otherwise OTG controller accesses freeze at startup on APF51.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c
+===================================================================
+--- linux-3.11.orig/arch/arm/mach-imx/clk-imx51-imx53.c 2011-04-18 09:26:04.000000000 +0200
++++ linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c 2011-04-18 09:26:34.000000000 +0200
+@@ -345,7 +345,7 @@
+ clk_set_parent(clk[esdhc_b_sel], clk[pll2_sw]);
+
+ /* move usb phy clk to 24MHz */
+- clk_set_parent(clk[usb_phy_sel], clk[osc]);
++/* clk_set_parent(clk[usb_phy_sel], clk[osc]);*/
+
+ clk_prepare_enable(clk[gpc_dvfs]);
+ clk_prepare_enable(clk[ahb_max]); /* esdhc3 */
diff --git a/patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch
index 4561fca..40b2879 100644
--- a/patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch
@@ -3,11 +3,11 @@ Add apf51 basic support
Signed-off-by: Laurent Cans <lau...@gm...>
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+Index: linux-3.11.6/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.11-rc4.orig/arch/arm/boot/dts/imx51-apf51.dts
-+++ linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
-@@ -34,6 +34,15 @@
+--- linux-3.11.6.orig/arch/arm/boot/dts/imx51-apf51.dts 2013-10-18 20:24:16.000000000 +0200
++++ linux-3.11.6/arch/arm/boot/dts/imx51-apf51.dts 2013-10-28 20:35:10.000000000 +0100
+@@ -34,6 +34,24 @@
clock-frequency = <33554432>;
};
};
@@ -20,16 +20,25 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+ gpio = <&gpio3 1 0>;
+ enable-active-high;
+ };
++
++ usbotg_reset_regulator: usbotg_reset {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio1 8 0>;
++ enable-active-high;
++ };
};
&fec {
-@@ -57,3 +66,34 @@
+@@ -57,3 +75,35 @@
pinctrl-0 = <&pinctrl_uart3_2>;
status = "okay";
};
+
+&usbphy0 {
-+ reset-supply = <&hsusb_reset_regulator>;
++ reset-supply = <&usbotg_reset_regulator>;
+};
+
+&usbphy1 {
@@ -55,6 +64,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx51-apf51.dts
+};
+
+&usbotg {
-+ pinctrl-names = "default";
++ phy_type = "utmi_wide";
++ vbus-supply = <&usbotg_reset_regulator>;
+ status = "okay";
+};
diff --git a/patches/linux/3.12/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch b/patches/linux/3.12/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
new file mode 100644
index 0000000..5693150
--- /dev/null
+++ b/patches/linux/3.12/0411-armadeus-imx51-clock-fixes-otg-phy-clock-id.patch
@@ -0,0 +1,17 @@
+Internal USB PHY clocks in arch/arm/boot/dts/imx51.dtsi are for i.MX53 !
+
+Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
+
+Index: linux-3.11.1/arch/arm/boot/dts/imx51.dtsi
+===================================================================
+--- linux-3.11.1.orig/arch/arm/boot/dts/imx51.dtsi 2013-10-23 11:06:16.201044459 +0200
++++ linux-3.11.1/arch/arm/boot/dts/imx51.dtsi 2013-10-28 12:19:52.758294405 +0100
+@@ -177,7 +177,7 @@
+
+ usbphy0: usbphy@0 {
+ compatible = "usb-nop-xceiv";
+- clocks = <&clks 124>;
++ clocks = <&clks 75>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
diff --git a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
new file mode 100644
index 0000000..ace24a4
--- /dev/null
+++ b/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
@@ -0,0 +1,21 @@
+To use UART1 without CTS/RTS.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.11.1/arch/arm/boot/dts/imx51.dtsi
+===================================================================
+--- linux-3.11.1.orig/arch/arm/boot/dts/imx51.dtsi 2013-10-23 11:06:16.201044459 +0200
++++ linux-3.11.1/arch/arm/boot/dts/imx51.dtsi 2013-10-28 12:19:52.758294405 +0100
+@@ -535,6 +535,12 @@
+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+ >;
+ };
++ pinctrl_uart1_2: uart1grp-2 {
++ fsl,pins = <
++ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
++ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
++ >;
++ };
+ };
+
+ uart2 {
diff --git a/patches/linux/3.12/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.12/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
new file mode 100644
index 0000000..a496055
--- /dev/null
+++ b/patches/linux/3.12/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
@@ -0,0 +1,17 @@
+Otherwise OTG controller accesses freeze at startup on APF51.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c
+===================================================================
+--- linux-3.11.orig/arch/arm/mach-imx/clk-imx51-imx53.c 2011-04-18 09:26:04.000000000 +0200
++++ linux-3.11/arch/arm/mach-imx/clk-imx51-imx53.c 2011-04-18 09:26:34.000000000 +0200
+@@ -345,7 +345,7 @@
+ clk_set_parent(clk[esdhc_b_sel], clk[pll2_sw]);
+
+ /* move usb phy clk to 24MHz */
+- clk_set_parent(clk[usb_phy_sel], clk[osc]);
++/* clk_set_parent(clk[usb_phy_sel], clk[osc]);*/
+
+ clk_prepare_enable(clk[gpc_dvfs]);
+ clk_prepare_enable(clk[ahb_max]); /* esdhc3 */
hooks/post-receive
--
armadeus
|
