* [PATCH 1/2] arm64: dts: rockchip: move rk3399-sapphire sdio to excavator baseboard [not found] <CAAMcf8CY1m+998+GpD2wOfAZb=oZNkL2GqYu_o5piGEh76uoYw@mail.gmail.com> @ 2018-02-19 8:15 ` Heiko Stuebner 2018-02-19 8:16 ` [PATCH 2/2] arm64: dts: rockchip: add a standalone version of the rk3399 sapphire Heiko Stuebner 0 siblings, 1 reply; 3+ messages in thread From: Heiko Stuebner @ 2018-02-19 8:15 UTC (permalink / raw) To: linux-arm-kernel The sdio signals are routed through the connector to the baseboard, where the wifi module is also located. So move the sdio node to the excavator as well. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- Hi Vicente, after looking at the issue, I guess something like this and the following patch should help your situation? I've heared about the sapphire being used standalone some times and thus think it can be justified to add that standalone version. Heiko .../boot/dts/rockchip/rk3399-sapphire-excavator.dts | 16 ++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts index b7bd88fb3ae3..68416fae4fea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts @@ -232,6 +232,22 @@ }; }; +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + clock-frequency = <50000000>; + disable-wp; + keep-power-in-suspend; + max-frequency = <50000000>; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + status = "okay"; +}; + &spdif { i2c-scl-rising-time-ns = <450>; i2c-scl-falling-time-ns = <15>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 46c95ccfd5cb..31568b4e8aa1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -520,22 +520,6 @@ status = "okay"; }; -&sdio0 { - bus-width = <4>; - cap-sd-highspeed; - cap-sdio-irq; - clock-frequency = <50000000>; - disable-wp; - keep-power-in-suspend; - max-frequency = <50000000>; - mmc-pwrseq = <&sdio_pwrseq>; - non-removable; - pinctrl-names = "default"; - pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; - sd-uhs-sdr104; - status = "okay"; -}; - &sdmmc { bus-width = <4>; cap-mmc-highspeed; -- 2.15.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm64: dts: rockchip: add a standalone version of the rk3399 sapphire 2018-02-19 8:15 ` [PATCH 1/2] arm64: dts: rockchip: move rk3399-sapphire sdio to excavator baseboard Heiko Stuebner @ 2018-02-19 8:16 ` Heiko Stuebner 2018-02-19 20:42 ` Rob Herring 0 siblings, 1 reply; 3+ messages in thread From: Heiko Stuebner @ 2018-02-19 8:16 UTC (permalink / raw) To: linux-arm-kernel While the sapphire board is a system-on-module and mostly used with the excavator baseboard, it is also possible to use it standalone without any base. So add a board-variant for this type. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- Documentation/devicetree/bindings/arm/rockchip.txt | 4 ++++ arch/arm64/boot/dts/rockchip/Makefile | 1 + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts | 12 ++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt index 9a3e98356b1e..1c1d62d03c4f 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -185,6 +185,10 @@ Rockchip platforms device tree bindings Required root node properties: - compatible = "rockchip,rk3399-evb", "rockchip,rk3399"; +- Rockchip RK3399 Sapphire board standalone: + Required root node properties: + - compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399"; + - Rockchip RK3399 Sapphire Excavator board: Required root node properties: - compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399"; diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 1e57f87f30c4..48a83f882947 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -12,4 +12,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts new file mode 100644 index 000000000000..5a58060447cf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. + */ + +/dts-v1/; +#include "rk3399-sapphire.dtsi" + +/ { + model = "Sapphire-RK3399 Board"; + compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399"; +}; -- 2.15.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm64: dts: rockchip: add a standalone version of the rk3399 sapphire 2018-02-19 8:16 ` [PATCH 2/2] arm64: dts: rockchip: add a standalone version of the rk3399 sapphire Heiko Stuebner @ 2018-02-19 20:42 ` Rob Herring 0 siblings, 0 replies; 3+ messages in thread From: Rob Herring @ 2018-02-19 20:42 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 19, 2018 at 09:16:17AM +0100, Heiko Stuebner wrote: > While the sapphire board is a system-on-module and mostly used with the > excavator baseboard, it is also possible to use it standalone without > any base. So add a board-variant for this type. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > Documentation/devicetree/bindings/arm/rockchip.txt | 4 ++++ > arch/arm64/boot/dts/rockchip/Makefile | 1 + > arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts | 12 ++++++++++++ > 3 files changed, 17 insertions(+) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-19 20:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CAAMcf8CY1m+998+GpD2wOfAZb=oZNkL2GqYu_o5piGEh76uoYw@mail.gmail.com>
2018-02-19 8:15 ` [PATCH 1/2] arm64: dts: rockchip: move rk3399-sapphire sdio to excavator baseboard Heiko Stuebner
2018-02-19 8:16 ` [PATCH 2/2] arm64: dts: rockchip: add a standalone version of the rk3399 sapphire Heiko Stuebner
2018-02-19 20:42 ` Rob Herring
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox