* [PATCH 0/3] move Rockchip usbphy under the GRF mfd
@ 2016-03-31 13:43 Heiko Stuebner
2016-03-31 13:43 ` [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF Heiko Stuebner
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Heiko Stuebner @ 2016-03-31 13:43 UTC (permalink / raw)
To: kishon; +Cc: linux-kernel, linux-rockchip, Heiko Stuebner
The usb2 phy used on rk3288 and before is fully part of the
GRF, so similar to other phys repositioned recently, it
should live under GRF node as well.
Patch 1 should go through the phy-tree, hopefully into 4.7
and I'll pick patches 2 and 3 myself for 4.8 then.
Heiko Stuebner (3):
phy: rockchip-usb: should be a child device of the GRF
ARM: dts: rockchip: make rk3288-grf a simple-mfd
ARM: dts: rockchip: move rk3288 usbphy under the GRF node
.../devicetree/bindings/phy/rockchip-usb-phy.txt | 27 +++++----
arch/arm/boot/dts/rk3288.dtsi | 65 +++++++++++-----------
drivers/phy/phy-rockchip-usb.c | 14 ++++-
3 files changed, 60 insertions(+), 46 deletions(-)
--
2.6.4
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-03-31 13:43 [PATCH 0/3] move Rockchip usbphy under the GRF mfd Heiko Stuebner @ 2016-03-31 13:43 ` Heiko Stuebner 2016-04-19 6:13 ` Heiko Stübner 2016-03-31 13:43 ` [PATCH 2/3] ARM: dts: rockchip: make rk3288-grf a simple-mfd Heiko Stuebner 2016-03-31 13:43 ` [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node Heiko Stuebner 2 siblings, 1 reply; 13+ messages in thread From: Heiko Stuebner @ 2016-03-31 13:43 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip, Heiko Stuebner The usb-phy is fully enclosed in the general register files (GRF). Therefore as seen from the device-tree it shouldn't be a separate platform- device but instead a sub-device of the GRF - using the simply-mfd mechanism. As the usb-phy is part of the kernel for some releases now, we keep the old (and now deprecated) binding for compatibility purposes. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- .../devicetree/bindings/phy/rockchip-usb-phy.txt | 27 ++++++++++++++-------- drivers/phy/phy-rockchip-usb.c | 14 ++++++++--- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt index 68498d5..cc6be96 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt +++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt @@ -5,11 +5,13 @@ Required properties: "rockchip,rk3066a-usb-phy" "rockchip,rk3188-usb-phy" "rockchip,rk3288-usb-phy" - - rockchip,grf : phandle to the syscon managing the "general - register files" - #address-cells: should be 1 - #size-cells: should be 0 +Deprecated properties: + - rockchip,grf : phandle to the syscon managing the "general + register files" - phy should be a child of the GRF instead + Sub-nodes: Each PHY should be represented as a sub-node. @@ -28,14 +30,19 @@ Optional Properties: Example: -usbphy: phy { - compatible = "rockchip,rk3288-usb-phy"; - rockchip,grf = <&grf>; - #address-cells = <1>; - #size-cells = <0>; +grf: syscon@ff770000 { + compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd"; + +... + + usbphy: phy { + compatible = "rockchip,rk3288-usb-phy"; + #address-cells = <1>; + #size-cells = <0>; - usbphy0: usb-phy0 { - #phy-cells = <0>; - reg = <0x320>; + usbphy0: usb-phy0 { + #phy-cells = <0>; + reg = <0x320>; + }; }; }; diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c index f62d899..23f33db 100644 --- a/drivers/phy/phy-rockchip-usb.c +++ b/drivers/phy/phy-rockchip-usb.c @@ -397,8 +397,12 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) phy_base->pdata = match->data; phy_base->dev = dev; - phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node, - "rockchip,grf"); + phy_base->reg_base = ERR_PTR(-ENODEV); + if (dev->parent && dev->parent->of_node) + phy_base->reg_base = syscon_node_to_regmap(dev->parent->of_node); + if (IS_ERR(phy_base->reg_base)) + phy_base->reg_base = syscon_regmap_lookup_by_phandle( + dev->of_node, "rockchip,grf"); if (IS_ERR(phy_base->reg_base)) { dev_err(&pdev->dev, "Missing rockchip,grf property\n"); return PTR_ERR(phy_base->reg_base); @@ -463,7 +467,11 @@ static int __init rockchip_init_usb_uart(void) return -ENOTSUPP; } - grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); + grf = ERR_PTR(-ENODEV); + if (np->parent) + grf = syscon_node_to_regmap(np->parent); + if (IS_ERR(grf)) + grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); if (IS_ERR(grf)) { pr_err("%s: Missing rockchip,grf property, %lu\n", __func__, PTR_ERR(grf)); -- 2.6.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-03-31 13:43 ` [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF Heiko Stuebner @ 2016-04-19 6:13 ` Heiko Stübner 2016-04-30 20:07 ` Heiko Stübner 0 siblings, 1 reply; 13+ messages in thread From: Heiko Stübner @ 2016-04-19 6:13 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip Hi Kishon. Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: > The usb-phy is fully enclosed in the general register files (GRF). > Therefore as seen from the device-tree it shouldn't be a separate platform- > device but instead a sub-device of the GRF - using the simply-mfd mechanism. > > As the usb-phy is part of the kernel for some releases now, we keep > the old (and now deprecated) binding for compatibility purposes. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> could you look into picking this patch up for 4.7? Same principle as for the other phy drivers, but it's already in the kernel for a while, so it gets a fallback for the old binding and can go through the normal way. The other two (devicetree-)patches I would then simply queue for 4.8 myself after you're fine with the driver-side. Thanks Heiko > --- > .../devicetree/bindings/phy/rockchip-usb-phy.txt | 27 > ++++++++++++++-------- drivers/phy/phy-rockchip-usb.c | > 14 ++++++++--- 2 files changed, 28 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt > b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt index > 68498d5..cc6be96 100644 > --- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt > +++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt > @@ -5,11 +5,13 @@ Required properties: > "rockchip,rk3066a-usb-phy" > "rockchip,rk3188-usb-phy" > "rockchip,rk3288-usb-phy" > - - rockchip,grf : phandle to the syscon managing the "general > - register files" > - #address-cells: should be 1 > - #size-cells: should be 0 > > +Deprecated properties: > + - rockchip,grf : phandle to the syscon managing the "general > + register files" - phy should be a child of the GRF instead > + > Sub-nodes: > Each PHY should be represented as a sub-node. > > @@ -28,14 +30,19 @@ Optional Properties: > > Example: > > -usbphy: phy { > - compatible = "rockchip,rk3288-usb-phy"; > - rockchip,grf = <&grf>; > - #address-cells = <1>; > - #size-cells = <0>; > +grf: syscon@ff770000 { > + compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd"; > + > +... > + > + usbphy: phy { > + compatible = "rockchip,rk3288-usb-phy"; > + #address-cells = <1>; > + #size-cells = <0>; > > - usbphy0: usb-phy0 { > - #phy-cells = <0>; > - reg = <0x320>; > + usbphy0: usb-phy0 { > + #phy-cells = <0>; > + reg = <0x320>; > + }; > }; > }; > diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c > index f62d899..23f33db 100644 > --- a/drivers/phy/phy-rockchip-usb.c > +++ b/drivers/phy/phy-rockchip-usb.c > @@ -397,8 +397,12 @@ static int rockchip_usb_phy_probe(struct > platform_device *pdev) phy_base->pdata = match->data; > > phy_base->dev = dev; > - phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node, > - "rockchip,grf"); > + phy_base->reg_base = ERR_PTR(-ENODEV); > + if (dev->parent && dev->parent->of_node) > + phy_base->reg_base = syscon_node_to_regmap(dev->parent->of_node); > + if (IS_ERR(phy_base->reg_base)) > + phy_base->reg_base = syscon_regmap_lookup_by_phandle( > + dev->of_node, "rockchip,grf"); > if (IS_ERR(phy_base->reg_base)) { > dev_err(&pdev->dev, "Missing rockchip,grf property\n"); > return PTR_ERR(phy_base->reg_base); > @@ -463,7 +467,11 @@ static int __init rockchip_init_usb_uart(void) > return -ENOTSUPP; > } > > - grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); > + grf = ERR_PTR(-ENODEV); > + if (np->parent) > + grf = syscon_node_to_regmap(np->parent); > + if (IS_ERR(grf)) > + grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); > if (IS_ERR(grf)) { > pr_err("%s: Missing rockchip,grf property, %lu\n", > __func__, PTR_ERR(grf)); ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-04-19 6:13 ` Heiko Stübner @ 2016-04-30 20:07 ` Heiko Stübner 2016-05-03 10:58 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 13+ messages in thread From: Heiko Stübner @ 2016-04-30 20:07 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip Hi Kishon, Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: > Hi Kishon. > > Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: > > The usb-phy is fully enclosed in the general register files (GRF). > > Therefore as seen from the device-tree it shouldn't be a separate > > platform- > > device but instead a sub-device of the GRF - using the simply-mfd > > mechanism. > > > > As the usb-phy is part of the kernel for some releases now, we keep > > the old (and now deprecated) binding for compatibility purposes. > > > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > could you look into picking this patch up for 4.7? > > Same principle as for the other phy drivers, but it's already in the kernel > for a while, so it gets a fallback for the old binding and can go through > the normal way. > > The other two (devicetree-)patches I would then simply queue for 4.8 myself > after you're fine with the driver-side. just saw that you already have a tag for 4.7-related phy changes since this afternoon, but no phy pull to Greg on lkml yet. So maybe there is still a way for this phy conversion (to be under the Rockchip GRF node) to make it in for 4.7 :-) ? Thanks Heiko ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-04-30 20:07 ` Heiko Stübner @ 2016-05-03 10:58 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 13+ messages in thread From: Kishon Vijay Abraham I @ 2016-05-03 10:58 UTC (permalink / raw) To: Heiko Stübner; +Cc: linux-kernel, linux-rockchip On Sunday 01 May 2016 01:37 AM, Heiko Stübner wrote: > Hi Kishon, > > Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: >> Hi Kishon. >> >> Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: >>> The usb-phy is fully enclosed in the general register files (GRF). >>> Therefore as seen from the device-tree it shouldn't be a separate >>> platform- >>> device but instead a sub-device of the GRF - using the simply-mfd >>> mechanism. >>> >>> As the usb-phy is part of the kernel for some releases now, we keep >>> the old (and now deprecated) binding for compatibility purposes. >>> >>> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> >> could you look into picking this patch up for 4.7? >> >> Same principle as for the other phy drivers, but it's already in the kernel >> for a while, so it gets a fallback for the old binding and can go through >> the normal way. >> >> The other two (devicetree-)patches I would then simply queue for 4.8 myself >> after you're fine with the driver-side. > > just saw that you already have a tag for 4.7-related phy changes since this > afternoon, but no phy pull to Greg on lkml yet. > > So maybe there is still a way for this phy conversion (to be under the > Rockchip GRF node) to make it in for 4.7 :-) ? Looks like I've missed this before sending the pull request. Sorry about that. Is it okay if the PHY changes also go in 4.8? -Kishon ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF @ 2016-05-03 10:58 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 13+ messages in thread From: Kishon Vijay Abraham I @ 2016-05-03 10:58 UTC (permalink / raw) To: Heiko Stübner Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Sunday 01 May 2016 01:37 AM, Heiko Stübner wrote: > Hi Kishon, > > Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: >> Hi Kishon. >> >> Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: >>> The usb-phy is fully enclosed in the general register files (GRF). >>> Therefore as seen from the device-tree it shouldn't be a separate >>> platform- >>> device but instead a sub-device of the GRF - using the simply-mfd >>> mechanism. >>> >>> As the usb-phy is part of the kernel for some releases now, we keep >>> the old (and now deprecated) binding for compatibility purposes. >>> >>> Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> >> >> could you look into picking this patch up for 4.7? >> >> Same principle as for the other phy drivers, but it's already in the kernel >> for a while, so it gets a fallback for the old binding and can go through >> the normal way. >> >> The other two (devicetree-)patches I would then simply queue for 4.8 myself >> after you're fine with the driver-side. > > just saw that you already have a tag for 4.7-related phy changes since this > afternoon, but no phy pull to Greg on lkml yet. > > So maybe there is still a way for this phy conversion (to be under the > Rockchip GRF node) to make it in for 4.7 :-) ? Looks like I've missed this before sending the pull request. Sorry about that. Is it okay if the PHY changes also go in 4.8? -Kishon ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-05-03 10:58 ` Kishon Vijay Abraham I (?) @ 2016-05-03 11:02 ` Heiko Stübner 2016-06-17 12:35 ` Kishon Vijay Abraham I -1 siblings, 1 reply; 13+ messages in thread From: Heiko Stübner @ 2016-05-03 11:02 UTC (permalink / raw) To: Kishon Vijay Abraham I; +Cc: linux-kernel, linux-rockchip Hi Kishon, Am Dienstag, 3. Mai 2016, 16:28:35 schrieb Kishon Vijay Abraham I: > On Sunday 01 May 2016 01:37 AM, Heiko Stübner wrote: > > Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: > >> Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: > >>> The usb-phy is fully enclosed in the general register files (GRF). > >>> Therefore as seen from the device-tree it shouldn't be a separate > >>> platform- > >>> device but instead a sub-device of the GRF - using the simply-mfd > >>> mechanism. > >>> > >>> As the usb-phy is part of the kernel for some releases now, we keep > >>> the old (and now deprecated) binding for compatibility purposes. > >>> > >>> Signed-off-by: Heiko Stuebner <heiko@sntech.de> > >> > >> could you look into picking this patch up for 4.7? > >> > >> Same principle as for the other phy drivers, but it's already in the > >> kernel > >> for a while, so it gets a fallback for the old binding and can go through > >> the normal way. > >> > >> The other two (devicetree-)patches I would then simply queue for 4.8 > >> myself > >> after you're fine with the driver-side. > > > > just saw that you already have a tag for 4.7-related phy changes since > > this > > afternoon, but no phy pull to Greg on lkml yet. > > > > So maybe there is still a way for this phy conversion (to be under the > > Rockchip GRF node) to make it in for 4.7 :-) ? > > Looks like I've missed this before sending the pull request. Sorry about > that. Is it okay if the PHY changes also go in 4.8? yep, 4.8 is no problem as well. We have the current binding in the kernel for so long, that waiting one more kernel release won't be a problem. Heiko ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF 2016-05-03 11:02 ` Heiko Stübner @ 2016-06-17 12:35 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 13+ messages in thread From: Kishon Vijay Abraham I @ 2016-06-17 12:35 UTC (permalink / raw) To: Heiko Stübner; +Cc: linux-kernel, linux-rockchip Hi Heiko, On Tuesday 03 May 2016 04:32 PM, Heiko Stübner wrote: > Hi Kishon, > > Am Dienstag, 3. Mai 2016, 16:28:35 schrieb Kishon Vijay Abraham I: >> On Sunday 01 May 2016 01:37 AM, Heiko Stübner wrote: >>> Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: >>>> Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: >>>>> The usb-phy is fully enclosed in the general register files (GRF). >>>>> Therefore as seen from the device-tree it shouldn't be a separate >>>>> platform- >>>>> device but instead a sub-device of the GRF - using the simply-mfd >>>>> mechanism. >>>>> >>>>> As the usb-phy is part of the kernel for some releases now, we keep >>>>> the old (and now deprecated) binding for compatibility purposes. >>>>> >>>>> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >>>> >>>> could you look into picking this patch up for 4.7? >>>> >>>> Same principle as for the other phy drivers, but it's already in the >>>> kernel >>>> for a while, so it gets a fallback for the old binding and can go through >>>> the normal way. >>>> >>>> The other two (devicetree-)patches I would then simply queue for 4.8 >>>> myself >>>> after you're fine with the driver-side. >>> >>> just saw that you already have a tag for 4.7-related phy changes since >>> this >>> afternoon, but no phy pull to Greg on lkml yet. >>> >>> So maybe there is still a way for this phy conversion (to be under the >>> Rockchip GRF node) to make it in for 4.7 :-) ? >> >> Looks like I've missed this before sending the pull request. Sorry about >> that. Is it okay if the PHY changes also go in 4.8? > > yep, 4.8 is no problem as well. We have the current binding in the kernel for > so long, that waiting one more kernel release won't be a problem. Can you resend the patch after fixing these checkpatch warnings? WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line) #52: device but instead a sub-device of the GRF - using the simply-mfd mechanism. WARNING: line over 80 characters #123: FILE: drivers/phy/phy-rockchip-usb.c:402: + phy_base->reg_base = syscon_node_to_regmap(dev->parent->of_node); total: 0 errors, 2 warnings, 68 lines checked After that I'll take them in my -next. Thanks Kishon ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF @ 2016-06-17 12:35 ` Kishon Vijay Abraham I 0 siblings, 0 replies; 13+ messages in thread From: Kishon Vijay Abraham I @ 2016-06-17 12:35 UTC (permalink / raw) To: Heiko Stübner Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Hi Heiko, On Tuesday 03 May 2016 04:32 PM, Heiko Stübner wrote: > Hi Kishon, > > Am Dienstag, 3. Mai 2016, 16:28:35 schrieb Kishon Vijay Abraham I: >> On Sunday 01 May 2016 01:37 AM, Heiko Stübner wrote: >>> Am Dienstag, 19. April 2016, 08:13:47 schrieb Heiko Stübner: >>>> Am Donnerstag, 31. März 2016, 15:43:30 schrieb Heiko Stuebner: >>>>> The usb-phy is fully enclosed in the general register files (GRF). >>>>> Therefore as seen from the device-tree it shouldn't be a separate >>>>> platform- >>>>> device but instead a sub-device of the GRF - using the simply-mfd >>>>> mechanism. >>>>> >>>>> As the usb-phy is part of the kernel for some releases now, we keep >>>>> the old (and now deprecated) binding for compatibility purposes. >>>>> >>>>> Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> >>>> >>>> could you look into picking this patch up for 4.7? >>>> >>>> Same principle as for the other phy drivers, but it's already in the >>>> kernel >>>> for a while, so it gets a fallback for the old binding and can go through >>>> the normal way. >>>> >>>> The other two (devicetree-)patches I would then simply queue for 4.8 >>>> myself >>>> after you're fine with the driver-side. >>> >>> just saw that you already have a tag for 4.7-related phy changes since >>> this >>> afternoon, but no phy pull to Greg on lkml yet. >>> >>> So maybe there is still a way for this phy conversion (to be under the >>> Rockchip GRF node) to make it in for 4.7 :-) ? >> >> Looks like I've missed this before sending the pull request. Sorry about >> that. Is it okay if the PHY changes also go in 4.8? > > yep, 4.8 is no problem as well. We have the current binding in the kernel for > so long, that waiting one more kernel release won't be a problem. Can you resend the patch after fixing these checkpatch warnings? WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line) #52: device but instead a sub-device of the GRF - using the simply-mfd mechanism. WARNING: line over 80 characters #123: FILE: drivers/phy/phy-rockchip-usb.c:402: + phy_base->reg_base = syscon_node_to_regmap(dev->parent->of_node); total: 0 errors, 2 warnings, 68 lines checked After that I'll take them in my -next. Thanks Kishon ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/3] ARM: dts: rockchip: make rk3288-grf a simple-mfd 2016-03-31 13:43 [PATCH 0/3] move Rockchip usbphy under the GRF mfd Heiko Stuebner 2016-03-31 13:43 ` [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF Heiko Stuebner @ 2016-03-31 13:43 ` Heiko Stuebner 2016-03-31 13:43 ` [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node Heiko Stuebner 2 siblings, 0 replies; 13+ messages in thread From: Heiko Stuebner @ 2016-03-31 13:43 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip, Heiko Stuebner Similar to the pmu, the general register files contain a lot of different setting bits grouped into general registers, but also some somewhat special entities like the controls for some phy-blocks or the io-voltage control. To be able to move these blocks under the grf node where they actually belong, make it a simple-mfd. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/boot/dts/rk3288.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 31f7e20..bc57232 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -745,7 +745,7 @@ }; grf: syscon@ff770000 { - compatible = "rockchip,rk3288-grf", "syscon"; + compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd"; reg = <0xff770000 0x1000>; }; -- 2.6.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node 2016-03-31 13:43 [PATCH 0/3] move Rockchip usbphy under the GRF mfd Heiko Stuebner 2016-03-31 13:43 ` [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF Heiko Stuebner 2016-03-31 13:43 ` [PATCH 2/3] ARM: dts: rockchip: make rk3288-grf a simple-mfd Heiko Stuebner @ 2016-03-31 13:43 ` Heiko Stuebner 2016-08-03 9:40 ` Heiko Stübner 2 siblings, 1 reply; 13+ messages in thread From: Heiko Stuebner @ 2016-03-31 13:43 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip, Heiko Stuebner The rk3288 usbphy is completely enclosed in the general register files and the updated binding allows it to be a subnode of the GRF now. So move the node appropriately. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/boot/dts/rk3288.dtsi | 63 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index bc57232..e746d35 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -747,6 +747,37 @@ grf: syscon@ff770000 { compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd"; reg = <0xff770000 0x1000>; + + usbphy: usbphy { + compatible = "rockchip,rk3288-usb-phy"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + usbphy0: usb-phy0 { + #phy-cells = <0>; + reg = <0x320>; + clocks = <&cru SCLK_OTGPHY0>; + clock-names = "phyclk"; + #clock-cells = <0>; + }; + + usbphy1: usb-phy1 { + #phy-cells = <0>; + reg = <0x334>; + clocks = <&cru SCLK_OTGPHY1>; + clock-names = "phyclk"; + #clock-cells = <0>; + }; + + usbphy2: usb-phy2 { + #phy-cells = <0>; + reg = <0x348>; + clocks = <&cru SCLK_OTGPHY2>; + clock-names = "phyclk"; + #clock-cells = <0>; + }; + }; }; wdt: watchdog@ff800000 { @@ -959,38 +990,6 @@ }; }; - usbphy: phy { - compatible = "rockchip,rk3288-usb-phy"; - rockchip,grf = <&grf>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - - usbphy0: usb-phy0 { - #phy-cells = <0>; - reg = <0x320>; - clocks = <&cru SCLK_OTGPHY0>; - clock-names = "phyclk"; - #clock-cells = <0>; - }; - - usbphy1: usb-phy1 { - #phy-cells = <0>; - reg = <0x334>; - clocks = <&cru SCLK_OTGPHY1>; - clock-names = "phyclk"; - #clock-cells = <0>; - }; - - usbphy2: usb-phy2 { - #phy-cells = <0>; - reg = <0x348>; - clocks = <&cru SCLK_OTGPHY2>; - clock-names = "phyclk"; - #clock-cells = <0>; - }; - }; - pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>; -- 2.6.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node @ 2016-08-03 9:40 ` Heiko Stübner 0 siblings, 0 replies; 13+ messages in thread From: Heiko Stübner @ 2016-08-03 9:40 UTC (permalink / raw) To: kishon; +Cc: linux-kernel, linux-rockchip Am Donnerstag, 31. März 2016, 15:43:32 schrieb Heiko Stuebner: > The rk3288 usbphy is completely enclosed in the general register files > and the updated binding allows it to be a subnode of the GRF now. > So move the node appropriately. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> after picking patch 2/3 in for another context already, I've now also applied this one to my dts32 branch for 4.9 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node @ 2016-08-03 9:40 ` Heiko Stübner 0 siblings, 0 replies; 13+ messages in thread From: Heiko Stübner @ 2016-08-03 9:40 UTC (permalink / raw) To: kishon-l0cyMroinI0 Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Am Donnerstag, 31. März 2016, 15:43:32 schrieb Heiko Stuebner: > The rk3288 usbphy is completely enclosed in the general register files > and the updated binding allows it to be a subnode of the GRF now. > So move the node appropriately. > > Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> after picking patch 2/3 in for another context already, I've now also applied this one to my dts32 branch for 4.9 ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2016-08-03 9:40 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-03-31 13:43 [PATCH 0/3] move Rockchip usbphy under the GRF mfd Heiko Stuebner 2016-03-31 13:43 ` [PATCH 1/3] phy: rockchip-usb: should be a child device of the GRF Heiko Stuebner 2016-04-19 6:13 ` Heiko Stübner 2016-04-30 20:07 ` Heiko Stübner 2016-05-03 10:58 ` Kishon Vijay Abraham I 2016-05-03 10:58 ` Kishon Vijay Abraham I 2016-05-03 11:02 ` Heiko Stübner 2016-06-17 12:35 ` Kishon Vijay Abraham I 2016-06-17 12:35 ` Kishon Vijay Abraham I 2016-03-31 13:43 ` [PATCH 2/3] ARM: dts: rockchip: make rk3288-grf a simple-mfd Heiko Stuebner 2016-03-31 13:43 ` [PATCH 3/3] ARM: dts: rockchip: move rk3288 usbphy under the GRF node Heiko Stuebner 2016-08-03 9:40 ` Heiko Stübner 2016-08-03 9:40 ` Heiko Stübner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.