arm64: dts: overlay: move onewire to dtbo

Signed-off-by: Nick Xie <nick@khadas.com>

diff --git a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts
index 23d682739565f46ac228936ac36c2067e513d389..7fd84e2c2fb86bf72938ec4c085f232df61fdc30 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts
@@ -1195,8 +1195,8 @@
 
     onewire:onewire {
         compatible = "w1-gpio";
-        gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
-        status = "disable";
+        gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
+        status = "disabled";
     };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
index 159fc928e900fbba2d97213e4a6906e83f4cb073..a9f738157540225c051c130aeccef72bdf491ec3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
@@ -836,7 +836,7 @@
     onewire:onewire {
                compatible = "w1-gpio";
                gpios = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
-               status = "disable";
+               status = "disabled";
        };
 
        sensor: sensor {

diff --git a/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts
index 508f412fb097ae3383be69d00f266e3166ae8495..d1e63d5c4286f0fb17cdf95238084ca342d8545c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts
@@ -1060,6 +1060,11 @@
                status = "okay";
        };
 
+       onewire:onewire {
+               compatible = "w1-gpio";
+               gpios = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
+               status = "disabled";
+       };
 }; /* end of / */
 
 &meson_fb {

diff --git a/arch/arm64/boot/dts/amlogic/kvim_linux.dts b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
index d8270e4183e7c75dcbb383ece2eec51e9b84a397..07af2740de8de6d78fd8c9a87de79e628b87fad3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
@@ -1142,8 +1142,8 @@
 
     onewire:onewire {
         compatible = "w1-gpio";
-        gpios = <&gpio_ao GPIOAO_1 GPIO_ACTIVE_HIGH>;
-        status = "disable";
+        gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
+        status = "disabled";
     };
 
 };

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
index 4836380fcecadd7ed589575108c5fe874772929f..95cd62f2bff7f6deea4641a2f8488b48e0446221 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
@@ -1,4 +1,5 @@
-dtbo-y += uart4.dtbo
+dtbo-y += uart4.dtbo \
+                 onewire.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim/onewire.dts
new file mode 100644 (file)
index 0000000..212351d
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim/onewire.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       // onewire using GPIOH_5
+       fragment@0 {
+               target = <&onewire>;
+
+               __overlay__ {
+                       status = "okay";
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
index 4836380fcecadd7ed589575108c5fe874772929f..95cd62f2bff7f6deea4641a2f8488b48e0446221 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
@@ -1,4 +1,5 @@
-dtbo-y += uart4.dtbo
+dtbo-y += uart4.dtbo \
+                 onewire.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim2/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim2/onewire.dts
new file mode 100644 (file)
index 0000000..212351d
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim2/onewire.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       // onewire using GPIOH_5
+       fragment@0 {
+               target = <&onewire>;
+
+               __overlay__ {
+                       status = "okay";
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim3/Makefile
index 1763d09b8299cec8138d76156020a369e6868e77..741f36e228e9f08cbc8171b415dec9354b15129e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim3/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3/Makefile
@@ -1,7 +1,8 @@
 dtbo-y += uart3.dtbo \
                  pwm_f.dtbo \
                  i2c3.dtbo \
-                 spi1.dtbo
+                 spi1.dtbo \
+                 onewire.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim3/onewire.dts
new file mode 100644 (file)
index 0000000..d4e68ef
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3/onewire.dts
@@ -0,0 +1,30 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       // onewire using GPIOH_6, so we have to disable pwm_f & uart_C
+       // which share the same pins
+       fragment@0 {
+               target = <&onewire>;
+
+               __overlay__ {
+                       status = "okay";
+               };
+       };
+
+       fragment@1 {
+               target = <&spicc1>;
+
+               __overlay__ {
+                       status = "disabled";
+               };
+       };
+
+       fragment@2 {
+               target = <&uart_C>;
+
+               __overlay__ {
+                       status = "disabled";
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/Makefile
index 1763d09b8299cec8138d76156020a369e6868e77..741f36e228e9f08cbc8171b415dec9354b15129e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/Makefile
@@ -1,7 +1,8 @@
 dtbo-y += uart3.dtbo \
                  pwm_f.dtbo \
                  i2c3.dtbo \
-                 spi1.dtbo
+                 spi1.dtbo \
+                 onewire.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/onewire.dts
new file mode 100644 (file)
index 0000000..d4e68ef
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/onewire.dts
@@ -0,0 +1,30 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+       // onewire using GPIOH_6, so we have to disable pwm_f & uart_C
+       // which share the same pins
+       fragment@0 {
+               target = <&onewire>;
+
+               __overlay__ {
+                       status = "okay";
+               };
+       };
+
+       fragment@1 {
+               target = <&spicc1>;
+
+               __overlay__ {
+                       status = "disabled";
+               };
+       };
+
+       fragment@2 {
+               target = <&uart_C>;
+
+               __overlay__ {
+                       status = "disabled";
+               };
+       };
+};