| Message ID | 20181128223428.177313-4-evgreen@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | arm64: dts: qcom: sdm845: Add SD nodes | expand |
Hi, On Wed, Nov 28, 2018 at 2:34 PM Evan Green <evgreen@chromium.org> wrote: > +&sdhc_2 { > + status = "okay"; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_cd_odl>; > + > + vmmc-supply = <&vreg_l21a_2p95>; > + vqmmc-supply = <&vddpx_2>; > + > + cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>; > +}; > + > &qupv3_id_1 { Please sort alphabetically. "s" comes after "q". > + /* It seems that mmc_test reports errors if drive strength is not 16. */ Possibly put this comment right next to one of the the "drive-strength" lines? > + sd_cd_odl: sd-cd-odl { "sd_cd_odl" is the name on a different board. On sdm845 this is 'sd_card_det_n", so it'd be better to use that name. > + pinmux { > + pins = "gpio126"; > + function = "gpio"; > + }; > + > + pinconf { > + pins = "gpio126"; > + bias-pull-up; > + drive-strength = <2>; Maybe leave this off? According to Bjorn's research "drive-strength" has no affect on inputs and this is most certainly an input. -Doug
On Wed, Dec 5, 2018 at 1:19 PM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Wed, Nov 28, 2018 at 2:34 PM Evan Green <evgreen@chromium.org> wrote: > > +&sdhc_2 { > > + status = "okay"; > > + > > + pinctrl-names = "default"; > > + pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_cd_odl>; > > + > > + vmmc-supply = <&vreg_l21a_2p95>; > > + vqmmc-supply = <&vddpx_2>; > > + > > + cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>; > > +}; > > + > > &qupv3_id_1 { > > Please sort alphabetically. "s" comes after "q". I've got A through F down cold, but those later letters are spotty :) Will fix. > > > > + /* It seems that mmc_test reports errors if drive strength is not 16. */ > > Possibly put this comment right next to one of the the "drive-strength" lines? Ok. > > > > + sd_cd_odl: sd-cd-odl { > > "sd_cd_odl" is the name on a different board. On sdm845 this is > 'sd_card_det_n", so it'd be better to use that name. > > > > + pinmux { > > + pins = "gpio126"; > > + function = "gpio"; > > + }; > > + > > + pinconf { > > + pins = "gpio126"; > > + bias-pull-up; > > + drive-strength = <2>; > > Maybe leave this off? According to Bjorn's research "drive-strength" > has no affect on inputs and this is most certainly an input. Sure. Spin coming up. > > -Doug
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index d667eee4e6d03..b85e9fed14845 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -7,6 +7,7 @@ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> #include "sdm845.dtsi" @@ -348,6 +349,18 @@ clock-frequency = <400000>; }; +&sdhc_2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data &sd_cd_odl>; + + vmmc-supply = <&vreg_l21a_2p95>; + vqmmc-supply = <&vddpx_2>; + + cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>; +}; + &qupv3_id_1 { status = "okay"; }; @@ -444,3 +457,43 @@ bias-pull-up; }; }; + +&tlmm { + /* It seems that mmc_test reports errors if drive strength is not 16. */ + sdc2_clk: sdc2-clk { + pinconf { + pins = "sdc2_clk"; + bias-disable; + drive-strength = <16>; + }; + }; + + sdc2_cmd: sdc2-cmd { + pinconf { + pins = "sdc2_cmd"; + bias-pull-up; + drive-strength = <16>; + }; + }; + + sdc2_data: sdc2-data { + pinconf { + pins = "sdc2_data"; + bias-pull-up; + drive-strength = <16>; + }; + }; + + sd_cd_odl: sd-cd-odl { + pinmux { + pins = "gpio126"; + function = "gpio"; + }; + + pinconf { + pins = "gpio126"; + bias-pull-up; + drive-strength = <2>; + }; + }; +};
Enable support for the micro SD slot on the MTP. Signed-off-by: Evan Green <evgreen@chromium.org> --- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+)