| From 76043f61cd1077713826935643bfe5b1a84ccccc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Jan 2020 15:21:28 +0100 |
| Subject: arm64: dts: rockchip: add reg property to brcmf sub-nodes |
| |
| From: Johan Jonker <jbx6244@gmail.com> |
| |
| [ Upstream commit 96ff264bccb22175bbe2185a1eb5204ca3c5f03f ] |
| |
| An experimental test with the command below gives this error: |
| rk3399-firefly.dt.yaml: dwmmc@fe310000: wifi@1: |
| 'reg' is a required property |
| rk3399-orangepi.dt.yaml: dwmmc@fe310000: wifi@1: |
| 'reg' is a required property |
| rk3399-khadas-edge.dt.yaml: dwmmc@fe310000: wifi@1: |
| 'reg' is a required property |
| rk3399-khadas-edge-captain.dt.yaml: dwmmc@fe310000: wifi@1: |
| 'reg' is a required property |
| rk3399-khadas-edge-v.dt.yaml: dwmmc@fe310000: wifi@1: |
| 'reg' is a required property |
| So fix this by adding a reg property to the brcmf sub node. |
| Also add #address-cells and #size-cells to prevent more warnings. |
| |
| make ARCH=arm64 dtbs_check |
| DT_SCHEMA_FILES=Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml |
| |
| Signed-off-by: Johan Jonker <jbx6244@gmail.com> |
| Link: https://lore.kernel.org/r/20200110142128.13522-1-jbx6244@gmail.com |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +++ |
| arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +++ |
| arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +++ |
| 3 files changed, 9 insertions(+) |
| |
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| index c706db0ee9ec6..76f5db696009b 100644 |
| --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| @@ -669,9 +669,12 @@ |
| vqmmc-supply = &vcc1v8_s3; /* IO line */ |
| vmmc-supply = &vcc_sdio; /* card's power */ |
| |
| + #address-cells = <1>; |
| + #size-cells = <0>; |
| status = "okay"; |
| |
| brcmf: wifi@1 { |
| + reg = <1>; |
| compatible = "brcm,bcm4329-fmac"; |
| interrupt-parent = <&gpio0>; |
| interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; |
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi |
| index 4944d78a0a1cb..e87a04477440e 100644 |
| --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi |
| @@ -654,9 +654,12 @@ |
| sd-uhs-sdr104; |
| vqmmc-supply = <&vcc1v8_s3>; |
| vmmc-supply = <&vccio_sd>; |
| + #address-cells = <1>; |
| + #size-cells = <0>; |
| status = "okay"; |
| |
| brcmf: wifi@1 { |
| + reg = <1>; |
| compatible = "brcm,bcm4329-fmac"; |
| interrupt-parent = <&gpio0>; |
| interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; |
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts |
| index 0541dfce924d6..9c659f3115c88 100644 |
| --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts |
| @@ -648,9 +648,12 @@ |
| pinctrl-names = "default"; |
| pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; |
| sd-uhs-sdr104; |
| + #address-cells = <1>; |
| + #size-cells = <0>; |
| status = "okay"; |
| |
| brcmf: wifi@1 { |
| + reg = <1>; |
| compatible = "brcm,bcm4329-fmac"; |
| interrupt-parent = <&gpio0>; |
| interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; |
| -- |
| 2.20.1 |
| |