diff --git a/adafruit-pitft.py b/adafruit-pitft.py index 24a296e..5acb81a 100755 --- a/adafruit-pitft.py +++ b/adafruit-pitft.py @@ -260,9 +260,7 @@ def install_drivers(): shell.pushd("st7789_module") if not shell.run_command("make"): warn_exit("Apt failed to compile ST7789V drivers!") - shell.run_command("mv /lib/modules/{rel}/kernel/drivers/gpu/drm/tiny/mi0283qt.ko /lib/modules/{rel}/kernel/drivers/gpu/drm/tiny/mi0283qt.BACK".format(rel=shell.release())) shell.run_command("mv /lib/modules/{rel}/kernel/drivers/staging/fbtft/fb_st7789v.ko /lib/modules/{rel}/kernel/drivers/staging/fbtft/fb_st7789v.BACK".format(rel=shell.release())) - shell.run_command("mv st7789v_ada.ko /lib/modules/{rel}/kernel/drivers/gpu/drm/tiny/mi0283qt.ko".format(rel=shell.release())) shell.run_command("mv fb_st7789v.ko /lib/modules/{rel}/kernel/drivers/staging/fbtft/fb_st7789v.ko".format(rel=shell.release())) shell.popd() return True diff --git a/overlays/minipitft114-overlay-new.dts b/overlays/minipitft114-overlay-new.dts deleted file mode 100644 index 9aa2aa2..0000000 --- a/overlays/minipitft114-overlay-new.dts +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Device Tree overlay for Adafruit Mini PiTFT 1.14" 135x240 Display - * - */ - -/dts-v1/; -/plugin/; - -/ { - compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; - - fragment@0 { - target = <&spi0>; - __overlay__ { - status = "okay"; - - spidev@0{ - status = "disabled"; - }; - - spidev@1{ - status = "disabled"; - }; - }; - }; - - fragment@1 { - target = <&gpio>; - __overlay__ { - pitft_pins: pitft_pins { - brcm,pins = <25>; - brcm,function = <1>; /* out */ - brcm,pull = <0>; /* none */ - }; - }; - }; - - fragment@2 { - target = <&spi0>; - __overlay__ { - /* needed to avoid dtc warning */ - #address-cells = <1>; - #size-cells = <0>; - - pitft: pitft@0{ - compatible = "sitronix,st7789v"; - reg = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&pitft_pins>; - spi-max-frequency = <32000000>; - rotate = <270>; - width = <135>; - height = <240>; - buswidth = <8>; - dc-gpios = <&gpio 25 0>; - led-gpios = <&gpio 26 0>; - debug = <0>; - }; - }; - }; - - - __overrides__ { - speed = <&pitft>,"spi-max-frequency:0"; - rotate = <&pitft>,"rotate:0"; - width = <&pitft>,"width:0"; - height = <&pitft>,"height:0"; - fps = <&pitft>,"fps:0"; - debug = <&pitft>,"debug:0"; - }; -}; diff --git a/overlays/minipitft114-overlay.dts b/overlays/minipitft114-overlay.dts index 49c49a3..9aa2aa2 100644 --- a/overlays/minipitft114-overlay.dts +++ b/overlays/minipitft114-overlay.dts @@ -1,5 +1,5 @@ /* - * Device Tree overlay for Adafruit Mini PiTFT 1.14" Display + * Device Tree overlay for Adafruit Mini PiTFT 1.14" 135x240 Display * */ @@ -7,72 +7,65 @@ /plugin/; / { - compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; + compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; - fragment@0 { - target = <&spi0>; - __overlay__ { - status = "okay"; + fragment@0 { + target = <&spi0>; + __overlay__ { + status = "okay"; - spidev@0{ - status = "disabled"; - }; + spidev@0{ + status = "disabled"; + }; - }; - }; + spidev@1{ + status = "disabled"; + }; + }; + }; - fragment@1 { - target = <&gpio>; - __overlay__ { - pitft_pins: pitft_pins { - brcm,pins = <25>; /* dc pin */ - brcm,function = <1>; /* out */ - brcm,pull = <0>; /* no pull */ - }; - }; - }; + fragment@1 { + target = <&gpio>; + __overlay__ { + pitft_pins: pitft_pins { + brcm,pins = <25>; + brcm,function = <1>; /* out */ + brcm,pull = <0>; /* none */ + }; + }; + }; - fragment@2 { - target = <&spi0>; - __overlay__ { - /* needed to avoid dtc warning */ - #address-cells = <1>; - #size-cells = <0>; + fragment@2 { + target = <&spi0>; + __overlay__ { + /* needed to avoid dtc warning */ + #address-cells = <1>; + #size-cells = <0>; - pitft: pitft@0{ - compatible = "multi-inno,mi0283qt"; - reg = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&pitft_pins>; + pitft: pitft@0{ + compatible = "sitronix,st7789v"; + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pitft_pins>; + spi-max-frequency = <32000000>; + rotate = <270>; + width = <135>; + height = <240>; + buswidth = <8>; + dc-gpios = <&gpio 25 0>; + led-gpios = <&gpio 26 0>; + debug = <0>; + }; + }; + }; - spi-max-frequency = <32000000>; - rotation = <90>; - width = <136>; - height = <240>; - col_offset = <53>; - row_offset = <40>; - dc-gpios = <&gpio 25 0>; - backlight = <&backlight>; - }; - }; - }; - fragment@3 { - target-path = "/soc"; - __overlay__ { - backlight: backlight { - compatible = "gpio-backlight"; - gpios = <&gpio 22 0>; - }; - }; - }; - - __overrides__ { - speed = <&pitft>,"spi-max-frequency:0"; - rotation = <&pitft>,"rotation:0"; - width = <&pitft>,"width:0"; - height = <&pitft>,"height:0"; - col_offset = <&pitft>,"col_offset:0"; - row_offset = <&pitft>,"row_offset:0"; - }; + __overrides__ { + speed = <&pitft>,"spi-max-frequency:0"; + rotate = <&pitft>,"rotate:0"; + width = <&pitft>,"width:0"; + height = <&pitft>,"height:0"; + fps = <&pitft>,"fps:0"; + debug = <&pitft>,"debug:0"; + }; }; diff --git a/st7789_module/Makefile b/st7789_module/Makefile index 7f6712a..0f7575d 100644 --- a/st7789_module/Makefile +++ b/st7789_module/Makefile @@ -1,4 +1,3 @@ -obj-m += st7789v_ada.o obj-m += fb_st7789v.o KDIR ?= /lib/modules/`uname -r`/build diff --git a/st7789_module/st7789v_ada.c b/st7789_module/st7789v_ada.c deleted file mode 100644 index 1b7cdf9..0000000 --- a/st7789_module/st7789v_ada.c +++ /dev/null @@ -1,407 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * DRM driver for ST7789V panels with flexible config - * - * Copyright 2021 Melissa LeBlanc-Williams - * Copyright 2019 Limor Fried - * Copyright 2016 Noralf Trønnes - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include