From: Nick Xie Date: Wed, 12 Aug 2020 02:48:14 +0000 (+0800) Subject: arm64: dts: overlay: move onewire to dtbo X-Git-Tag: khadas-vims-v0.9.6-release~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d40268c9872a09eab028903f342c0ea5490712e;p=platform%2Fkernel%2Flinux-amlogic.git arm64: dts: overlay: move onewire to dtbo Signed-off-by: Nick Xie --- diff --git a/arch/arm64/boot/dts/amlogic/kvim2_linux.dts b/arch/arm64/boot/dts/amlogic/kvim2_linux.dts index 23d682739565..7fd84e2c2fb8 100644 --- 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 159fc928e900..a9f738157540 100644 --- 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 508f412fb097..d1e63d5c4286 100644 --- 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 d8270e4183e7..07af2740de8d 100644 --- 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 4836380fceca..95cd62f2bff7 100644 --- 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 index 000000000000..212351dc4435 --- /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 4836380fceca..95cd62f2bff7 100644 --- 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 index 000000000000..212351dc4435 --- /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 1763d09b8299..741f36e228e9 100644 --- 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 index 000000000000..d4e68ef892da --- /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 1763d09b8299..741f36e228e9 100644 --- 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 index 000000000000..d4e68ef892da --- /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"; + }; + }; +};