arm64: dts: overlay: VIM1/VIM2: move i2c0 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 5241506..3caf916 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts
@@ -1234,6 +1234,13 @@
        status = "okay";
 };
 
+&i2c0 {
+       status = "disabled";
+       clock-frequency = <400000>;
+       pinctrl-names="default";
+       pinctrl-0=<&a_i2c_master>;
+};
+
 &i2c1 {
        status = "okay";
        clock-frequency = <400000>;

diff --git a/arch/arm64/boot/dts/amlogic/kvim_linux.dts b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
index 59341a5..142ad24 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/kvim_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
@@ -1192,7 +1192,7 @@
 };
 
 &i2c0 {
-       status = "okay";
+       status = "disabled";
        clock-frequency = <400000>;
        pinctrl-names="default";
        pinctrl-0=<&a_i2c_master>;

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
index 1ac05ba..ac668a3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim/Makefile
@@ -1,7 +1,8 @@
 dtbo-y += uart4.dtbo \
                  onewire.dtbo \
                  pwm_ao_a.dtbo \
-                 pwm_f.dtbo
+                 pwm_f.dtbo \
+                 i2c0.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

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

diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
index 0d274c4..50135b0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim2/Makefile
@@ -1,6 +1,7 @@
 dtbo-y += uart4.dtbo \
                  onewire.dtbo \
-                 pwm_d.dtbo
+                 pwm_d.dtbo \
+                 i2c0.dtbo
 
 targets += $(dtbo-y)
 always  := $(dtbo-y)

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