* [PATCH v7 0/6] imx28/imx6q: add usb support
@ 2012-07-12 2:25 Richard Zhao
2012-07-12 2:25 ` [PATCH v7 1/6] ARM: imx6q: add usb controller clock lookups Richard Zhao
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
This is platform part to add imx28/imx6q driver support.
The dirver part has been mostly merged to usb-next.
Changes since last version:
- correct subject
- use of_find_compatible_node
- remove hub reset
- add mx28 evk gpio pinctrl
Richard Zhao (6):
ARM: imx6q: add usb controller clock lookups
ARM: imx6q: add usbphy clocks
ARM: imx6q: disable usb charger detector
ARM: dts: imx6q-sabrelite: add usb devices
clk: mxs: clk_register_clkdev mx28 usb clocks
ARM: dts: imx28-evk: add usb devices
arch/arm/boot/dts/imx28-evk.dts | 38 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/imx28.dtsi | 12 ++++++++--
arch/arm/boot/dts/imx6q-sabrelite.dts | 19 ++++++++++++++-
arch/arm/boot/dts/imx6q.dtsi | 36 +++++++++++++++++++++++++++--
arch/arm/mach-imx/clk-imx6q.c | 11 ++++++++-
arch/arm/mach-imx/mach-imx6q.c | 41 +++++++++++++++++++++++++++++++++
drivers/clk/mxs/clk-imx28.c | 4 ++++
7 files changed, 155 insertions(+), 6 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v7 1/6] ARM: imx6q: add usb controller clock lookups
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 2:25 ` [PATCH v7 2/6] ARM: imx6q: add usbphy clocks Richard Zhao
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
arch/arm/mach-imx/clk-imx6q.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index cabbbb7..3f5b9d6 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -398,6 +398,10 @@ int __init mx6q_clocks_init(void)
clk_register_clkdev(clk[gpmi_bch], "gpmi_bch", "112000.gpmi-nand");
clk_register_clkdev(clk[gpmi_apb], "gpmi_apb", "112000.gpmi-nand");
clk_register_clkdev(clk[gpmi_io], "gpmi_io", "112000.gpmi-nand");
+ clk_register_clkdev(clk[usboh3], NULL, "2184000.usb");
+ clk_register_clkdev(clk[usboh3], NULL, "2184200.usb");
+ clk_register_clkdev(clk[usboh3], NULL, "2184400.usb");
+ clk_register_clkdev(clk[usboh3], NULL, "2184600.usb");
clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 2/6] ARM: imx6q: add usbphy clocks
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
2012-07-12 2:25 ` [PATCH v7 1/6] ARM: imx6q: add usb controller clock lookups Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 2:25 ` [PATCH v7 3/6] ARM: imx6q: disable usb charger detector Richard Zhao
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
arch/arm/mach-imx/clk-imx6q.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 3f5b9d6..ea89520 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -152,7 +152,7 @@ enum mx6q_clks {
ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, ssi1_ipg,
- ssi2_ipg, ssi3_ipg, rom,
+ ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2,
clk_max
};
@@ -198,6 +198,9 @@ int __init mx6q_clocks_init(void)
clk[pll7_usb_host] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7_usb_host","osc", base + 0x20, 0x2000, 0x3);
clk[pll8_enet] = imx_clk_pllv3(IMX_PLLV3_ENET, "pll8_enet", "osc", base + 0xe0, 0x182000, 0x3);
+ clk[usbphy1] = imx_clk_gate("usbphy1", "pll3_usb_otg", base + 0x10, 6);
+ clk[usbphy2] = imx_clk_gate("usbphy2", "pll7_usb_host", base + 0x20, 6);
+
/* name parent_name reg idx */
clk[pll2_pfd0_352m] = imx_clk_pfd("pll2_pfd0_352m", "pll2_bus", base + 0x100, 0);
clk[pll2_pfd1_594m] = imx_clk_pfd("pll2_pfd1_594m", "pll2_bus", base + 0x100, 1);
@@ -402,6 +405,8 @@ int __init mx6q_clocks_init(void)
clk_register_clkdev(clk[usboh3], NULL, "2184200.usb");
clk_register_clkdev(clk[usboh3], NULL, "2184400.usb");
clk_register_clkdev(clk[usboh3], NULL, "2184600.usb");
+ clk_register_clkdev(clk[usbphy1], NULL, "20c9000.usbphy");
+ clk_register_clkdev(clk[usbphy2], NULL, "20ca000.usbphy");
clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 3/6] ARM: imx6q: disable usb charger detector
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
2012-07-12 2:25 ` [PATCH v7 1/6] ARM: imx6q: add usb controller clock lookups Richard Zhao
2012-07-12 2:25 ` [PATCH v7 2/6] ARM: imx6q: add usbphy clocks Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 2:25 ` [PATCH v7 4/6] ARM: dts: imx6q-sabrelite: add usb devices Richard Zhao
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
The external charger detector needs to be disabled,
or the signal at DP will be poor
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
arch/arm/mach-imx/mach-imx6q.c | 41 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 1c18d3c..5ec0608 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -25,6 +25,7 @@
#include <linux/pinctrl/machine.h>
#include <linux/phy.h>
#include <linux/micrel_phy.h>
+#include <linux/mfd/anatop.h>
#include <asm/cpuidle.h>
#include <asm/smp_twd.h>
#include <asm/hardware/cache-l2x0.h>
@@ -117,6 +118,45 @@ static void __init imx6q_sabrelite_init(void)
imx6q_sabrelite_cko1_setup();
}
+static void __init imx6q_usb_init(void)
+{
+ struct device_node *np;
+ struct platform_device *pdev = NULL;
+ struct anatop *adata = NULL;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
+ if (np)
+ pdev = of_find_device_by_node(np);
+ if (pdev)
+ adata = platform_get_drvdata(pdev);
+ if (!adata) {
+ if (np)
+ of_node_put(np);
+ return;
+ }
+
+#define HW_ANADIG_USB1_CHRG_DETECT 0x000001b0
+#define HW_ANADIG_USB2_CHRG_DETECT 0x00000210
+
+#define BM_ANADIG_USB_CHRG_DETECT_EN_B 0x00100000
+#define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B 0x00080000
+
+ /*
+ * The external charger detector needs to be disabled,
+ * or the signal at DP will be poor
+ */
+ anatop_write_reg(adata, HW_ANADIG_USB1_CHRG_DETECT,
+ BM_ANADIG_USB_CHRG_DETECT_EN_B
+ | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
+ ~0);
+ anatop_write_reg(adata, HW_ANADIG_USB2_CHRG_DETECT,
+ BM_ANADIG_USB_CHRG_DETECT_EN_B |
+ BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
+ ~0);
+
+ of_node_put(np);
+}
+
static void __init imx6q_init_machine(void)
{
/*
@@ -131,6 +171,7 @@ static void __init imx6q_init_machine(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
imx6q_pm_init();
+ imx6q_usb_init();
}
static struct cpuidle_driver imx6q_cpuidle_driver = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 4/6] ARM: dts: imx6q-sabrelite: add usb devices
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
` (2 preceding siblings ...)
2012-07-12 2:25 ` [PATCH v7 3/6] ARM: imx6q: disable usb charger detector Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 6:21 ` [PATCH v8] " Richard Zhao
2012-07-12 2:25 ` [PATCH v7 5/6] clk: mxs: clk_register_clkdev mx28 usb clocks Richard Zhao
` (2 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
- add usbphy devices
- add usb host controller and otg devices
- add usb h1 vbus regulator
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
arch/arm/boot/dts/imx6q-sabrelite.dts | 19 ++++++++++++++++-
arch/arm/boot/dts/imx6q.dtsi | 36 +++++++++++++++++++++++++++++++--
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index e0ec929..e72b6b3 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -41,10 +41,18 @@
status = "okay";
};
};
-
};
aips-bus at 02100000 { /* AIPS2 */
+ usb at 02184000 { /* USB OTG */
+ vbus-supply = <®_usb_otg_vbus>;
+ status = "okay";
+ };
+
+ usb at 02184200 { /* USB1 */
+ status = "okay";
+ };
+
ethernet at 02188000 {
phy-mode = "rgmii";
phy-reset-gpios = <&gpio3 23 0>;
@@ -111,6 +119,15 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
+
+ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 22 0>;
+ enable-active-high;
+ };
};
sound {
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 16a3884..5e4f100 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -461,12 +461,14 @@
};
};
- usbphy at 020c9000 { /* USBPHY1 */
+ usbphy1: usbphy at 020c9000 {
+ compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020c9000 0x1000>;
interrupts = <0 44 0x04>;
};
- usbphy at 020ca000 { /* USBPHY2 */
+ usbphy2: usbphy at 020ca000 {
+ compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020ca000 0x1000>;
interrupts = <0 45 0x04>;
};
@@ -614,6 +616,36 @@
reg = <0x0217c000 0x4000>;
};
+ usb at 02184000 { /* USB OTG */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184000 0x200>;
+ interrupts = <0 43 0x04>;
+ fsl,usbphy = <&usbphy1>;
+ status = "disabled";
+ };
+
+ usb at 02184200 { /* USB1 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184200 0x200>;
+ interrupts = <0 40 0x04>;
+ fsl,usbphy = <&usbphy2>;
+ status = "disabled";
+ };
+
+ usb at 02184400 { /* USB2 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184400 0x200>;
+ interrupts = <0 41 0x04>;
+ status = "disabled";
+ };
+
+ usb at 02184600 { /* USB3 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184600 0x200>;
+ interrupts = <0 42 0x04>;
+ status = "disabled";
+ };
+
ethernet at 02188000 {
compatible = "fsl,imx6q-fec";
reg = <0x02188000 0x4000>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 5/6] clk: mxs: clk_register_clkdev mx28 usb clocks
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
` (3 preceding siblings ...)
2012-07-12 2:25 ` [PATCH v7 4/6] ARM: dts: imx6q-sabrelite: add usb devices Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 2:25 ` [PATCH v7 6/6] ARM: dts: imx28-evk: add usb devices Richard Zhao
2012-07-12 7:02 ` [PATCH v7 0/6] imx28/imx6q: add usb support Shawn Guo
6 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Tested-by: Subodh Nijsure <snijsure@grid-net.com>
---
drivers/clk/mxs/clk-imx28.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index 7fad6c8..a3bb644 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -328,6 +328,10 @@ int __init mx28_clocks_init(void)
clk_register_clkdevs(clks[fec], fec_lookups, ARRAY_SIZE(fec_lookups));
clk_register_clkdevs(clks[can0], can0_lookups, ARRAY_SIZE(can0_lookups));
clk_register_clkdevs(clks[can1], can1_lookups, ARRAY_SIZE(can1_lookups));
+ clk_register_clkdev(clks[usb0_pwr], NULL, "8007c000.usbphy");
+ clk_register_clkdev(clks[usb1_pwr], NULL, "8007e000.usbphy");
+ clk_register_clkdev(clks[usb0], NULL, "80080000.usb");
+ clk_register_clkdev(clks[usb1], NULL, "80090000.usb");
for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
clk_prepare_enable(clks[clks_init_on[i]]);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 6/6] ARM: dts: imx28-evk: add usb devices
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
` (4 preceding siblings ...)
2012-07-12 2:25 ` [PATCH v7 5/6] clk: mxs: clk_register_clkdev mx28 usb clocks Richard Zhao
@ 2012-07-12 2:25 ` Richard Zhao
2012-07-12 7:02 ` [PATCH v7 0/6] imx28/imx6q: add usb support Shawn Guo
6 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 2:25 UTC (permalink / raw)
To: linux-arm-kernel
- add usb phy devices
- add usb controller devices
- add usb vbus regulators
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Tested-by: Subodh Nijsure <snijsure@grid-net.com>
---
arch/arm/boot/dts/imx28-evk.dts | 38 ++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/imx28.dtsi | 12 ++++++++++--
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 0d8739d..bee5676 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -59,6 +59,8 @@
0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
+ 0x3083 /* MX28_PAD_AUART2_RX__GPIO_3_8 */
+ 0x3093 /* MX28_PAD_AUART2_TX__GPIO_3_9 */
>;
fsl,drive-strength = <0>;
fsl,voltage = <1>;
@@ -137,10 +139,28 @@
pinctrl-0 = <&auart3_pins_a>;
status = "okay";
};
+
+ usbphy0: usbphy at 8007c000 {
+ status = "okay";
+ };
+
+ usbphy1: usbphy at 8007e000 {
+ status = "okay";
+ };
};
};
ahb at 80080000 {
+ usb0: usb at 80080000 {
+ vbus-supply = <®_usb0_vbus>;
+ status = "okay";
+ };
+
+ usb1: usb at 80090000 {
+ vbus-supply = <®_usb1_vbus>;
+ status = "okay";
+ };
+
mac0: ethernet at 800f0000 {
phy-mode = "rmii";
pinctrl-names = "default";
@@ -185,6 +205,24 @@
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 15 0>;
};
+
+ reg_usb0_vbus: usb0_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb0_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 9 0>;
+ enable-active-high;
+ };
+
+ reg_usb1_vbus: usb1_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 8 0>;
+ enable-active-high;
+ };
};
sound {
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index adb5ffc..cc25a0f 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -654,11 +654,13 @@
};
usbphy0: usbphy at 8007c000 {
+ compatible = "fsl,imx28-usbphy", "fsl,imx23-usbphy";
reg = <0x8007c000 0x2000>;
status = "disabled";
};
usbphy1: usbphy at 8007e000 {
+ compatible = "fsl,imx28-usbphy", "fsl,imx23-usbphy";
reg = <0x8007e000 0x2000>;
status = "disabled";
};
@@ -672,13 +674,19 @@
reg = <0x80080000 0x80000>;
ranges;
- usbctrl0: usbctrl at 80080000 {
+ usb0: usb at 80080000 {
+ compatible = "fsl,imx28-usb", "fsl,imx27-usb";
reg = <0x80080000 0x10000>;
+ interrupts = <93>;
+ fsl,usbphy = <&usbphy0>;
status = "disabled";
};
- usbctrl1: usbctrl at 80090000 {
+ usb1: usb at 80090000 {
+ compatible = "fsl,imx28-usb", "fsl,imx27-usb";
reg = <0x80090000 0x10000>;
+ interrupts = <92>;
+ fsl,usbphy = <&usbphy1>;
status = "disabled";
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v8] ARM: dts: imx6q-sabrelite: add usb devices
2012-07-12 2:25 ` [PATCH v7 4/6] ARM: dts: imx6q-sabrelite: add usb devices Richard Zhao
@ 2012-07-12 6:21 ` Richard Zhao
0 siblings, 0 replies; 9+ messages in thread
From: Richard Zhao @ 2012-07-12 6:21 UTC (permalink / raw)
To: linux-arm-kernel
- add usbphy devices
- add usb host controller and otg devices
- add usb h1 vbus regulator
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
changes since last version:
- add gpio pinctrl
arch/arm/boot/dts/imx6q-sabrelite.dts | 30 +++++++++++++++++++++++++++
arch/arm/boot/dts/imx6q.dtsi | 36 +++++++++++++++++++++++++++++++--
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index e0ec929..46fdfd1 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -42,9 +42,30 @@
};
};
+ iomuxc at 020e0000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_hog>;
+
+ gpios {
+ pinctrl_gpio_hog: gpiohog {
+ fsl,pins = <
+ 144 0x80000000 /* MX6Q_PAD_EIM_D22__GPIO_3_22 */
+ >;
+ };
+ };
+ };
};
aips-bus at 02100000 { /* AIPS2 */
+ usb at 02184000 { /* USB OTG */
+ vbus-supply = <®_usb_otg_vbus>;
+ status = "okay";
+ };
+
+ usb at 02184200 { /* USB1 */
+ status = "okay";
+ };
+
ethernet at 02188000 {
phy-mode = "rgmii";
phy-reset-gpios = <&gpio3 23 0>;
@@ -111,6 +132,15 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
+
+ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 22 0>;
+ enable-active-high;
+ };
};
sound {
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 16a3884..5e4f100 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -461,12 +461,14 @@
};
};
- usbphy at 020c9000 { /* USBPHY1 */
+ usbphy1: usbphy at 020c9000 {
+ compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020c9000 0x1000>;
interrupts = <0 44 0x04>;
};
- usbphy at 020ca000 { /* USBPHY2 */
+ usbphy2: usbphy at 020ca000 {
+ compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020ca000 0x1000>;
interrupts = <0 45 0x04>;
};
@@ -614,6 +616,36 @@
reg = <0x0217c000 0x4000>;
};
+ usb at 02184000 { /* USB OTG */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184000 0x200>;
+ interrupts = <0 43 0x04>;
+ fsl,usbphy = <&usbphy1>;
+ status = "disabled";
+ };
+
+ usb at 02184200 { /* USB1 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184200 0x200>;
+ interrupts = <0 40 0x04>;
+ fsl,usbphy = <&usbphy2>;
+ status = "disabled";
+ };
+
+ usb at 02184400 { /* USB2 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184400 0x200>;
+ interrupts = <0 41 0x04>;
+ status = "disabled";
+ };
+
+ usb at 02184600 { /* USB3 */
+ compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+ reg = <0x02184600 0x200>;
+ interrupts = <0 42 0x04>;
+ status = "disabled";
+ };
+
ethernet at 02188000 {
compatible = "fsl,imx6q-fec";
reg = <0x02188000 0x4000>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v7 0/6] imx28/imx6q: add usb support
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
` (5 preceding siblings ...)
2012-07-12 2:25 ` [PATCH v7 6/6] ARM: dts: imx28-evk: add usb devices Richard Zhao
@ 2012-07-12 7:02 ` Shawn Guo
6 siblings, 0 replies; 9+ messages in thread
From: Shawn Guo @ 2012-07-12 7:02 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 12, 2012 at 10:25:21AM +0800, Richard Zhao wrote:
> This is platform part to add imx28/imx6q driver support.
> The dirver part has been mostly merged to usb-next.
>
> Changes since last version:
> - correct subject
> - use of_find_compatible_node
> - remove hub reset
> - add mx28 evk gpio pinctrl
>
> Richard Zhao (6):
> ARM: imx6q: add usb controller clock lookups
> ARM: imx6q: add usbphy clocks
> ARM: imx6q: disable usb charger detector
> ARM: dts: imx6q-sabrelite: add usb devices
> clk: mxs: clk_register_clkdev mx28 usb clocks
> ARM: dts: imx28-evk: add usb devices
>
Applied all, thanks.
Regards,
Shawn
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-07-12 7:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12 2:25 [PATCH v7 0/6] imx28/imx6q: add usb support Richard Zhao
2012-07-12 2:25 ` [PATCH v7 1/6] ARM: imx6q: add usb controller clock lookups Richard Zhao
2012-07-12 2:25 ` [PATCH v7 2/6] ARM: imx6q: add usbphy clocks Richard Zhao
2012-07-12 2:25 ` [PATCH v7 3/6] ARM: imx6q: disable usb charger detector Richard Zhao
2012-07-12 2:25 ` [PATCH v7 4/6] ARM: dts: imx6q-sabrelite: add usb devices Richard Zhao
2012-07-12 6:21 ` [PATCH v8] " Richard Zhao
2012-07-12 2:25 ` [PATCH v7 5/6] clk: mxs: clk_register_clkdev mx28 usb clocks Richard Zhao
2012-07-12 2:25 ` [PATCH v7 6/6] ARM: dts: imx28-evk: add usb devices Richard Zhao
2012-07-12 7:02 ` [PATCH v7 0/6] imx28/imx6q: add usb support Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).