From fdd34d52cce3cc0bcd31b9571ccf0127c752c581 Mon Sep 17 00:00:00 2001 From: Deokgyu Yang Date: Fri, 29 May 2020 12:23:26 +0900 Subject: [PATCH] ODROID-COMMON: arm64/dts: Extract spidev node from main dts to spi0 dtbo Signed-off-by: Deokgyu Yang Change-Id: I2ceb31b971970b96e0113e528b4c174d81d35258 --- arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts | 9 --------- arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts | 9 --------- .../boot/dts/amlogic/overlays/odroidc4/spi0.dts | 15 +++++++++------ .../boot/dts/amlogic/overlays/odroidn2/spi0.dts | 15 +++++++++------ 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index e4600531b427..2aced4990b9a 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -910,15 +910,6 @@ status = "disabled"; gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>; }; - - spidev: spidev@0 { - status = "disabled"; - - compatible = "linux,spidev"; - /* spi default max clock 100Mhz */ - spi-max-frequency = <100000000>; - reg = <0>; - }; }; &i2c2 { diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts index cfd8e63e2e04..2f319aec5764 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts @@ -506,13 +506,4 @@ status = "disabled"; gpio-irq = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>; }; - - spidev: spidev@0 { - status = "disabled"; - - compatible = "linux,spidev"; - /* spi default max clock 100Mhz */ - spi-max-frequency = <100000000>; - reg = <0>; - }; }; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts index 79a8111f6c22..7c6a43b6209a 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/spi0.dts @@ -7,14 +7,17 @@ __overlay__ { status = "okay"; - }; - }; - fragment@1 { - target = <&spidev>; + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - status = "okay"; + spidev: spidev@0 { + status = "okay"; + compatible = "linux,spidev"; + reg = <0>; + /* spi default max clock 100Mhz */ + spi-max-frequency = <100000000>; + }; }; }; }; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts index 79a8111f6c22..7c6a43b6209a 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/spi0.dts @@ -7,14 +7,17 @@ __overlay__ { status = "okay"; - }; - }; - fragment@1 { - target = <&spidev>; + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - status = "okay"; + spidev: spidev@0 { + status = "okay"; + compatible = "linux,spidev"; + reg = <0>; + /* spi default max clock 100Mhz */ + spi-max-frequency = <100000000>; + }; }; }; };