| Message ID | 20200618161220.219452-2-jagan@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | 1a95b1e82ccaf42b820793d9dcc2bda75903696c |
| Headers | show |
| Series | rockchip: Add Radxa Rock Pi N8 support | expand |
On 2020/6/19 ??12:12, Jagan Teki wrote: > Radxa dalang carrier boards are used to mount vmarc SoM's > of rk3399pro and rk3288 to make complete SBC. > > Among these combinations, card detection gpio, max-frequency > properties are used with rk3399pro SoM but not required for > rk3288 SoM based on the hardware schematics. > > So, let's move these sdmmc specific properties on associate > vmarc dtsi to make common use of dalang carrier device tree file. > > Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3399pro-vmarc-som.dtsi | 5 +++++ > arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi | 2 -- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi > index 0a516334f1..6fd17e8a81 100644 > --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi > +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi > @@ -317,6 +317,11 @@ > status = "okay"; > }; > > +&sdmmc { > + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; > + max-frequency = <150000000>; > +}; > + > &tsadc { > status = "okay"; > rockchip,hw-tshut-mode = <1>; > diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi > index df3712aedf..3e54f38f0a 100644 > --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi > +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi > @@ -52,10 +52,8 @@ > bus-width = <4>; > cap-mmc-highspeed; > cap-sd-highspeed; > - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; > disable-wp; > vqmmc-supply = <&vccio_sd>; > - max-frequency = <150000000>; > pinctrl-names = "default"; > pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; > status = "okay";
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi index 0a516334f1..6fd17e8a81 100644 --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi @@ -317,6 +317,11 @@ status = "okay"; }; +&sdmmc { + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + max-frequency = <150000000>; +}; + &tsadc { status = "okay"; rockchip,hw-tshut-mode = <1>; diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi index df3712aedf..3e54f38f0a 100644 --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi @@ -52,10 +52,8 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; disable-wp; vqmmc-supply = <&vccio_sd>; - max-frequency = <150000000>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay";
Radxa dalang carrier boards are used to mount vmarc SoM's of rk3399pro and rk3288 to make complete SBC. Among these combinations, card detection gpio, max-frequency properties are used with rk3399pro SoM but not required for rk3288 SoM based on the hardware schematics. So, let's move these sdmmc specific properties on associate vmarc dtsi to make common use of dalang carrier device tree file. Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> --- arch/arm/dts/rk3399pro-vmarc-som.dtsi | 5 +++++ arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)