From 44eb43e24d83b0caf8ac342c58d9f1bc4dab716f Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 9 Jan 2024 21:56:48 +0900 Subject: [PATCH] ODROID-COMMON: dtb/dtbo: sort out common node entries Since many entries in Tiny DRM device tree are common, they are moved to common file and keep 'compatible=...' to each display device tree overlay file. Signed-off-by: Dongjin Kim Change-Id: Ib4b3daac14f07ca2769450450998fa83bfa65497 --- .../overlays/odroidm1/display_tinydrm.dtsi | 49 +++++++++++++++++++ .../odroidm1/display_waveshare_1inch47.dts | 48 ++---------------- .../odroidm1/display_waveshare_1inch69.dts | 48 ++---------------- .../odroidm1s/display_st7735_128x128.dts | 48 ++---------------- .../overlays/odroidm1s/display_tinydrm.dtsi | 47 ++++++++++++++++++ .../odroidm1s/display_waveshare_1inch47.dts | 48 ++---------------- .../odroidm1s/display_waveshare_1inch69.dts | 48 ++---------------- 7 files changed, 111 insertions(+), 225 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_tinydrm.dtsi create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_tinydrm.dtsi diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_tinydrm.dtsi b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_tinydrm.dtsi new file mode 100644 index 000000000000..6ac29732e433 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_tinydrm.dtsi @@ -0,0 +1,49 @@ +/dts-v1/; +/plugin/; + +#include +#include + +/ { + fragment@0 { + target = <&spi1>; + + __overlay__ { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + tinydrm: lcd@0 { + status = "okay"; + reg = <0>; + spi-max-frequency = <100000000>; + + backlight = <&backlight_gpio>; + dc-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + + pinctrl-names = "default"; + pinctrl-0 = <&display_pins>; + + display_pins: display-pins { + rockchip,pins = <3 RK_PD1 0 &pcfg_pull_none>, + <0 RK_PC1 0 &pcfg_pull_none>; + }; + }; + }; + }; + + fragment@1 { + target-path = "/"; + + __overlay__ { + backlight_gpio: backlight-gpio { + status = "okay"; + compatible = "gpio-backlight"; + + gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch47.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch47.dts index e91f797f3e2d..0d126628e01b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch47.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch47.dts @@ -1,50 +1,8 @@ /dts-v1/; /plugin/; -#include -#include +#include "display_tinydrm.dtsi" -/ { - fragment@0 { - target = <&spi1>; - - __overlay__ { - status = "okay"; - - #address-cells = <1>; - #size-cells = <0>; - - lcd@0 { - status = "okay"; - compatible = "waveshare,ws1inch47"; - reg = <0>; - spi-max-frequency = <100000000>; - - backlight = <&backlight_gpio>; - dc-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&display_pins>; - - display_pins: display-pins { - rockchip,pins = <3 RK_PD1 0 &pcfg_pull_none>, - <0 RK_PC1 0 &pcfg_pull_none>; - }; - }; - }; - }; - - fragment@1 { - target-path = "/"; - - __overlay__ { - backlight_gpio: backlight-gpio { - status = "okay"; - compatible = "gpio-backlight"; - - gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; - }; - }; - }; +&tinydrm { + compatible = "waveshare,ws1inch47"; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch69.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch69.dts index a1d2e4855867..0ec11cdaf071 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch69.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1/display_waveshare_1inch69.dts @@ -1,50 +1,8 @@ /dts-v1/; /plugin/; -#include -#include +#include "display_tinydrm.dtsi" -/ { - fragment@0 { - target = <&spi1>; - - __overlay__ { - status = "okay"; - - #address-cells = <1>; - #size-cells = <0>; - - lcd@0 { - status = "okay"; - compatible = "waveshare,ws1inch69"; - reg = <0>; - spi-max-frequency = <100000000>; - - backlight = <&backlight_gpio>; - dc-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&display_pins>; - - display_pins: display-pins { - rockchip,pins = <3 RK_PD1 0 &pcfg_pull_none>, - <0 RK_PC1 0 &pcfg_pull_none>; - }; - }; - }; - }; - - fragment@1 { - target-path = "/"; - - __overlay__ { - backlight_gpio: backlight-gpio { - status = "okay"; - compatible = "gpio-backlight"; - - gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; - }; - }; - }; +&tinydrm { + compatible = "waveshare,ws1inch69"; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_st7735_128x128.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_st7735_128x128.dts index 9464ccaa326e..a2b35d701999 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_st7735_128x128.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_st7735_128x128.dts @@ -1,50 +1,8 @@ /dts-v1/; /plugin/; -#include -#include +#include "display_tinydrm.dtsi" -/ { - fragment@0 { - target = <&spi1>; - - __overlay__ { - status = "okay"; - - #address-cells = <1>; - #size-cells = <0>; - - lcd@0 { - status = "okay"; - compatible = "jianda,jd-t18003-t01"; - reg = <0>; - spi-max-frequency = <100000000>; - - backlight = <&backlight_gpio>; - dc-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&display_pins>; - - display_pins: display-pins { - rockchip,pins = <2 RK_PB0 0 &pcfg_pull_none>, - <0 RK_PC1 0 &pcfg_pull_none>; - }; - }; - }; - }; - - fragment@1 { - target-path = "/"; - - __overlay__ { - backlight_gpio: backlight-gpio { - status = "okay"; - compatible = "gpio-backlight"; - - gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; - }; - }; - }; +&tinydrm { + compatible = "jianda,jd-t18003-t01"; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_tinydrm.dtsi b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_tinydrm.dtsi new file mode 100644 index 000000000000..512f3fefb9cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_tinydrm.dtsi @@ -0,0 +1,47 @@ +#include +#include + +/ { + fragment@0 { + target = <&spi1>; + + __overlay__ { + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + tinydrm: lcd@0 { + status = "okay"; + reg = <0>; + spi-max-frequency = <100000000>; + + backlight = <&backlight_gpio>; + dc-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; + + pinctrl-names = "default"; + pinctrl-0 = <&display_pins>; + + display_pins: display-pins { + rockchip,pins = <2 RK_PB0 0 &pcfg_pull_none>, + <0 RK_PC1 0 &pcfg_pull_none>; + }; + }; + }; + }; + + fragment@1 { + target-path = "/"; + + __overlay__ { + backlight_gpio: backlight-gpio { + status = "okay"; + compatible = "gpio-backlight"; + + gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; + }; + }; + }; +}; + diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch47.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch47.dts index 94556db8e4db..0d126628e01b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch47.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch47.dts @@ -1,50 +1,8 @@ /dts-v1/; /plugin/; -#include -#include +#include "display_tinydrm.dtsi" -/ { - fragment@0 { - target = <&spi1>; - - __overlay__ { - status = "okay"; - - #address-cells = <1>; - #size-cells = <0>; - - lcd@0 { - status = "okay"; - compatible = "waveshare,ws1inch47"; - reg = <0>; - spi-max-frequency = <100000000>; - - backlight = <&backlight_gpio>; - dc-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&display_pins>; - - display_pins: display-pins { - rockchip,pins = <2 RK_PB0 0 &pcfg_pull_none>, - <0 RK_PC1 0 &pcfg_pull_none>; - }; - }; - }; - }; - - fragment@1 { - target-path = "/"; - - __overlay__ { - backlight_gpio: backlight-gpio { - status = "okay"; - compatible = "gpio-backlight"; - - gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; - }; - }; - }; +&tinydrm { + compatible = "waveshare,ws1inch47"; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch69.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch69.dts index 5090a0a41c4a..0ec11cdaf071 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch69.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/display_waveshare_1inch69.dts @@ -1,50 +1,8 @@ /dts-v1/; /plugin/; -#include -#include +#include "display_tinydrm.dtsi" -/ { - fragment@0 { - target = <&spi1>; - - __overlay__ { - status = "okay"; - - #address-cells = <1>; - #size-cells = <0>; - - lcd@0 { - status = "okay"; - compatible = "waveshare,ws1inch69"; - reg = <0>; - spi-max-frequency = <100000000>; - - backlight = <&backlight_gpio>; - dc-gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&display_pins>; - - display_pins: display-pins { - rockchip,pins = <2 RK_PB0 0 &pcfg_pull_none>, - <0 RK_PC1 0 &pcfg_pull_none>; - }; - }; - }; - }; - - fragment@1 { - target-path = "/"; - - __overlay__ { - backlight_gpio: backlight-gpio { - status = "okay"; - compatible = "gpio-backlight"; - - gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; - }; - }; - }; +&tinydrm { + compatible = "waveshare,ws1inch69"; };