Skip to content

Commit

Permalink
uefi-* / edge: bump to 6.12; rework arm64 Phytium stmmac acpi patches
Browse files Browse the repository at this point in the history
- recover lost patches in 6.9/6.10 cycle
  • Loading branch information
rpardini committed Oct 13, 2024
1 parent 46cddfa commit 067a485
Show file tree
Hide file tree
Showing 3 changed files with 737 additions and 1 deletion.
2 changes: 1 addition & 1 deletion config/sources/families/include/uefi_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ case "${BRANCH}" in
;;

edge)
declare -g KERNEL_MAJOR_MINOR="6.10"
declare -g KERNEL_MAJOR_MINOR="6.12"
;;
esac

Expand Down
77 changes: 77 additions & 0 deletions patch/kernel/archive/uefi-arm64-6.12/board-hikey960-usb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com>
Date: Thu, 31 Aug 2023 11:41:14 +0200
Subject: [ARCHEOLOGY] Add board: HiKey960

> X-Git-Archeology: - Revision d8200e5c383c1c77569596bfd2b8886ef8258c3f: https://github.com/armbian/build/commit/d8200e5c383c1c77569596bfd2b8886ef8258c3f
> X-Git-Archeology: Date: Thu, 31 Aug 2023 11:41:14 +0200
> X-Git-Archeology: From: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com>
> X-Git-Archeology: Subject: Add board: HiKey960
> X-Git-Archeology:
---
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 35 +++++++++-
1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -197,6 +197,37 @@ optee {
method = "smc";
};
};
+
+ usb_hub_vdd: usb_hub_vdd {
+ compatible = "regulator-fixed";
+ regulator-name = "hub-vdd";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio5 6 0>;
+ enable-active-high;
+ };
+
+ usb-hub {
+ compatible = "hisilicon,usbhub";
+ typec-vbus-gpios = <&gpio25 2 GPIO_ACTIVE_HIGH>;
+ otg-switch-gpios = <&gpio25 6 GPIO_ACTIVE_HIGH>;
+ hub-vdd-supply = <&usb_hub_vdd>;
+ usb-role-switch;
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ hikey_usb_ep0: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&dwc3_role_switch>;
+ };
+ hikey_usb_ep1: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&rt1711h_ep>;
+ };
+ };
+ };
};

/*
@@ -564,7 +595,7 @@ port {

rt1711h_ep: endpoint@0 {
reg = <0>;
- remote-endpoint = <&dwc3_role_switch>;
+ remote-endpoint = <&hikey_usb_ep1>;
};
};
};
@@ -686,7 +717,7 @@ port {
#size-cells = <0>;
dwc3_role_switch: endpoint@0 {
reg = <0>;
- remote-endpoint = <&rt1711h_ep>;
+ remote-endpoint = <&hikey_usb_ep0>;
};

dwc3_ss: endpoint@1 {
--
Armbian

Loading

0 comments on commit 067a485

Please sign in to comment.