Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a55ffd8
commit a3c687e
Showing
5 changed files
with
305 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Kirin 960 octa core 3/4GB SoC eMMC USB3 WiFi/BT | ||
declare -g BOARD_NAME="HiKey 960" | ||
declare -g BOARDFAMILY="uefi-arm64" | ||
declare -g BOARD_MAINTAINER="" | ||
declare -g KERNEL_TARGET="current,edge" | ||
|
||
declare -g GRUB_CMDLINE_LINUX_DEFAULT="efi=noruntime console=ttyAMA6,115200n8" | ||
declare -g BOOT_FDT_FILE="hisilicon/hi3660-hikey960.dtb" | ||
enable_extension "grub-with-dtb" |
74 changes: 74 additions & 0 deletions
74
patch/kernel/archive/uefi-arm64-6.1/board-hikey960-usb.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
Subject: arm64: dts: hisilicon: Add usb mux hub for hikey960 | ||
|
||
Add dt bindings for Kirin 960 USB HUB. Such board comes with an | ||
integrated USB HUB provided via a Microchip USB5734 4-port high-speed | ||
hub controller. | ||
|
||
[mchehab: modified it to adapt to the merged DT schema] | ||
Signed-off-by: John Stultz <john.stultz@linaro.org> | ||
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
--- | ||
|
||
.../boot/dts/hisilicon/hi3660-hikey960.dts | 35 +++++++++++++++++-- | ||
1 file changed, 33 insertions(+), 2 deletions(-) | ||
|
||
diff a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
@@ -197,6 +197,37 @@ | ||
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 @@ | ||
|
||
rt1711h_ep: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&dwc3_role_switch>; | ||
+ remote-endpoint = <&hikey_usb_ep1>; | ||
}; | ||
}; | ||
}; | ||
@@ -686,7 +717,7 @@ | ||
#size-cells = <0>; | ||
dwc3_role_switch: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&rt1711h_ep>; | ||
+ remote-endpoint = <&hikey_usb_ep0>; | ||
}; | ||
|
||
dwc3_ss: endpoint@1 { |
74 changes: 74 additions & 0 deletions
74
patch/kernel/archive/uefi-arm64-6.2/board-hikey960-usb.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
Subject: arm64: dts: hisilicon: Add usb mux hub for hikey960 | ||
|
||
Add dt bindings for Kirin 960 USB HUB. Such board comes with an | ||
integrated USB HUB provided via a Microchip USB5734 4-port high-speed | ||
hub controller. | ||
|
||
[mchehab: modified it to adapt to the merged DT schema] | ||
Signed-off-by: John Stultz <john.stultz@linaro.org> | ||
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
--- | ||
|
||
.../boot/dts/hisilicon/hi3660-hikey960.dts | 35 +++++++++++++++++-- | ||
1 file changed, 33 insertions(+), 2 deletions(-) | ||
|
||
diff a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
@@ -197,6 +197,37 @@ | ||
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 @@ | ||
|
||
rt1711h_ep: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&dwc3_role_switch>; | ||
+ remote-endpoint = <&hikey_usb_ep1>; | ||
}; | ||
}; | ||
}; | ||
@@ -686,7 +717,7 @@ | ||
#size-cells = <0>; | ||
dwc3_role_switch: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&rt1711h_ep>; | ||
+ remote-endpoint = <&hikey_usb_ep0>; | ||
}; | ||
|
||
dwc3_ss: endpoint@1 { |
74 changes: 74 additions & 0 deletions
74
patch/kernel/archive/uefi-arm64-6.3/board-hikey960-usb.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
Subject: arm64: dts: hisilicon: Add usb mux hub for hikey960 | ||
|
||
Add dt bindings for Kirin 960 USB HUB. Such board comes with an | ||
integrated USB HUB provided via a Microchip USB5734 4-port high-speed | ||
hub controller. | ||
|
||
[mchehab: modified it to adapt to the merged DT schema] | ||
Signed-off-by: John Stultz <john.stultz@linaro.org> | ||
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
--- | ||
|
||
.../boot/dts/hisilicon/hi3660-hikey960.dts | 35 +++++++++++++++++-- | ||
1 file changed, 33 insertions(+), 2 deletions(-) | ||
|
||
diff a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
@@ -197,6 +197,37 @@ | ||
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 @@ | ||
|
||
rt1711h_ep: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&dwc3_role_switch>; | ||
+ remote-endpoint = <&hikey_usb_ep1>; | ||
}; | ||
}; | ||
}; | ||
@@ -686,7 +717,7 @@ | ||
#size-cells = <0>; | ||
dwc3_role_switch: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&rt1711h_ep>; | ||
+ remote-endpoint = <&hikey_usb_ep0>; | ||
}; | ||
|
||
dwc3_ss: endpoint@1 { |
74 changes: 74 additions & 0 deletions
74
patch/kernel/archive/uefi-arm64-6.4/board-hikey960-usb.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
Subject: arm64: dts: hisilicon: Add usb mux hub for hikey960 | ||
|
||
Add dt bindings for Kirin 960 USB HUB. Such board comes with an | ||
integrated USB HUB provided via a Microchip USB5734 4-port high-speed | ||
hub controller. | ||
|
||
[mchehab: modified it to adapt to the merged DT schema] | ||
Signed-off-by: John Stultz <john.stultz@linaro.org> | ||
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | ||
--- | ||
|
||
.../boot/dts/hisilicon/hi3660-hikey960.dts | 35 +++++++++++++++++-- | ||
1 file changed, 33 insertions(+), 2 deletions(-) | ||
|
||
diff a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | ||
@@ -197,6 +197,37 @@ | ||
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 @@ | ||
|
||
rt1711h_ep: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&dwc3_role_switch>; | ||
+ remote-endpoint = <&hikey_usb_ep1>; | ||
}; | ||
}; | ||
}; | ||
@@ -686,7 +717,7 @@ | ||
#size-cells = <0>; | ||
dwc3_role_switch: endpoint@0 { | ||
reg = <0>; | ||
- remote-endpoint = <&rt1711h_ep>; | ||
+ remote-endpoint = <&hikey_usb_ep0>; | ||
}; | ||
|
||
dwc3_ss: endpoint@1 { |