* [PATCH 01/10] ARM: dts: dra7: Add dt node for PCIe registers in sysctrl space
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 7:55 ` Roger Quadros
2015-08-04 15:30 ` [PATCH 02/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node Kishon Vijay Abraham I
` (8 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: nsekhar, linux, bcousson, balbi, kishon
Add new device tree node for the control module register space where
PCIe registers are present.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index aa6abfc..33c5655 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -154,6 +154,11 @@
compatible = "syscon";
reg = <0x1c04 0x0020>;
};
+
+ scm_conf2: scm_conf@1c24 {
+ compatible = "syscon";
+ reg = <0x1c24 0x0024>;
+ };
};
cm_core_aon: cm_core_aon@5000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 01/10] ARM: dts: dra7: Add dt node for PCIe registers in sysctrl space
2015-08-04 15:30 ` [PATCH 01/10] ARM: dts: dra7: Add dt node for PCIe registers in sysctrl space Kishon Vijay Abraham I
@ 2015-08-05 7:55 ` Roger Quadros
0 siblings, 0 replies; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 7:55 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add new device tree node for the control module register space where
> PCIe registers are present.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> ---
> arch/arm/boot/dts/dra7.dtsi | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index aa6abfc..33c5655 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -154,6 +154,11 @@
> compatible = "syscon";
> reg = <0x1c04 0x0020>;
> };
> +
> + scm_conf2: scm_conf@1c24 {
> + compatible = "syscon";
> + reg = <0x1c24 0x0024>;
> + };
> };
>
> cm_core_aon: cm_core_aon@5000 {
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 02/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 01/10] ARM: dts: dra7: Add dt node for PCIe registers in sysctrl space Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 7:55 ` Roger Quadros
2015-08-04 15:30 ` [PATCH 03/10] ARM: dts: dra7: Use "syscon-phy-power" and "syscon-pcs" in PCIe " Kishon Vijay Abraham I
` (7 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from SATA PHY node. Since "omap_control_sata" note is no longer
used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 33c5655..6854385 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1115,14 +1115,6 @@
status = "disabled";
};
- omap_control_sata: control-phy@4a002374 {
- compatible = "ti,control-phy-pipe3";
- reg = <0x4a002374 0x4>;
- reg-names = "power";
- clocks = <&sys_clkin1>;
- clock-names = "sysclk";
- };
-
/* OCP2SCP3 */
ocp2scp@4a090000 {
compatible = "ti,omap-ocp2scp";
@@ -1137,7 +1129,7 @@
<0x4A096400 0x64>, /* phy_tx */
<0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
- ctrl-module = <&omap_control_sata>;
+ syscon-phy-power = <&scm_conf 0x374>;
clocks = <&sys_clkin1>, <&sata_ref_clk>;
clock-names = "sysclk", "refclk";
#phy-cells = <0>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 02/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node
2015-08-04 15:30 ` [PATCH 02/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node Kishon Vijay Abraham I
@ 2015-08-05 7:55 ` Roger Quadros
0 siblings, 0 replies; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 7:55 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> property from SATA PHY node. Since "omap_control_sata" note is no longer
> used, remove it.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> ---
> arch/arm/boot/dts/dra7.dtsi | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index 33c5655..6854385 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -1115,14 +1115,6 @@
> status = "disabled";
> };
>
> - omap_control_sata: control-phy@4a002374 {
> - compatible = "ti,control-phy-pipe3";
> - reg = <0x4a002374 0x4>;
> - reg-names = "power";
> - clocks = <&sys_clkin1>;
> - clock-names = "sysclk";
> - };
> -
> /* OCP2SCP3 */
> ocp2scp@4a090000 {
> compatible = "ti,omap-ocp2scp";
> @@ -1137,7 +1129,7 @@
> <0x4A096400 0x64>, /* phy_tx */
> <0x4A096800 0x40>; /* pll_ctrl */
> reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> - ctrl-module = <&omap_control_sata>;
> + syscon-phy-power = <&scm_conf 0x374>;
> clocks = <&sys_clkin1>, <&sata_ref_clk>;
> clock-names = "sysclk", "refclk";
> #phy-cells = <0>;
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 03/10] ARM: dts: dra7: Use "syscon-phy-power" and "syscon-pcs" in PCIe PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 01/10] ARM: dts: dra7: Add dt node for PCIe registers in sysctrl space Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 02/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 04/10] ARM: dts: dra7: Use "ti,dra7x-usb2-phy2" compatible string for USB2 PHY2 Kishon Vijay Abraham I
` (6 subsequent siblings)
9 siblings, 0 replies; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-phy-power" property and "syscon-pcs" property which can
be used to perform the control module initializations and remove
the deprecated "ctrl-module" property from PCIe PHY dt nodes.
Phandle to "sysclk" clock node is also added to the PCIe PHY node
since some of the syscon initializations is based on system clock
frequency.
Since "omap_control_pcie1phy" and "omap_control_pcie2phy" devicetree
nodes are no longer used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 6854385..0ebb808 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1140,16 +1140,18 @@
reg = <0x4a094000 0x80>, /* phy_rx */
<0x4a094400 0x64>; /* phy_tx */
reg-names = "phy_rx", "phy_tx";
- ctrl-module = <&omap_control_pcie1phy>;
+ syscon-phy-power = <&scm_conf2 0x1c>;
+ syscon-pcs = <&scm_conf2 0x10>;
clocks = <&dpll_pcie_ref_ck>,
<&dpll_pcie_ref_m2ldo_ck>,
<&optfclk_pciephy1_32khz>,
<&optfclk_pciephy1_clk>,
<&optfclk_pciephy1_div_clk>,
- <&optfclk_pciephy_div>;
+ <&optfclk_pciephy_div>,
+ <&sys_clkin1>;
clock-names = "dpll_ref", "dpll_ref_m2",
"wkupclk", "refclk",
- "div-clk", "phy-div";
+ "div-clk", "phy-div", "sysclk";
#phy-cells = <0>;
};
@@ -1158,7 +1160,8 @@
reg = <0x4a095000 0x80>, /* phy_rx */
<0x4a095400 0x64>; /* phy_tx */
reg-names = "phy_rx", "phy_tx";
- ctrl-module = <&omap_control_pcie2phy>;
+ syscon-phy-power = <&scm_conf2 0x20>;
+ syscon-pcs = <&scm_conf2 0x10>;
clocks = <&dpll_pcie_ref_ck>,
<&dpll_pcie_ref_m2ldo_ck>,
<&optfclk_pciephy2_32khz>,
@@ -1183,23 +1186,6 @@
ti,hwmods = "sata";
};
- omap_control_pcie1phy: control-phy@0x4a003c40 {
- compatible = "ti,control-phy-pcie";
- reg = <0x4a003c40 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>;
- reg-names = "power", "control_sma", "pcie_pcs";
- clocks = <&sys_clkin1>;
- clock-names = "sysclk";
- };
-
- omap_control_pcie2phy: control-pcie@0x4a003c44 {
- compatible = "ti,control-phy-pcie";
- reg = <0x4a003c44 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>;
- reg-names = "power", "control_sma", "pcie_pcs";
- clocks = <&sys_clkin1>;
- clock-names = "sysclk";
- status = "disabled";
- };
-
rtc: rtc@48838000 {
compatible = "ti,am3352-rtc";
reg = <0x48838000 0x100>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 04/10] ARM: dts: dra7: Use "ti,dra7x-usb2-phy2" compatible string for USB2 PHY2
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (2 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 03/10] ARM: dts: dra7: Use "syscon-phy-power" and "syscon-pcs" in PCIe " Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 05/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node Kishon Vijay Abraham I
` (5 subsequent siblings)
9 siblings, 0 replies; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
The USB2 PHY2 has a different register map compared to USB2 PHY1
to power on/off the PHY. In order to handle it, use the new compatible
string "ti,dra7x-usb2-phy2" for the second instance of USB2 PHY.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 0ebb808..dfefd17 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1234,7 +1234,7 @@
};
usb2_phy2: phy@4a085000 {
- compatible = "ti,omap-usb2";
+ compatible = "ti,dra7x-usb2-phy2", "ti,omap-usb2";
reg = <0x4a085000 0x400>;
ctrl-module = <&omap_control_usb2phy2>;
clocks = <&usb_phy2_always_on_clk32k>,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 05/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (3 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 04/10] ARM: dts: dra7: Use "ti,dra7x-usb2-phy2" compatible string for USB2 PHY2 Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 7:56 ` Roger Quadros
2015-08-04 15:30 ` [PATCH 06/10] ARM: dts: am4372: " Kishon Vijay Abraham I
` (4 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from USB PHY devicetree nodes.
Since "omap_control_usb2phy1", "omap_control_usb3phy1" and
"omap_control_usb2phy2" devicetree nodes are no longer used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index dfefd17..191ffae 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1195,24 +1195,6 @@
clocks = <&sys_32k_ck>;
};
- omap_control_usb2phy1: control-phy@4a002300 {
- compatible = "ti,control-phy-usb2";
- reg = <0x4a002300 0x4>;
- reg-names = "power";
- };
-
- omap_control_usb3phy1: control-phy@4a002370 {
- compatible = "ti,control-phy-pipe3";
- reg = <0x4a002370 0x4>;
- reg-names = "power";
- };
-
- omap_control_usb2phy2: control-phy@0x4a002e74 {
- compatible = "ti,control-phy-usb2-dra7";
- reg = <0x4a002e74 0x4>;
- reg-names = "power";
- };
-
/* OCP2SCP1 */
ocp2scp@4a080000 {
compatible = "ti,omap-ocp2scp";
@@ -1225,7 +1207,7 @@
usb2_phy1: phy@4a084000 {
compatible = "ti,omap-usb2";
reg = <0x4a084000 0x400>;
- ctrl-module = <&omap_control_usb2phy1>;
+ syscon-phy-power = <&scm_conf 0x300>;
clocks = <&usb_phy1_always_on_clk32k>,
<&usb_otg_ss1_refclk960m>;
clock-names = "wkupclk",
@@ -1236,7 +1218,7 @@
usb2_phy2: phy@4a085000 {
compatible = "ti,dra7x-usb2-phy2", "ti,omap-usb2";
reg = <0x4a085000 0x400>;
- ctrl-module = <&omap_control_usb2phy2>;
+ syscon-phy-power = <&scm_conf 0xe74>;
clocks = <&usb_phy2_always_on_clk32k>,
<&usb_otg_ss2_refclk960m>;
clock-names = "wkupclk",
@@ -1250,7 +1232,7 @@
<0x4a084800 0x64>,
<0x4a084c00 0x40>;
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
- ctrl-module = <&omap_control_usb3phy1>;
+ syscon-phy-power = <&scm_conf 0x370>;
clocks = <&usb_phy3_always_on_clk32k>,
<&sys_clkin1>,
<&usb_otg_ss1_refclk960m>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 05/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 ` [PATCH 05/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node Kishon Vijay Abraham I
@ 2015-08-05 7:56 ` Roger Quadros
0 siblings, 0 replies; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 7:56 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> property from USB PHY devicetree nodes.
>
> Since "omap_control_usb2phy1", "omap_control_usb3phy1" and
> "omap_control_usb2phy2" devicetree nodes are no longer used, remove it.
s/it/them
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> ---
> arch/arm/boot/dts/dra7.dtsi | 24 +++---------------------
> 1 file changed, 3 insertions(+), 21 deletions(-)
>
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index dfefd17..191ffae 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -1195,24 +1195,6 @@
> clocks = <&sys_32k_ck>;
> };
>
> - omap_control_usb2phy1: control-phy@4a002300 {
> - compatible = "ti,control-phy-usb2";
> - reg = <0x4a002300 0x4>;
> - reg-names = "power";
> - };
> -
> - omap_control_usb3phy1: control-phy@4a002370 {
> - compatible = "ti,control-phy-pipe3";
> - reg = <0x4a002370 0x4>;
> - reg-names = "power";
> - };
> -
> - omap_control_usb2phy2: control-phy@0x4a002e74 {
> - compatible = "ti,control-phy-usb2-dra7";
> - reg = <0x4a002e74 0x4>;
> - reg-names = "power";
> - };
> -
> /* OCP2SCP1 */
> ocp2scp@4a080000 {
> compatible = "ti,omap-ocp2scp";
> @@ -1225,7 +1207,7 @@
> usb2_phy1: phy@4a084000 {
> compatible = "ti,omap-usb2";
> reg = <0x4a084000 0x400>;
> - ctrl-module = <&omap_control_usb2phy1>;
> + syscon-phy-power = <&scm_conf 0x300>;
> clocks = <&usb_phy1_always_on_clk32k>,
> <&usb_otg_ss1_refclk960m>;
> clock-names = "wkupclk",
> @@ -1236,7 +1218,7 @@
> usb2_phy2: phy@4a085000 {
> compatible = "ti,dra7x-usb2-phy2", "ti,omap-usb2";
> reg = <0x4a085000 0x400>;
> - ctrl-module = <&omap_control_usb2phy2>;
> + syscon-phy-power = <&scm_conf 0xe74>;
> clocks = <&usb_phy2_always_on_clk32k>,
> <&usb_otg_ss2_refclk960m>;
> clock-names = "wkupclk",
> @@ -1250,7 +1232,7 @@
> <0x4a084800 0x64>,
> <0x4a084c00 0x40>;
> reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> - ctrl-module = <&omap_control_usb3phy1>;
> + syscon-phy-power = <&scm_conf 0x370>;
> clocks = <&usb_phy3_always_on_clk32k>,
> <&sys_clkin1>,
> <&usb_otg_ss1_refclk960m>;
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 06/10] ARM: dts: am4372: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (4 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 05/10] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
[not found] ` <1438702233-8027-7-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2015-08-04 15:30 ` [PATCH 07/10] ARM: dts: OMAP5: " Kishon Vijay Abraham I
` (3 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: nsekhar, linux, bcousson, balbi, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from USB PHY device tree node.
Since "am43xx_control_usb2phy1" and "am43xx_control_usb2phy2"
devicetree nodes are no longer used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/am4372.dtsi | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index ade28c79..24fa073 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -802,18 +802,6 @@
status = "disabled";
};
- am43xx_control_usb2phy1: control-phy@44e10620 {
- compatible = "ti,control-phy-usb2-am437";
- reg = <0x44e10620 0x4>;
- reg-names = "power";
- };
-
- am43xx_control_usb2phy2: control-phy@0x44e10628 {
- compatible = "ti,control-phy-usb2-am437";
- reg = <0x44e10628 0x4>;
- reg-names = "power";
- };
-
ocp2scp0: ocp2scp@483a8000 {
compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
#address-cells = <1>;
@@ -824,7 +812,7 @@
usb2_phy1: phy@483a8000 {
compatible = "ti,am437x-usb2";
reg = <0x483a8000 0x8000>;
- ctrl-module = <&am43xx_control_usb2phy1>;
+ syscon-phy-power = <&scm_conf 0x620>;
clocks = <&usb_phy0_always_on_clk32k>,
<&usb_otg_ss0_refclk960m>;
clock-names = "wkupclk", "refclk";
@@ -843,7 +831,7 @@
usb2_phy2: phy@483e8000 {
compatible = "ti,am437x-usb2";
reg = <0x483e8000 0x8000>;
- ctrl-module = <&am43xx_control_usb2phy2>;
+ syscon-phy-power = <&scm_conf 0x628>;
clocks = <&usb_phy1_always_on_clk32k>,
<&usb_otg_ss1_refclk960m>;
clock-names = "wkupclk", "refclk";
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 07/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (5 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 06/10] ARM: dts: am4372: " Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 7:58 ` Roger Quadros
2015-08-04 15:30 ` [PATCH 08/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in SATA " Kishon Vijay Abraham I
` (2 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: nsekhar, linux, bcousson, balbi, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from USB PHY devicetree node.
Since "omap_control_usb2phy" and "omap_control_usb3phy" devicetree nodes
are no longer used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c8fd648..f0b6cd6 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -848,18 +848,6 @@
hw-caps-temp-alert;
};
- omap_control_usb2phy: control-phy@4a002300 {
- compatible = "ti,control-phy-usb2";
- reg = <0x4a002300 0x4>;
- reg-names = "power";
- };
-
- omap_control_usb3phy: control-phy@4a002370 {
- compatible = "ti,control-phy-pipe3";
- reg = <0x4a002370 0x4>;
- reg-names = "power";
- };
-
usb3: omap_dwc3@4a020000 {
compatible = "ti,dwc3";
ti,hwmods = "usb_otg_ss";
@@ -890,7 +878,7 @@
usb2_phy: usb2phy@4a084000 {
compatible = "ti,omap-usb2";
reg = <0x4a084000 0x7c>;
- ctrl-module = <&omap_control_usb2phy>;
+ syscon-phy-power = <&scm_conf 0x300>;
clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>;
clock-names = "wkupclk", "refclk";
#phy-cells = <0>;
@@ -902,7 +890,7 @@
<0x4a084800 0x64>,
<0x4a084c00 0x40>;
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
- ctrl-module = <&omap_control_usb3phy>;
+ syscon-phy-power = <&scm_conf 0x370>;
clocks = <&usb_phy_cm_clk32k>,
<&sys_clkin>,
<&usb_otg_ss_refclk960m>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 07/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 ` [PATCH 07/10] ARM: dts: OMAP5: " Kishon Vijay Abraham I
@ 2015-08-05 7:58 ` Roger Quadros
0 siblings, 0 replies; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 7:58 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> property from USB PHY devicetree node.
>
> Since "omap_control_usb2phy" and "omap_control_usb3phy" devicetree nodes
> are no longer used, remove it.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> ---
> arch/arm/boot/dts/omap5.dtsi | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index c8fd648..f0b6cd6 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -848,18 +848,6 @@
> hw-caps-temp-alert;
> };
>
> - omap_control_usb2phy: control-phy@4a002300 {
> - compatible = "ti,control-phy-usb2";
> - reg = <0x4a002300 0x4>;
> - reg-names = "power";
> - };
> -
> - omap_control_usb3phy: control-phy@4a002370 {
> - compatible = "ti,control-phy-pipe3";
> - reg = <0x4a002370 0x4>;
> - reg-names = "power";
> - };
> -
> usb3: omap_dwc3@4a020000 {
> compatible = "ti,dwc3";
> ti,hwmods = "usb_otg_ss";
> @@ -890,7 +878,7 @@
> usb2_phy: usb2phy@4a084000 {
> compatible = "ti,omap-usb2";
> reg = <0x4a084000 0x7c>;
> - ctrl-module = <&omap_control_usb2phy>;
> + syscon-phy-power = <&scm_conf 0x300>;
> clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>;
> clock-names = "wkupclk", "refclk";
> #phy-cells = <0>;
> @@ -902,7 +890,7 @@
> <0x4a084800 0x64>,
> <0x4a084c00 0x40>;
> reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> - ctrl-module = <&omap_control_usb3phy>;
> + syscon-phy-power = <&scm_conf 0x370>;
> clocks = <&usb_phy_cm_clk32k>,
> <&sys_clkin>,
> <&usb_otg_ss_refclk960m>;
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 08/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (6 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 07/10] ARM: dts: OMAP5: " Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 7:59 ` Roger Quadros
2015-08-04 15:30 ` [PATCH 09/10] ARM: dts: omap4: Use "syscon-phy-power" instead of "ctrl-module" in USB " Kishon Vijay Abraham I
2015-08-04 15:30 ` [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node Kishon Vijay Abraham I
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from SATA PHY node.
Since "omap_control_sata" devicetree node is no longer used, remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index f0b6cd6..c3ca5b7 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -946,14 +946,6 @@
#thermal-sensor-cells = <1>;
};
- omap_control_sata: control-phy@4a002374 {
- compatible = "ti,control-phy-pipe3";
- reg = <0x4a002374 0x4>;
- reg-names = "power";
- clocks = <&sys_clkin>;
- clock-names = "sysclk";
- };
-
/* OCP2SCP3 */
ocp2scp@4a090000 {
compatible = "ti,omap-ocp2scp";
@@ -968,7 +960,7 @@
<0x4A096400 0x64>, /* phy_tx */
<0x4A096800 0x40>; /* pll_ctrl */
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
- ctrl-module = <&omap_control_sata>;
+ syscon-phy-power = <&scm_conf 0x374>;
clocks = <&sys_clkin>, <&sata_ref_clk>;
clock-names = "sysclk", "refclk";
#phy-cells = <0>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 08/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node
2015-08-04 15:30 ` [PATCH 08/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in SATA " Kishon Vijay Abraham I
@ 2015-08-05 7:59 ` Roger Quadros
0 siblings, 0 replies; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 7:59 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> property from SATA PHY node.
>
> Since "omap_control_sata" devicetree node is no longer used, remove it.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> ---
> arch/arm/boot/dts/omap5.dtsi | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index f0b6cd6..c3ca5b7 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -946,14 +946,6 @@
> #thermal-sensor-cells = <1>;
> };
>
> - omap_control_sata: control-phy@4a002374 {
> - compatible = "ti,control-phy-pipe3";
> - reg = <0x4a002374 0x4>;
> - reg-names = "power";
> - clocks = <&sys_clkin>;
> - clock-names = "sysclk";
> - };
> -
> /* OCP2SCP3 */
> ocp2scp@4a090000 {
> compatible = "ti,omap-ocp2scp";
> @@ -968,7 +960,7 @@
> <0x4A096400 0x64>, /* phy_tx */
> <0x4A096800 0x40>; /* pll_ctrl */
> reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> - ctrl-module = <&omap_control_sata>;
> + syscon-phy-power = <&scm_conf 0x374>;
> clocks = <&sys_clkin>, <&sata_ref_clk>;
> clock-names = "sysclk", "refclk";
> #phy-cells = <0>;
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 09/10] ARM: dts: omap4: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (7 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 08/10] ARM: dts: OMAP5: Use "syscon-phy-power" instead of "ctrl-module" in SATA " Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
[not found] ` <1438702233-8027-10-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2015-08-04 15:30 ` [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node Kishon Vijay Abraham I
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from USB PHY dt node.
Since "omap_control_usb2phy" devicetree node is no longer used,
remove it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 7d31c6f..b27634d 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -703,7 +703,7 @@
usb2_phy: usb2phy@4a0ad080 {
compatible = "ti,omap-usb2";
reg = <0x4a0ad080 0x58>;
- ctrl-module = <&omap_control_usb2phy>;
+ syscon-phy-power = <&scm_conf 0x300>;
clocks = <&usb_phy_cm_clk32k>;
clock-names = "wkupclk";
#phy-cells = <0>;
@@ -854,12 +854,6 @@
};
};
- omap_control_usb2phy: control-phy@4a002300 {
- compatible = "ti,control-phy-usb2";
- reg = <0x4a002300 0x4>;
- reg-names = "power";
- };
-
omap_control_usbotg: control-phy@4a00233c {
compatible = "ti,control-phy-otghs";
reg = <0x4a00233c 0x4>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
2015-08-04 15:30 [PATCH 00/10] ARM: dts: use syscon property instead of ctrl-module Kishon Vijay Abraham I
` (8 preceding siblings ...)
2015-08-04 15:30 ` [PATCH 09/10] ARM: dts: omap4: Use "syscon-phy-power" instead of "ctrl-module" in USB " Kishon Vijay Abraham I
@ 2015-08-04 15:30 ` Kishon Vijay Abraham I
2015-08-05 8:02 ` Roger Quadros
9 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-04 15:30 UTC (permalink / raw)
To: rogerq, tony, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar, kishon
Add "syscon-otghs" property and remove the deprecated "ctrl-module"
property from MUSB devicetree node.
Since "omap_control_usbotg" devicetree node is no longer used, remove
it.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index b27634d..2fb49a5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -854,12 +854,6 @@
};
};
- omap_control_usbotg: control-phy@4a00233c {
- compatible = "ti,control-phy-otghs";
- reg = <0x4a00233c 0x4>;
- reg-names = "otghs_control";
- };
-
usb_otg_hs: usb_otg_hs@4a0ab000 {
compatible = "ti,omap4-musb";
reg = <0x4a0ab000 0x7ff>;
@@ -872,7 +866,7 @@
multipoint = <1>;
num-eps = <16>;
ram-bits = <12>;
- ctrl-module = <&omap_control_usbotg>;
+ syscon-otghs = <&scm_conf 0x33c>;
};
aes: aes@4b501000 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
2015-08-04 15:30 ` [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node Kishon Vijay Abraham I
@ 2015-08-05 8:02 ` Roger Quadros
2015-08-05 8:08 ` Roger Quadros
0 siblings, 1 reply; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 8:02 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
Kishon,
On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
> property from MUSB devicetree node.
>
> Since "omap_control_usbotg" devicetree node is no longer used, remove
> it.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> arch/arm/boot/dts/omap4.dtsi | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index b27634d..2fb49a5 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -854,12 +854,6 @@
> };
> };
>
> - omap_control_usbotg: control-phy@4a00233c {
> - compatible = "ti,control-phy-otghs";
> - reg = <0x4a00233c 0x4>;
> - reg-names = "otghs_control";
> - };
> -
> usb_otg_hs: usb_otg_hs@4a0ab000 {
> compatible = "ti,omap4-musb";
> reg = <0x4a0ab000 0x7ff>;
> @@ -872,7 +866,7 @@
> multipoint = <1>;
> num-eps = <16>;
> ram-bits = <12>;
> - ctrl-module = <&omap_control_usbotg>;
> + syscon-otghs = <&scm_conf 0x33c>;
All other properties were of the format "syscon-phy-foo".
Why use a different format here?
Other than that
Acked-by: Roger Quadros <rogerq@ti.com>
cheers,
-roger
> };
>
> aes: aes@4b501000 {
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
2015-08-05 8:02 ` Roger Quadros
@ 2015-08-05 8:08 ` Roger Quadros
2015-08-05 14:25 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 22+ messages in thread
From: Roger Quadros @ 2015-08-05 8:08 UTC (permalink / raw)
To: Kishon Vijay Abraham I, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
On 05/08/15 11:02, Roger Quadros wrote:
> Kishon,
>
> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
>> property from MUSB devicetree node.
>>
>> Since "omap_control_usbotg" devicetree node is no longer used, remove
>> it.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>> arch/arm/boot/dts/omap4.dtsi | 8 +-------
>> 1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
>> index b27634d..2fb49a5 100644
>> --- a/arch/arm/boot/dts/omap4.dtsi
>> +++ b/arch/arm/boot/dts/omap4.dtsi
>> @@ -854,12 +854,6 @@
>> };
>> };
>>
>> - omap_control_usbotg: control-phy@4a00233c {
>> - compatible = "ti,control-phy-otghs";
>> - reg = <0x4a00233c 0x4>;
>> - reg-names = "otghs_control";
>> - };
>> -
>> usb_otg_hs: usb_otg_hs@4a0ab000 {
>> compatible = "ti,omap4-musb";
>> reg = <0x4a0ab000 0x7ff>;
>> @@ -872,7 +866,7 @@
>> multipoint = <1>;
>> num-eps = <16>;
>> ram-bits = <12>;
>> - ctrl-module = <&omap_control_usbotg>;
>> + syscon-otghs = <&scm_conf 0x33c>;
>
> All other properties were of the format "syscon-phy-foo".
> Why use a different format here?
>
Ah, looks like we don't have a dedicated phy driver for this?
We will need to add a PHY driver I guess then and handle this register
in that driver rather than in the musb driver.
cheers,
-roger
>
>
>> };
>>
>> aes: aes@4b501000 {
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
2015-08-05 8:08 ` Roger Quadros
@ 2015-08-05 14:25 ` Kishon Vijay Abraham I
2015-08-06 8:48 ` Tony Lindgren
0 siblings, 1 reply; 22+ messages in thread
From: Kishon Vijay Abraham I @ 2015-08-05 14:25 UTC (permalink / raw)
To: Roger Quadros, tony, t-kristo, devicetree, linux-kernel,
linux-usb, linux-omap, linux-arm-kernel
Cc: balbi, bcousson, linux, nsekhar
Hi Roger,
On Wednesday 05 August 2015 01:38 PM, Roger Quadros wrote:
> On 05/08/15 11:02, Roger Quadros wrote:
>> Kishon,
>>
>> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
>>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
>>> property from MUSB devicetree node.
>>>
>>> Since "omap_control_usbotg" devicetree node is no longer used, remove
>>> it.
>>>
>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>> ---
>>> arch/arm/boot/dts/omap4.dtsi | 8 +-------
>>> 1 file changed, 1 insertion(+), 7 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
>>> index b27634d..2fb49a5 100644
>>> --- a/arch/arm/boot/dts/omap4.dtsi
>>> +++ b/arch/arm/boot/dts/omap4.dtsi
>>> @@ -854,12 +854,6 @@
>>> };
>>> };
>>>
>>> - omap_control_usbotg: control-phy@4a00233c {
>>> - compatible = "ti,control-phy-otghs";
>>> - reg = <0x4a00233c 0x4>;
>>> - reg-names = "otghs_control";
>>> - };
>>> -
>>> usb_otg_hs: usb_otg_hs@4a0ab000 {
>>> compatible = "ti,omap4-musb";
>>> reg = <0x4a0ab000 0x7ff>;
>>> @@ -872,7 +866,7 @@
>>> multipoint = <1>;
>>> num-eps = <16>;
>>> ram-bits = <12>;
>>> - ctrl-module = <&omap_control_usbotg>;
>>> + syscon-otghs = <&scm_conf 0x33c>;
>>
>> All other properties were of the format "syscon-phy-foo".
>> Why use a different format here?
>>
>
> Ah, looks like we don't have a dedicated phy driver for this?
> We will need to add a PHY driver I guess then and handle this register
> in that driver rather than in the musb driver.
I was explaining in the other thread to Tony on why this shouldn't be done in a
PHY driver [1].
Thanks
Kishon
[1] -> https://lkml.org/lkml/2015/8/5/455
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 10/10] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node
2015-08-05 14:25 ` Kishon Vijay Abraham I
@ 2015-08-06 8:48 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2015-08-06 8:48 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: Roger Quadros, t-kristo, devicetree, linux-kernel, linux-usb,
linux-omap, linux-arm-kernel, balbi, bcousson, linux, nsekhar
* Kishon Vijay Abraham I <kishon@ti.com> [150805 07:28]:
> Hi Roger,
>
> On Wednesday 05 August 2015 01:38 PM, Roger Quadros wrote:
> > On 05/08/15 11:02, Roger Quadros wrote:
> >> Kishon,
> >>
> >> On 04/08/15 18:30, Kishon Vijay Abraham I wrote:
> >>> Add "syscon-otghs" property and remove the deprecated "ctrl-module"
> >>> property from MUSB devicetree node.
> >>>
> >>> Since "omap_control_usbotg" devicetree node is no longer used, remove
> >>> it.
> >>>
> >>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> >>> ---
> >>> arch/arm/boot/dts/omap4.dtsi | 8 +-------
> >>> 1 file changed, 1 insertion(+), 7 deletions(-)
> >>>
> >>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> >>> index b27634d..2fb49a5 100644
> >>> --- a/arch/arm/boot/dts/omap4.dtsi
> >>> +++ b/arch/arm/boot/dts/omap4.dtsi
> >>> @@ -854,12 +854,6 @@
> >>> };
> >>> };
> >>>
> >>> - omap_control_usbotg: control-phy@4a00233c {
> >>> - compatible = "ti,control-phy-otghs";
> >>> - reg = <0x4a00233c 0x4>;
> >>> - reg-names = "otghs_control";
> >>> - };
> >>> -
> >>> usb_otg_hs: usb_otg_hs@4a0ab000 {
> >>> compatible = "ti,omap4-musb";
> >>> reg = <0x4a0ab000 0x7ff>;
> >>> @@ -872,7 +866,7 @@
> >>> multipoint = <1>;
> >>> num-eps = <16>;
> >>> ram-bits = <12>;
> >>> - ctrl-module = <&omap_control_usbotg>;
> >>> + syscon-otghs = <&scm_conf 0x33c>;
> >>
> >> All other properties were of the format "syscon-phy-foo".
> >> Why use a different format here?
> >>
> >
> > Ah, looks like we don't have a dedicated phy driver for this?
> > We will need to add a PHY driver I guess then and handle this register
> > in that driver rather than in the musb driver.
>
> I was explaining in the other thread to Tony on why this shouldn't be done in a
> PHY driver [1].
And I just suggested thhere that it should be in the drivers/phy/phy-omap-usb2.c
PHY driver instead of the MUSB driver.
Regards,
Tony
> [1] -> https://lkml.org/lkml/2015/8/5/455
^ permalink raw reply [flat|nested] 22+ messages in thread