Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84113?usp=email )
Change subject: soc/mediatek/common/pcie: Add DEVTREE_CONST qualifier
......................................................................
soc/mediatek/common/pcie: Add DEVTREE_CONST qualifier
Currently pcie.c is built into ramstage only, where DEVTREE_CONST is an
empty macro, so there's no problem with that. However, if we would like
to include that file in pre-ramstage, then DEVTREE_CONST would be
'const', leading to the following build error:
```
src/soc/mediatek/common/pcie.c:104:26: error: assignment discards
'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
104 | root_dev = pcidev_path_on_root(devfn);
| ^
```
BUG=none
TEST=emerge-cherry coreboot
Change-Id: Ia7c95424019ec0dca50bbc6be7f81b6180d06d6e
Signed-off-by: Yidi Lin <yidilin(a)chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84113
Reviewed-by: Jianjun Wang <jianjun.wang(a)mediatek.com>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso(a)google.com>
---
M src/soc/mediatek/common/pcie.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
build bot (Jenkins): Verified
Yu-Ping Wu: Looks good to me, approved
Jianjun Wang: Looks good to me, approved
diff --git a/src/soc/mediatek/common/pcie.c b/src/soc/mediatek/common/pcie.c
index ce9055a..c07cc4f 100644
--- a/src/soc/mediatek/common/pcie.c
+++ b/src/soc/mediatek/common/pcie.c
@@ -96,7 +96,7 @@
static uintptr_t mtk_pcie_get_controller_base(pci_devfn_t devfn)
{
- struct device *root_dev;
+ DEVTREE_CONST struct device *root_dev;
const mtk_soc_config_t *config;
static uintptr_t base = 0;
--
To view, visit https://review.coreboot.org/c/coreboot/+/84113?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ia7c95424019ec0dca50bbc6be7f81b6180d06d6e
Gerrit-Change-Number: 84113
Gerrit-PatchSet: 4
Gerrit-Owner: Yidi Lin <yidilin(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org>
Gerrit-Reviewer: Jianjun Wang <jianjun.wang(a)mediatek.com>
Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83910?usp=email )
Change subject: mb/cwwk/adl/devicetree: enable all USB ports
......................................................................
mb/cwwk/adl/devicetree: enable all USB ports
The cw-al-4l-v1.0 mainboard has two USB2 ports on a 2x5 pin header on
the mainboard and likely also routes one USB2 port to the m.2 E key slot
which is typically used for Bluetooth support when an E key m.2 WIFI +
Bluetooth card is installed.
This is untested, since I only have the cw-al-4l-v2.0 mainboard, but
from looking at the documentation of the version 1 and looking at how
things are done on the version 2 this should be correct.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: I7059a3f2d9cde0086382a4484c09d5ef33dc906d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83910
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/mainboard/cwwk/adl/devicetree.cb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Nico Huber: Looks good to me, but someone else must approve
Matt DeVillier: Looks good to me, approved
build bot (Jenkins): Verified
diff --git a/src/mainboard/cwwk/adl/devicetree.cb b/src/mainboard/cwwk/adl/devicetree.cb
index c4c5e8c..86a31e7 100644
--- a/src/mainboard/cwwk/adl/devicetree.cb
+++ b/src/mainboard/cwwk/adl/devicetree.cb
@@ -6,7 +6,10 @@
register "usb2_ports[1]" = "USB2_PORT_SHORT(OC_SKIP)"
register "usb2_ports[2]" = "USB2_PORT_SHORT(OC_SKIP)"
register "usb2_ports[3]" = "USB2_PORT_SHORT(OC_SKIP)"
+ register "usb2_ports[4]" = "USB2_PORT_SHORT(OC_SKIP)"
+ register "usb2_ports[5]" = "USB2_PORT_SHORT(OC_SKIP)"
register "usb2_ports[6]" = "USB2_PORT_SHORT(OC_SKIP)" # microSD card reader
+ register "usb2_ports[7]" = "USB2_PORT_SHORT(OC_SKIP)"
register "pch_pcie_rp[PCH_RP(1)]" = "{
.clk_src = 0,
--
To view, visit https://review.coreboot.org/c/coreboot/+/83910?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I7059a3f2d9cde0086382a4484c09d5ef33dc906d
Gerrit-Change-Number: 83910
Gerrit-PatchSet: 2
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Brandon Weeks <bweeks(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>