* [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
@ 2016-11-13 8:13 Jacob Chen
2016-11-13 8:13 ` [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb Jacob Chen
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jacob Chen @ 2016-11-13 8:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
---
arch/arm/boot/dts/rk1108.dtsi | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/rk1108.dtsi b/arch/arm/boot/dts/rk1108.dtsi
index 9dccfea..6a06ad7 100644
--- a/arch/arm/boot/dts/rk1108.dtsi
+++ b/arch/arm/boot/dts/rk1108.dtsi
@@ -321,6 +321,31 @@
input-enable;
};
+ sdmmc {
+ sdmmc_clk: sdmmc-clk {
+ rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>;
+ };
+
+ sdmmc_cmd: sdmmc-cmd {
+ rockchip,pins = <3 RK_PC5 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
+ };
+
+ sdmmc_cd: sdmmc-cd {
+ rockchip,pins = <0 RK_PA1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
+ };
+
+ sdmmc_bus1: sdmmc-bus1 {
+ rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
+ };
+
+ sdmmc_bus4: sdmmc-bus4 {
+ rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
+ <3 RK_PC2 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
+ <3 RK_PC1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
+ <3 RK_PC0 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
+ };
+ };
+
i2c1 {
i2c1_xfer: i2c1-xfer {
rockchip,pins = <2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>,
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb
2016-11-13 8:13 [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 Jacob Chen
@ 2016-11-13 8:13 ` Jacob Chen
2016-11-16 12:28 ` Heiko Stuebner
2016-11-13 8:18 ` [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 陈豪
2016-11-16 12:42 ` Heiko Stuebner
2 siblings, 1 reply; 5+ messages in thread
From: Jacob Chen @ 2016-11-13 8:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Jacob Chen <jacob2.chen@rock-chips.com>
This patch add sdmmc support for rk1108-evb, now I can load the rootfs
from sdmmc.
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
---
arch/arm/boot/dts/rk1108-evb.dts | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/rk1108-evb.dts b/arch/arm/boot/dts/rk1108-evb.dts
index 3956cff..cea26e5 100644
--- a/arch/arm/boot/dts/rk1108-evb.dts
+++ b/arch/arm/boot/dts/rk1108-evb.dts
@@ -56,6 +56,18 @@
};
};
+&sdmmc {
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
+ card-detect-delay = <200>;
+ disable-wp;
+ num-slots = <1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
+ status = "okay";
+};
+
&uart0 {
status = "okay";
};
@@ -67,3 +79,12 @@
&uart2 {
status = "okay";
};
+
+&pinctrl {
+
+ sdmmc {
+ sdmmc_pwr: sdmmc-pwr {
+ rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up_drv_4ma>;
+ };
+ };
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
2016-11-13 8:13 [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 Jacob Chen
2016-11-13 8:13 ` [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb Jacob Chen
@ 2016-11-13 8:18 ` 陈豪
2016-11-16 12:42 ` Heiko Stuebner
2 siblings, 0 replies; 5+ messages in thread
From: 陈豪 @ 2016-11-13 8:18 UTC (permalink / raw)
To: linux-arm-kernel
2016-11-13 16:13 GMT+08:00 Jacob Chen <jacob-chen@iotwrt.com>:
> From: Jacob Chen <jacob2.chen@rock-chips.com>
>
> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
> ---
> arch/arm/boot/dts/rk1108.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk1108.dtsi b/arch/arm/boot/dts/rk1108.dtsi
> index 9dccfea..6a06ad7 100644
> --- a/arch/arm/boot/dts/rk1108.dtsi
> +++ b/arch/arm/boot/dts/rk1108.dtsi
> @@ -321,6 +321,31 @@
> input-enable;
> };
>
> + sdmmc {
> + sdmmc_clk: sdmmc-clk {
> + rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>;
> + };
> +
> + sdmmc_cmd: sdmmc-cmd {
> + rockchip,pins = <3 RK_PC5 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
> + };
> +
> + sdmmc_cd: sdmmc-cd {
> + rockchip,pins = <0 RK_PA1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
> + };
> +
> + sdmmc_bus1: sdmmc-bus1 {
> + rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
> + };
> +
> + sdmmc_bus4: sdmmc-bus4 {
> + rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
> + <3 RK_PC2 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
> + <3 RK_PC1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,
> + <3 RK_PC0 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;
> + };
> + };
> +
> i2c1 {
> i2c1_xfer: i2c1-xfer {
> rockchip,pins = <2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>,
> --
> 2.7.4
>
Those patches are based on andy's patch set "Add basic support for
support for Rockchip RK1108 SOC ", assuming he will include
drive-strength functionality in pinctrl.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb
2016-11-13 8:13 ` [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb Jacob Chen
@ 2016-11-16 12:28 ` Heiko Stuebner
0 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2016-11-16 12:28 UTC (permalink / raw)
To: linux-arm-kernel
Am Sonntag, 13. November 2016, 16:13:19 CET schrieb Jacob Chen:
> From: Jacob Chen <jacob2.chen@rock-chips.com>
>
> This patch add sdmmc support for rk1108-evb, now I can load the rootfs
> from sdmmc.
>
> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
> ---
> arch/arm/boot/dts/rk1108-evb.dts | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk1108-evb.dts
> b/arch/arm/boot/dts/rk1108-evb.dts index 3956cff..cea26e5 100644
> --- a/arch/arm/boot/dts/rk1108-evb.dts
> +++ b/arch/arm/boot/dts/rk1108-evb.dts
> @@ -56,6 +56,18 @@
> };
> };
>
> +&sdmmc {
> + bus-width = <4>;
> + cap-mmc-highspeed;
> + cap-sd-highspeed;
> + card-detect-delay = <200>;
> + disable-wp;
> + num-slots = <1>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
> + status = "okay";
> +};
> +
> &uart0 {
> status = "okay";
> };
> @@ -67,3 +79,12 @@
> &uart2 {
> status = "okay";
> };
> +
> +&pinctrl {
> +
> + sdmmc {
> + sdmmc_pwr: sdmmc-pwr {
> + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up_drv_4ma>;
> + };
the above is unsued, and in general please use a fixed regulator as vmmc, as
all other Rockchip boards do already, so that the mmc core can handle it
itself.
Thanks
Heiko
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
2016-11-13 8:13 [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 Jacob Chen
2016-11-13 8:13 ` [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb Jacob Chen
2016-11-13 8:18 ` [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 陈豪
@ 2016-11-16 12:42 ` Heiko Stuebner
2 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2016-11-16 12:42 UTC (permalink / raw)
To: linux-arm-kernel
Am Sonntag, 13. November 2016, 16:13:18 CET schrieb Jacob Chen:
> From: Jacob Chen <jacob2.chen@rock-chips.com>
>
> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
> ---
> arch/arm/boot/dts/rk1108.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk1108.dtsi b/arch/arm/boot/dts/rk1108.dtsi
> index 9dccfea..6a06ad7 100644
> --- a/arch/arm/boot/dts/rk1108.dtsi
> +++ b/arch/arm/boot/dts/rk1108.dtsi
> @@ -321,6 +321,31 @@
> input-enable;
> };
>
> + sdmmc {
I've fixed the intendation here (needed tabs instead of spaces) and moved the
block to its alphabetically correct position between i2c and uart nodes and
applied the result to my dts32 branch.
Thanks
Heiko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-16 12:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-13 8:13 [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 Jacob Chen
2016-11-13 8:13 ` [PATCH 2/2] ARM: dts: rockchip: enable sdmmc for rk1108-evb Jacob Chen
2016-11-16 12:28 ` Heiko Stuebner
2016-11-13 8:18 ` [PATCH 1/2] ARM: dts: rockchip: add the sdmmc pinctrl for rk1108 陈豪
2016-11-16 12:42 ` Heiko Stuebner
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).