Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1400396 > unrolled thread
| Started by | Brian Norris <briannorris@chromium.org> |
|---|---|
| First post | 2016-05-13 00:40 +0200 |
| Last post | 2016-05-13 23:50 +0200 |
| Articles | 9 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Brian Norris <briannorris@chromium.org> - 2016-05-13 00:40 +0200
[PATCH v2 2/2] ARM64: dts: rockchip: enable eMMC for rk3399 EVB Brian Norris <briannorris@chromium.org> - 2016-05-13 00:40 +0200
Re: [PATCH v2 2/2] ARM64: dts: rockchip: enable eMMC for rk3399 EVB Heiko Stuebner <heiko@sntech.de> - 2016-05-14 00:00 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Shawn Lin <shawn.lin@rock-chips.com> - 2016-05-13 02:50 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Heiko Stuebner <heiko@sntech.de> - 2016-05-13 23:50 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Brian Norris <briannorris@chromium.org> - 2016-05-14 00:00 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Heiko Stuebner <heiko@sntech.de> - 2016-05-14 00:20 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Doug Anderson <dianders@chromium.org> - 2016-05-13 23:50 +0200
Re: [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 Brian Norris <briannorris@chromium.org> - 2016-05-13 23:50 +0200
| From | Brian Norris <briannorris@chromium.org> |
|---|---|
| Date | 2016-05-13 00:40 +0200 |
| Subject | [PATCH v2 1/2] ARM64: dts: rockchip: add sdhci/emmc for rk3399 |
| Message-ID | <ry7qW-737-13@gated-at.bofh.it> |
Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to
200 MHz, to support all supported timing modes.
Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably
have a compliant Arasan controller, but let's have a rockchip property
as the canonical backup/precautionary measure. Per Heiko's previous
suggestion, let's not clutter the arasan doc with it.
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
v2:
* improved commit message
* assign eMMC clock to 200 MHz
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 46f325a143b0..9980c2eab4e9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -215,6 +215,19 @@
status = "disabled";
};
+ sdhci: sdhci@fe330000 {
+ compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
+ reg = <0x0 0xfe330000 0x0 0x10000>;
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;
+ clock-names = "clk_xin", "clk_ahb";
+ assigned-clocks = <&cru SCLK_EMMC>;
+ assigned-clock-rates = <200000000>;
+ phys = <&emmc_phy>;
+ phy-names = "phy_arasan";
+ status = "disabled";
+ };
+
usb_host0_ehci: usb@fe380000 {
compatible = "generic-ehci";
reg = <0x0 0xfe380000 0x0 0x20000>;
@@ -481,8 +494,18 @@
};
grf: syscon@ff770000 {
- compatible = "rockchip,rk3399-grf", "syscon";
+ compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
reg = <0x0 0xff770000 0x0 0x10000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ emmc_phy: phy@f780 {
+ compatible = "rockchip,rk3399-emmc-phy";
+ reg = <0xf780 0x20>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
};
watchdog@ff840000 {
--
2.8.0.rc3.226.g39d4020
[toc] | [next] | [standalone]
| From | Brian Norris <briannorris@chromium.org> |
|---|---|
| Date | 2016-05-13 00:40 +0200 |
| Subject | [PATCH v2 2/2] ARM64: dts: rockchip: enable eMMC for rk3399 EVB |
| Message-ID | <ry7qX-737-33@gated-at.bofh.it> |
| In reply to | #1400396 |
Rockchip's rk3399 evaluation board has eMMC. Let's enable the
newly-added node.
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
v2:
* better commit description
arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
index 1a3eb1482050..0b27d91084c4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
@@ -89,6 +89,18 @@
status = "okay";
};
+&emmc_phy {
+ status = "okay";
+};
+
+&sdhci {
+ bus-width = <8>;
+ mmc-hs400-1_8v;
+ mmc-hs400-enhanced-strobe;
+ non-removable;
+ status = "okay";
+};
+
&uart2 {
status = "okay";
};
--
2.8.0.rc3.226.g39d4020
[toc] | [prev] | [next] | [standalone]
| From | Heiko Stuebner <heiko@sntech.de> |
|---|---|
| Date | 2016-05-14 00:00 +0200 |
| Subject | Re: [PATCH v2 2/2] ARM64: dts: rockchip: enable eMMC for rk3399 EVB |
| Message-ID | <rythN-3qY-9@gated-at.bofh.it> |
| In reply to | #1400397 |
Am Donnerstag, 12. Mai 2016, 15:35:52 schrieb Brian Norris:
> Rockchip's rk3399 evaluation board has eMMC. Let's enable the
> newly-added node.
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> v2:
>
> * better commit description
>
> arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
> b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts index
> 1a3eb1482050..0b27d91084c4 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
> @@ -89,6 +89,18 @@
> status = "okay";
> };
>
> +&emmc_phy {
> + status = "okay";
> +};
another thing I should've seen yesterday, emmc_phy should not be below the
&pwm nodes (aka alphabetically please)
Heiko
> +&sdhci {
> + bus-width = <8>;
> + mmc-hs400-1_8v;
> + mmc-hs400-enhanced-strobe;
> + non-removable;
> + status = "okay";
> +};
> +
> &uart2 {
> status = "okay";
> };
[toc] | [prev] | [next] | [standalone]
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-05-13 02:50 +0200 |
| Message-ID | <ry9sK-t7-3@gated-at.bofh.it> |
| In reply to | #1400396 |
在 2016/5/13 6:35, Brian Norris 写道:
> Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to
> 200 MHz, to support all supported timing modes.
>
> Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably
> have a compliant Arasan controller, but let's have a rockchip property
> as the canonical backup/precautionary measure. Per Heiko's previous
> suggestion, let's not clutter the arasan doc with it.
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Except for adding "rockchip,rk3399-sdhci-5.1", it looks nice and keeps
consistent with our local kernel-4.4 tree.
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
> v2:
>
> * improved commit message
> * assign eMMC clock to 200 MHz
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++++++++++++++++++-
> 1 file changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 46f325a143b0..9980c2eab4e9 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -215,6 +215,19 @@
> status = "disabled";
> };
>
> + sdhci: sdhci@fe330000 {
> + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
> + reg = <0x0 0xfe330000 0x0 0x10000>;
> + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;
> + clock-names = "clk_xin", "clk_ahb";
> + assigned-clocks = <&cru SCLK_EMMC>;
> + assigned-clock-rates = <200000000>;
> + phys = <&emmc_phy>;
> + phy-names = "phy_arasan";
> + status = "disabled";
> + };
> +
> usb_host0_ehci: usb@fe380000 {
> compatible = "generic-ehci";
> reg = <0x0 0xfe380000 0x0 0x20000>;
> @@ -481,8 +494,18 @@
> };
>
> grf: syscon@ff770000 {
> - compatible = "rockchip,rk3399-grf", "syscon";
> + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
> reg = <0x0 0xff770000 0x0 0x10000>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + emmc_phy: phy@f780 {
> + compatible = "rockchip,rk3399-emmc-phy";
> + reg = <0xf780 0x20>;
> + #phy-cells = <0>;
> + status = "disabled";
> + };
> };
>
> watchdog@ff840000 {
>
--
Best Regards
Shawn Lin
[toc] | [prev] | [next] | [standalone]
| From | Heiko Stuebner <heiko@sntech.de> |
|---|---|
| Date | 2016-05-13 23:50 +0200 |
| Message-ID | <ryt85-3k7-7@gated-at.bofh.it> |
| In reply to | #1400396 |
Am Donnerstag, 12. Mai 2016, 15:35:51 schrieb Brian Norris:
> Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to
> 200 MHz, to support all supported timing modes.
>
> Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably
> have a compliant Arasan controller, but let's have a rockchip property
> as the canonical backup/precautionary measure. Per Heiko's previous
> suggestion, let's not clutter the arasan doc with it.
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
At least one split is necessary.
So please at least split out the simple-mfd addition into a separate patch
(I should've seen that in v1 already, but sadly didn't)
I'm undecided if the emmc-phy addition also should get its own patch, but I
guess it can stay together with the emmc controller.
> ---
> v2:
>
> * improved commit message
> * assign eMMC clock to 200 MHz
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++++++++++++++++++-
> 1 file changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index
> 46f325a143b0..9980c2eab4e9 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -215,6 +215,19 @@
> status = "disabled";
> };
>
> + sdhci: sdhci@fe330000 {
> + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
> + reg = <0x0 0xfe330000 0x0 0x10000>;
> + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;
> + clock-names = "clk_xin", "clk_ahb";
> + assigned-clocks = <&cru SCLK_EMMC>;
> + assigned-clock-rates = <200000000>;
> + phys = <&emmc_phy>;
> + phy-names = "phy_arasan";
> + status = "disabled";
> + };
> +
> usb_host0_ehci: usb@fe380000 {
> compatible = "generic-ehci";
> reg = <0x0 0xfe380000 0x0 0x20000>;
> @@ -481,8 +494,18 @@
> };
>
> grf: syscon@ff770000 {
> - compatible = "rockchip,rk3399-grf", "syscon";
> + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
> reg = <0x0 0xff770000 0x0 0x10000>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + emmc_phy: phy@f780 {
> + compatible = "rockchip,rk3399-emmc-phy";
> + reg = <0xf780 0x20>;
> + #phy-cells = <0>;
> + status = "disabled";
> + };
> };
>
> watchdog@ff840000 {
[toc] | [prev] | [next] | [standalone]
| From | Brian Norris <briannorris@chromium.org> |
|---|---|
| Date | 2016-05-14 00:00 +0200 |
| Message-ID | <rythM-3qY-1@gated-at.bofh.it> |
| In reply to | #1400994 |
On Fri, May 13, 2016 at 11:47:57PM +0200, Heiko Stuebner wrote: > Am Donnerstag, 12. Mai 2016, 15:35:51 schrieb Brian Norris: > > Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to > > 200 MHz, to support all supported timing modes. > > > > Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably > > have a compliant Arasan controller, but let's have a rockchip property > > as the canonical backup/precautionary measure. Per Heiko's previous > > suggestion, let's not clutter the arasan doc with it. > > > > Signed-off-by: Brian Norris <briannorris@chromium.org> > > At least one split is necessary. > So please at least split out the simple-mfd addition into a separate patch Will do. BTW, should this be noted in Documentation/devicetree/bindings/soc/rockchip/grf.txt now? > (I should've seen that in v1 already, but sadly didn't) No problem. > I'm undecided if the emmc-phy addition also should get its own patch, but I > guess it can stay together with the emmc controller. I think it makes sense for them to stay together. What's a phy without a controller to use it? :) Brian
[toc] | [prev] | [next] | [standalone]
| From | Heiko Stuebner <heiko@sntech.de> |
|---|---|
| Date | 2016-05-14 00:20 +0200 |
| Message-ID | <rytB8-3Wa-15@gated-at.bofh.it> |
| In reply to | #1401000 |
Am Freitag, 13. Mai 2016, 14:57:24 schrieb Brian Norris: > On Fri, May 13, 2016 at 11:47:57PM +0200, Heiko Stuebner wrote: > > Am Donnerstag, 12. Mai 2016, 15:35:51 schrieb Brian Norris: > > > Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it > > > to > > > 200 MHz, to support all supported timing modes. > > > > > > Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably > > > have a compliant Arasan controller, but let's have a rockchip property > > > as the canonical backup/precautionary measure. Per Heiko's previous > > > suggestion, let's not clutter the arasan doc with it. > > > > > > Signed-off-by: Brian Norris <briannorris@chromium.org> > > > > At least one split is necessary. > > So please at least split out the simple-mfd addition into a separate > > patch > Will do. > > BTW, should this be noted in > Documentation/devicetree/bindings/soc/rockchip/grf.txt now? The simple-mfd is already documented in mfd/mfd.txt in a general way, so I don't think every instance needs to have that, especially as it mainly affects sub-nodes alone.
[toc] | [prev] | [next] | [standalone]
| From | Doug Anderson <dianders@chromium.org> |
|---|---|
| Date | 2016-05-13 23:50 +0200 |
| Message-ID | <ryt87-3k7-27@gated-at.bofh.it> |
| In reply to | #1400396 |
Hi,
On Thu, May 12, 2016 at 3:35 PM, Brian Norris <briannorris@chromium.org> wrote:
> Add description for the SDHCI v5.1 eMMC controller on rk3399. Fix it to
> 200 MHz, to support all supported timing modes.
>
> Note that 'rockchip,rk3399-sdhci-5.1' is not documented; we presumably
> have a compliant Arasan controller, but let's have a rockchip property
> as the canonical backup/precautionary measure. Per Heiko's previous
> suggestion, let's not clutter the arasan doc with it.
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> v2:
>
> * improved commit message
> * assign eMMC clock to 200 MHz
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++++++++++++++++++-
> 1 file changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 46f325a143b0..9980c2eab4e9 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -215,6 +215,19 @@
> status = "disabled";
> };
>
> + sdhci: sdhci@fe330000 {
> + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";
> + reg = <0x0 0xfe330000 0x0 0x10000>;
> + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;
> + clock-names = "clk_xin", "clk_ahb";
> + assigned-clocks = <&cru SCLK_EMMC>;
> + assigned-clock-rates = <200000000>;
> + phys = <&emmc_phy>;
> + phy-names = "phy_arasan";
> + status = "disabled";
> + };
> +
> usb_host0_ehci: usb@fe380000 {
> compatible = "generic-ehci";
> reg = <0x0 0xfe380000 0x0 0x20000>;
> @@ -481,8 +494,18 @@
> };
>
> grf: syscon@ff770000 {
> - compatible = "rockchip,rk3399-grf", "syscon";
> + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
> reg = <0x0 0xff770000 0x0 0x10000>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + emmc_phy: phy@f780 {
> + compatible = "rockchip,rk3399-emmc-phy";
> + reg = <0xf780 0x20>;
This is slightly wrong. It should be:
reg = <0xf780 0x24>;
The status register is at an offset of 0x20 and is 4 bytes big, so we
need room for it.
After that is fixed, feel free to add my Reviewed-by tag.
-Doug
[toc] | [prev] | [next] | [standalone]
| From | Brian Norris <briannorris@chromium.org> |
|---|---|
| Date | 2016-05-13 23:50 +0200 |
| Message-ID | <ryt87-3k7-31@gated-at.bofh.it> |
| In reply to | #1400996 |
On Fri, May 13, 2016 at 02:42:06PM -0700, Doug Anderson wrote:
> On Thu, May 12, 2016 at 3:35 PM, Brian Norris <briannorris@chromium.org> wrote:
> > + emmc_phy: phy@f780 {
> > + compatible = "rockchip,rk3399-emmc-phy";
> > + reg = <0xf780 0x20>;
>
> This is slightly wrong. It should be:
>
> reg = <0xf780 0x24>;
>
> The status register is at an offset of 0x20 and is 4 bytes big, so we
> need room for it.
Fixed.
> After that is fixed, feel free to add my Reviewed-by tag.
Done.
Thanks for the review.
Brian
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web