diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index f72147d755d8..af77ee07fb13 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -733,6 +733,16 @@ gpio-reset { /delete-node/ usb_hub_en; }; + + parport0: parport@0 { + compatible = "parport,odroid"; + status = "disabled"; + }; + + parport1: parport@1 { + compatible = "parport,odroid"; + status = "disabled"; + }; }; /* end of / */ &audiobus { diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi index 5ebc87532437..18be0a2e5bdd 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi @@ -347,6 +347,16 @@ #cooling-cells = <2>; cooling-levels = <0 120 170 220>; }; + + parport0: parport@0 { + compatible = "parport,odroid"; + status = "disabled"; + }; + + parport1: parport@1 { + compatible = "parport,odroid"; + status = "disabled"; + }; }; /* end of / */ &soc_thermal { diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile index 97ebe25a3e1d..bca7777992d1 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile @@ -23,7 +23,9 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo \ pwm_cd.dtbo \ pwm_ef.dtbo \ pwm_a-pwmfan.dtbo \ - pwm_b-backlight.dtbo + pwm_b-backlight.dtbo \ + gpio-joystick0.dtbo \ + gpio-joystick1.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick0.dts new file mode 100644 index 000000000000..b43843029e4e --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick0.dts @@ -0,0 +1,29 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target = <&parport0>; + + __overlay__ { + status = "okay"; + + data-gpios = <&gpio GPIOX_2 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_1 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_8 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_9 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_13 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_16 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_12 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_0 GPIO_ACTIVE_LOW>; + + status-gpios = <&gpio GPIOX_5 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_3 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_4 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_7 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick1.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick1.dts new file mode 100644 index 000000000000..8da94aa104ee --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio-joystick1.dts @@ -0,0 +1,37 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target = <&parport1>; + + __overlay__ { + status = "okay"; + + data-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_15 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_19 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_14 GPIO_ACTIVE_LOW>, + <&gpio GPIOH_6 GPIO_ACTIVE_LOW>, + <&gpio GPIOH_7 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_10 GPIO_ACTIVE_LOW>, + <&gpio GPIOH_5 GPIO_ACTIVE_LOW>; + + status-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_14 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_15 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + }; + }; + + fragment@1 { + target = <&i2c3>; + + __overlay__ { + status = "disabled"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile index 81843a843dae..c3b9e5e34250 100644 --- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile @@ -14,11 +14,13 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo \ onewire.dtbo \ can0.dtbo \ fanspeed-full.dtbo \ - gpio_spdif.dtbo \ + gpio_spdif.dtbo \ pwm_cd.dtbo \ pwm_ef.dtbo \ pwm_c-pwmfan.dtbo \ - pwm_d-backlight.dtbo + pwm_d-backlight.dtbo \ + gpio-joystick0.dtbo \ + gpio-joystick1.dtbo targets += $(dtbo-y) always := $(dtbo-y) diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick0.dts new file mode 100644 index 000000000000..ebacb0605e40 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick0.dts @@ -0,0 +1,29 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target = <&parport0>; + + __overlay__ { + status = "okay"; + + data-gpios = <&gpio GPIOX_2 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_1 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_8 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_9 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_13 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_16 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_12 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_0 GPIO_ACTIVE_LOW>; + + status-gpios = <&gpio GPIOA_13 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_3 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_4 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_7 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick1.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick1.dts new file mode 100644 index 000000000000..24270d0a089d --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio-joystick1.dts @@ -0,0 +1,37 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target = <&parport1>; + + __overlay__ { + status = "okay"; + + data-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_15 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_6 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_14 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_4 GPIO_ACTIVE_LOW>, + <&gpio GPIOA_12 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_10 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_19 GPIO_ACTIVE_LOW>; + + status-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_14 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_15 GPIO_ACTIVE_LOW>, + <&gpio GPIOX_5 GPIO_ACTIVE_LOW>; + }; + }; + + fragment@1 { + target = <&i2c3>; + + __overlay__ { + status = "disabled"; + }; + }; +};