-
Notifications
You must be signed in to change notification settings - Fork 144
Add SD card support for Shikra #905
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
Open
mchunara007
wants to merge
2
commits into
qualcomm-linux:early/hwe/shikra/dt
Choose a base branch
from
mchunara007:shikra_sd
base: early/hwe/shikra/dt
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+148
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| #include <dt-bindings/clock/qcom,shikra-gcc.h> | ||
| #include <dt-bindings/interconnect/qcom,rpm-icc.h> | ||
| #include <dt-bindings/interconnect/qcom,shikra.h> | ||
| #include <dt-bindings/interconnect/qcom,icc.h> | ||
| #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
| #include <dt-bindings/power/qcom-rpmpd.h> | ||
|
|
||
|
|
@@ -332,6 +333,52 @@ | |
| dma-ranges = <0x0 0x0 0x0 0x0 0x10 0x0>; | ||
| ranges = <0x0 0x0 0x0 0x0 0x10 0x0>; | ||
|
|
||
| sdhc_2: mmc@4784000 { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. place node in increasing order of node address |
||
| compatible = "qcom,shikra-sdhci", "qcom,sdhci-msm-v5"; | ||
| reg = <0x0 0x4784000 0x0 0x1000>; | ||
|
|
||
| interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>, | ||
| <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; | ||
| interrupt-names = "hc_irq", "pwr_irq"; | ||
|
|
||
| bus-width = <4>; | ||
| no-sdio; | ||
| no-mmc; | ||
|
|
||
| clocks = <&gcc GCC_SDCC2_AHB_CLK>, | ||
| <&gcc GCC_SDCC2_APPS_CLK>, | ||
| <&rpmcc RPM_SMD_XO_CLK_SRC>; | ||
| clock-names = "iface", "core", "xo"; | ||
|
|
||
| qcom,dll-config = <0x0007442c>; | ||
| qcom,ddr-config = <0x80040868>; | ||
|
|
||
| iommus = <&apps_smmu 0x0a0 0x0>; | ||
|
|
||
| interconnects = <&system_noc MASTER_SDCC_2 QCOM_ICC_TAG_ALWAYS | ||
| &mc_virt SLAVE_EBI_CH0 QCOM_ICC_TAG_ALWAYS>, | ||
| <&mem_noc MASTER_AMPSS_M0 QCOM_ICC_TAG_ACTIVE_ONLY | ||
| &config_noc SLAVE_SDCC_2 QCOM_ICC_TAG_ACTIVE_ONLY>; | ||
| interconnect-names = "sdhc-ddr","cpu-sdhc"; | ||
| operating-points-v2 = <&sdhc2_opp_table>; | ||
|
|
||
| status = "disabled"; | ||
|
|
||
| sdhc2_opp_table: opp-table-2 { | ||
| compatible = "operating-points-v2"; | ||
|
|
||
| opp-100000000 { | ||
| opp-hz = /bits/ 64 <100000000>; | ||
| required-opps = <&rpmpd_opp_low_svs>; | ||
| }; | ||
|
|
||
| opp-202000000 { | ||
| opp-hz = /bits/ 64 <202000000>; | ||
| required-opps = <&rpmpd_opp_nom>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| tcsr_mutex: syscon@340000 { | ||
| compatible = "qcom,tcsr-mutex"; | ||
| reg = <0x0 0x00340000 0x0 0x20000>; | ||
|
|
@@ -364,6 +411,53 @@ | |
| drive-strength = <2>; | ||
| bias-disable; | ||
| }; | ||
|
|
||
| sdc2_default: sdc2-default-state { | ||
| clk-pins { | ||
| pins = "sdc2_clk"; | ||
| drive-strength = <14>; | ||
| bias-disable; | ||
| }; | ||
|
|
||
| cmd-pins { | ||
| pins = "sdc2_cmd"; | ||
| drive-strength = <14>; | ||
| bias-pull-up; | ||
| }; | ||
|
|
||
| data-pins { | ||
| pins = "sdc2_data"; | ||
| drive-strength = <14>; | ||
| bias-pull-up; | ||
| }; | ||
| }; | ||
|
|
||
| sdc2_sleep: sdc2-sleep-state { | ||
| clk-pins { | ||
| pins = "sdc2_clk"; | ||
| drive-strength = <2>; | ||
| bias-disable; | ||
| }; | ||
|
|
||
| cmd-pins { | ||
| pins = "sdc2_cmd"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| }; | ||
|
|
||
| data-pins { | ||
| pins = "sdc2_data"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| }; | ||
| }; | ||
|
|
||
| sdc2_card_det_n: sd-card-det-n-state { | ||
| pins = "gpio89"; | ||
| function = "gpio"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| }; | ||
| }; | ||
|
|
||
| mem_noc: interconnect@d00000 { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
follow alphabetical order