diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 72280f85a7..1eec1b6116 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -27,7 +27,7 @@ case $BRANCH in dev) KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.8" + KERNELBRANCH="branch:orange-pi-5.9" KERNELPATCHDIR='sunxi-'$BRANCH ;; diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index f3af6162b3..1406bb4caa 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -29,7 +29,7 @@ case $BRANCH in dev) KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.8" + KERNELBRANCH="branch:orange-pi-5.9" KERNELPATCHDIR='sunxi-'$BRANCH ;; diff --git a/patch/kernel/sunxi-dev/olimex_0014-general-add-compability-olinuxino-lcd.patch.patch b/patch/kernel/sunxi-dev/olimex_0014-general-add-compability-olinuxino-lcd.patch.patch index 1b2e871856..75c60c7f61 100644 --- a/patch/kernel/sunxi-dev/olimex_0014-general-add-compability-olinuxino-lcd.patch.patch +++ b/patch/kernel/sunxi-dev/olimex_0014-general-add-compability-olinuxino-lcd.patch.patch @@ -1,22 +1,11 @@ -From 94a9a1d977605676a6de81812074924109f5ec17 Mon Sep 17 00:00:00 2001 -From: Mitko Gamishev -Date: Wed, 5 Feb 2020 15:04:32 +0200 -Subject: [PATCH 14/48] general-add-compability-olinuxino-lcd.patch - ---- - drivers/gpu/drm/panel/panel-simple.c | 135 ++++++++++++++++++++++++--- - 1 file changed, 123 insertions(+), 12 deletions(-) - diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index e14c14ac62b5..ad10dd8858cf 100644 +index cb6550d37..e58a27e24 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -2332,21 +2332,48 @@ static const struct panel_desc okaya_rs800480t_7x0gp = { +@@ -2845,6 +2845,44 @@ static const struct panel_desc okaya_rs800480t_7x0gp = { .bus_format = MEDIA_BUS_FMT_RGB666_1X18, }; --static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { -- .clock = 9000, +static const struct drm_display_mode olimex_vga_olinuxino_800_mode = { + .clock = 40000, + .hdisplay = 800, @@ -27,7 +16,6 @@ index e14c14ac62b5..ad10dd8858cf 100644 + .vsync_start = 600 + 5, + .vsync_end = 600 + 5 + 4, + .vtotal = 600 + 5 + 4 + 19, -+ .vrefresh = 60, +}; + +static const struct drm_display_mode olimex_vga_olinuxino_1024_mode = { @@ -40,27 +28,27 @@ index e14c14ac62b5..ad10dd8858cf 100644 + .vsync_start = 600 + 2, + .vsync_end = 600 + 2 + 21, + .vtotal = 600 + 2 + 21 + 2, -+ .vrefresh = 60, +}; + + +static const struct drm_display_mode olimex_lcd_olinuxino_43_mode = { + .clock = 12000, - .hdisplay = 480, -- .hsync_start = 480 + 5, -- .hsync_end = 480 + 5 + 30, -- .htotal = 480 + 5 + 30 + 10, ++ .hdisplay = 480, + .hsync_start = 480 + 8, + .hsync_end = 480 + 8 + 20, + .htotal = 480 + 8 + 20 + 23, - .vdisplay = 272, -- .vsync_start = 272 + 8, -- .vsync_end = 272 + 8 + 5, -- .vtotal = 272 + 8 + 5 + 3, ++ .vdisplay = 272, + .vsync_start = 272 + 4, + .vsync_end = 272 + 4 + 10, + .vtotal = 272 + 4 + 10 + 13, - .vrefresh = 60, ++}; ++ ++ + static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { + .clock = 9000, + .hdisplay = 480, +@@ -2857,8 +2895,8 @@ static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { + .vtotal = 272 + 8 + 5 + 3, }; -static const struct panel_desc olimex_lcd_olinuxino_43ts = { @@ -70,7 +58,7 @@ index e14c14ac62b5..ad10dd8858cf 100644 .num_modes = 1, .size = { .width = 95, -@@ -2355,6 +2382,74 @@ static const struct panel_desc olimex_lcd_olinuxino_43ts = { +@@ -2867,6 +2905,71 @@ static const struct panel_desc olimex_lcd_olinuxino_43ts = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, }; @@ -84,7 +72,6 @@ index e14c14ac62b5..ad10dd8858cf 100644 + .vsync_start = 480 + 22, + .vsync_end = 480 + 22 + 10, + .vtotal = 480 + 22 + 10 + 13, -+ .vrefresh = 60, +}; + +static const struct panel_desc olimex_lcd_olinuxino_5 = { @@ -106,7 +93,6 @@ index e14c14ac62b5..ad10dd8858cf 100644 + .vsync_start = 480 + 22, + .vsync_end = 480 + 22 + 10, + .vtotal = 480 + 22 + 10 + 13, -+ .vrefresh = 60, +}; + +static const struct panel_desc olimex_lcd_olinuxino_7 = { @@ -129,7 +115,6 @@ index e14c14ac62b5..ad10dd8858cf 100644 + .vsync_start = 600 + 1, + .vsync_end = 600 + 1 + 1, + .vtotal = 600 + 1 + 1 + 22, -+ .vrefresh = 60, +}; + +static const struct panel_desc olimex_lcd_olinuxino_10 = { @@ -145,18 +130,18 @@ index e14c14ac62b5..ad10dd8858cf 100644 /* * 800x480 CVT. The panel appears to be quite accepting, at least as far as * pixel clocks, but this is the timing that was being used in the Adafruit -@@ -3411,9 +3506,25 @@ static const struct of_device_id platform_of_match[] = { +@@ -3991,9 +4094,25 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "okaya,rs800480t-7x0gp", .data = &okaya_rs800480t_7x0gp, -+ },{ ++ }, { + .compatible = "olimex,olinuxino-vga-800x600", + .data = &olimex_vga_olinuxino_800_mode, -+ },{ ++ }, { + .compatible = "olimex,olinuxino-vga-1024x768", + .data = &olimex_vga_olinuxino_1024_mode, + -+ },{ ++ }, { + .compatible = "olimex,lcd-olinuxino-4.3", + .data = &olimex_lcd_olinuxino_43, + }, { @@ -173,6 +158,3 @@ index e14c14ac62b5..ad10dd8858cf 100644 }, { .compatible = "ontat,yx700wv03", .data = &ontat_yx700wv03, --- -2.25.1 -