Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate DesignWare I2C driver to new PCIe system #16222

Merged
merged 8 commits into from May 21, 2019
Merged

Migrate DesignWare I2C driver to new PCIe system #16222

merged 8 commits into from May 21, 2019

Conversation

ghost
Copy link

@ghost ghost commented May 17, 2019

This only affects the galileo and up_squared boards, as they are the only targets that use the PCI functionality of the driver. I've refactored a few things to make adding future Apollo Lake targets easier.

Fixes: #13963

Charles E. Youse added 3 commits May 16, 2019 13:19
This option is no longer used in the dts_fixup.h file since there
are no SBL-specific fixups.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This needs to be pushed down to the SoC level, as it's an Apollo Lake
feature, not a feature of the UpSquared. Remove the Apollo Lake
references to the PCI devices because these will not be used when I2C
support is restored.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
The SBL configuration no longer differs in any detail (except its name)
from the "standard" UpSquared configuration, so it is removed.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
@ghost ghost requested review from nashif, andyross, andrewboie and dcpleung May 17, 2019 01:29
@ghost ghost requested review from galak and wentongwu as code owners May 17, 2019 01:29
@ghost ghost added area: Boards area: X86 x86 Architecture (32-bit) labels May 17, 2019
@ghost
Copy link
Author

ghost commented May 17, 2019

I have physically confirmed the driver still works properly on a galileo with an I2C blinkM.

@zephyrbot
Copy link
Collaborator

zephyrbot commented May 17, 2019

All checks are passing now.

Review history of this comment for details about previous failed status.
Note that some checks might have not completed yet.

Charles E. Youse added 4 commits May 16, 2019 18:40
The 50-odd lines of boilerplate per I2C port is moved into a template
which is generated by CMake as needed at build-time.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
The legacy PCI support in the DesignWare I2C driver is replaced with
the new PCIe support. The Intel Quark X1000 SoC and the galileo board
configurations are updated accordingly.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
The Apollo Lake devicetree is augmented with its 8 I2C interfaces.
The default number of dynamic IRQ stubs is increased to deal with
these new interfaces having IRQ vector detection at runtime.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
I2C support has been added back into the up_squared, leveraging the
new PCIe support in the DesignWare I2C driver.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
Copy link
Contributor

@andyross andyross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly the devicetree stuff is a little beyond me, but the C changes look great.

boards/x86/galileo/Kconfig.defconfig Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented May 18, 2019

Force-push to restart CI checks after @ulfalizer's updates.

@ulfalizer
Copy link
Collaborator

CI fix merged now.

@ulfalizer
Copy link
Collaborator

ulfalizer commented May 20, 2019

recheck

Looks like recheck is broken.

Mark myself (reluctant) owner of the Designware I2C driver.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
@ghost
Copy link
Author

ghost commented May 20, 2019

Looks like recheck is broken.

Yeah. I've force-pushed again.. fingers crossed!

@nashif nashif merged commit 7b8f8ba into zephyrproject-rtos:master May 21, 2019
@ghost ghost deleted the dw_i2c_pcie branch June 23, 2019 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Boards area: X86 x86 Architecture (32-bit)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

up_squared: evaluate removal of SBL-related special configurations
5 participants