-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bugfix - some rockchip64 patches needed adjustments
They were breaking compilation. Tested for building
- Loading branch information
1 parent
7989d03
commit a3d29f4
Showing
6 changed files
with
35 additions
and
37 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
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
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
27 changes: 13 additions & 14 deletions
27
patch/kernel/rockchip64-current/rk3399-pci-rockchip-support-ep-gpio-undefined-case.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 |
|---|---|---|
| @@ -1,29 +1,28 @@ | ||
| From 002593cfe8fc7539a6aa2dfb246d832e0b8b8516 Mon Sep 17 00:00:00 2001 | ||
| From: Aditya Prayoga <aditya@kobol.io> | ||
| Date: Tue, 15 Sep 2020 13:29:45 +0700 | ||
| From 9de42a7ce7b821596a151cfaa0aca79d53c2170f Mon Sep 17 00:00:00 2001 | ||
| From: Igor Pecovnik <igor.pecovnik@gmail.com> | ||
| Date: Sun, 7 Mar 2021 15:24:02 +0100 | ||
| Subject: [PATCH] PCI: rockchip: support ep-gpio undefined case | ||
|
|
||
| Signed-off-by: Aditya Prayoga <aditya@kobol.io> | ||
| Changed by: Igor Pecovnik <igor.pecovnik@gmail.com> | ||
| --- | ||
| drivers/pci/controller/pcie-rockchip.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| drivers/pci/controller/pcie-rockchip.c | 3 +-- | ||
| 1 file changed, 1 insertion(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c | ||
| index c53d1322a..e4f42591d 100644 | ||
| index 990a00e08..193d26562 100644 | ||
| --- a/drivers/pci/controller/pcie-rockchip.c | ||
| +++ b/drivers/pci/controller/pcie-rockchip.c | ||
| @@ -119,9 +119,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) | ||
| @@ -118,8 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) | ||
| } | ||
|
|
||
| if (rockchip->is_rc) { | ||
| - rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH); | ||
| - rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", | ||
| - GPIOD_OUT_HIGH); | ||
| + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH); | ||
| if (IS_ERR(rockchip->ep_gpio)) { | ||
| - dev_err(dev, "missing ep-gpios property in node\n"); | ||
| + dev_err(dev, "invalid ep-gpios property in node\n"); | ||
| return PTR_ERR(rockchip->ep_gpio); | ||
| } | ||
| } | ||
| if (IS_ERR(rockchip->ep_gpio)) | ||
| return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio), | ||
| "failed to get ep GPIO\n"); | ||
| -- | ||
| Created with Armbian build tools https://github.com/armbian/build | ||
|
|
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
29 changes: 14 additions & 15 deletions
29
patch/kernel/rockchip64-dev/rk3399-pci-rockchip-support-ep-gpio-undefined-case.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 |
|---|---|---|
| @@ -1,29 +1,28 @@ | ||
| From 002593cfe8fc7539a6aa2dfb246d832e0b8b8516 Mon Sep 17 00:00:00 2001 | ||
| From: Aditya Prayoga <aditya@kobol.io> | ||
| Date: Tue, 15 Sep 2020 13:29:45 +0700 | ||
| Subject: [PATCH] PCI: rockchip: support ep-gpio undefined case | ||
| From 9de42a7ce7b821596a151cfaa0aca79d53c2170f Mon Sep 17 00:00:00 2001 | ||
| From: Igor Pecovnik <igor.pecovnik@gmail.com> | ||
| Date: Sun, 7 Mar 2021 15:24:02 +0100 | ||
| Subject: [PATCH] oo | ||
|
|
||
| Signed-off-by: Aditya Prayoga <aditya@kobol.io> | ||
| Changed by: Igor Pecovnik <igor.pecovnik@gmail.com> | ||
| --- | ||
| drivers/pci/controller/pcie-rockchip.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| drivers/pci/controller/pcie-rockchip.c | 3 +-- | ||
| 1 file changed, 1 insertion(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c | ||
| index c53d1322a..e4f42591d 100644 | ||
| index 990a00e08..193d26562 100644 | ||
| --- a/drivers/pci/controller/pcie-rockchip.c | ||
| +++ b/drivers/pci/controller/pcie-rockchip.c | ||
| @@ -119,9 +119,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) | ||
| @@ -118,8 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) | ||
| } | ||
|
|
||
| if (rockchip->is_rc) { | ||
| - rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH); | ||
| - rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", | ||
| - GPIOD_OUT_HIGH); | ||
| + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH); | ||
| if (IS_ERR(rockchip->ep_gpio)) { | ||
| - dev_err(dev, "missing ep-gpios property in node\n"); | ||
| + dev_err(dev, "invalid ep-gpios property in node\n"); | ||
| return PTR_ERR(rockchip->ep_gpio); | ||
| } | ||
| } | ||
| if (IS_ERR(rockchip->ep_gpio)) | ||
| return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio), | ||
| "failed to get ep GPIO\n"); | ||
| -- | ||
| Created with Armbian build tools https://github.com/armbian/build | ||
|
|