| Message ID | 20180425125449.19755-1-kishon@ti.com |
|---|---|
| Headers | show |
| Series | dra7: mmc: Update mmc dt node to use sdhci-omap | expand |
On Wed, Apr 25, 2018 at 7:54 AM, Kishon Vijay Abraham I <kishon@ti.com> wrote: > From: Hari Nagalla <hnagalla@ti.com> > > Wilink8 module is a combo wireless connectivity card based > on Texas Instrument's wl18xx solution. > > Add support for the wlan capabilities of this module by muxing > the relevant mmc lines, and setting the required device-tree > data. > > Signed-off-by: Eyal Reizer <eyalr@ti.com> > Signed-off-by: Hari Nagalla <hnagalla@ti.com> > [nsekhar@ti.com: drop WLAN_EN pinmux. It should be done by bootloader. > Also, some commit message adjustments] > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > arch/arm/boot/dts/dra72-evm-common.dtsi | 42 +++++++++++++++++++++++ > arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 ++++++ > 2 files changed, 53 insertions(+) > > diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi > index 8e3b185d864b..1e4d36e33a1b 100644 > --- a/arch/arm/boot/dts/dra72-evm-common.dtsi > +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi > @@ -44,6 +44,16 @@ > regulator-boot-on; > }; > > + evm_3v6: fixedregulator-evm_3v6 { > + compatible = "regulator-fixed"; > + regulator-name = "evm_3v6"; > + regulator-min-microvolt = <3600000>; > + regulator-max-microvolt = <3600000>; > + vin-supply = <&evm_5v0>; > + regulator-always-on; > + regulator-boot-on; > + }; > + > vsys_3v3: fixedregulator-vsys3v3 { > /* Output 2 of TPS43351QDAPRQ1 on dra72-evm */ > /* Output 2 of LM5140QRWGTQ1 on dra71-evm */ > @@ -171,6 +181,15 @@ > clocks = <&atl_clkin2_ck>; > }; > }; > + > + vmmcwl_fixed: fixedregulator-mmcwl { > + compatible = "regulator-fixed"; > + regulator-name = "vmmcwl_fixed"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + gpio = <&gpio5 8 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > }; > > &dra7_pmx_core { > @@ -398,6 +417,29 @@ > max-frequency = <192000000>; > }; > > +&mmc4 { > + status = "okay"; > + vmmc-supply = <&evm_3v6>; > + vqmmc-supply = <&vmmcwl_fixed>; > + bus-width = <4>; > + cap-power-off-card; > + keep-power-in-suspend; > + non-removable; > + pinctrl-names = "default", "hs", "sdr12", "sdr25"; > + pinctrl-0 = <&mmc4_pins_default>; > + pinctrl-1 = <&mmc4_pins_default>; > + pinctrl-2 = <&mmc4_pins_default>; > + pinctrl-3 = <&mmc4_pins_default>; > + #address-cells = <1>; > + #size-cells = <0>; > + wlcore: wlcore@2 { wifi@2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tony, On Wednesday 25 April 2018 07:05 PM, Tony Lindgren wrote: > * Kishon Vijay Abraham I <kishon@ti.com> [180425 12:57]: >> --- a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi >> +++ b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi >> @@ -49,6 +49,17 @@ >> >; >> }; >> >> + mmc1_pins_default_no_clk_pu: mmc1_pins_default_no_clk_pu { >> + pinctrl-single,pins = < >> + DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */ >> + DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ >> + DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ >> + DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ >> + DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ >> + DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ >> + >; >> + }; >> + >> mmc1_pins_sdr12: mmc1_pins_sdr12 { >> pinctrl-single,pins = < >> DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ >> -- > > If this data is the same for all of them, why don't you add something > like dra7-iodelay.dtsi that can be included as needed? okay, I'll add dra7-mmc-iodelay.dtsi and send a new revision. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob, On Wednesday 25 April 2018 08:17 PM, Rob Herring wrote: > On Wed, Apr 25, 2018 at 7:54 AM, Kishon Vijay Abraham I <kishon@ti.com> wrote: >> From: Hari Nagalla <hnagalla@ti.com> >> >> The wilink module is a combo wireless connectivity sdio >> card based on Texas Instrument's wl18xx solution. It is a >> 4-wire, 1.8V, embedded sdio wlan device with an external >> irq line and is power-controlled by a gpio-based fixed >> regulator. >> >> Add pinmux configuration and IODelay values for MMC4. >> On dra7-evm, MMC4 is used for connecting to wilink module. >> >> IODelay data credits to : Vishal Mahaveer <vishalm@ti.com> >> and Sekhar Nori <nsekhar@ti.com> >> >> Signed-off-by: Ido Yariv <ido@wizery.com> >> Signed-off-by: Eyal Reizer <eyalr@ti.com> >> Signed-off-by: Hari Nagalla <hnagalla@ti.com> >> Signed-off-by: Sekhar Nori <nsekhar@ti.com> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> arch/arm/boot/dts/dra7-evm-common.dtsi | 15 +++++++++++++++ >> arch/arm/boot/dts/dra7-evm.dts | 25 +++++++++++++++++++++++++ >> 2 files changed, 40 insertions(+) >> >> diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi >> index 05a7b1a01bc3..3590c40fc112 100644 >> --- a/arch/arm/boot/dts/dra7-evm-common.dtsi >> +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi >> @@ -260,3 +260,18 @@ >> &pcie1_rc { >> status = "okay"; >> }; >> + >> +&mmc4 { >> + bus-width = <4>; >> + cap-power-off-card; >> + keep-power-in-suspend; >> + non-removable; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + wlcore: wlcore@2 { > > wifi@2 sure, I'll fix it in the next revision. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Previous version of the patch series was sent here https://lkml.org/lkml/2018/2/6/250 Most of the patches sent for v2 was merged. Remaining unmerged patches from v2 and a few additional patches are sent here. This series should be merged only after [1]. [1] -> https://marc.info/?l=linux-kernel&m=152465820531802&w=2 This series: *) Adds wilink wlan support (Now all MMC instances in DRA7 will use sdhci-omap) *) Add a new pinctrl group for clk line without pullup required for UHS cards to work reliably. *) Update README to make sure users update .config file from 4.18 kernel. *) Use sdhci-omap programming model. In the "Use sdhci-omap programming model" patch, "ti,omap4-hsmmc" compatible is removed. This is because if both "ti,dra7-sdhci" and "ti,omap4-hsmmc" is added and if there is probe deferral in sdhci_omap driver, the device is binding to omap_hsmmc driver. Once omap_hsmmc and sdhci_omap driver are feature identical, sdhci_omap driver will be made to support omap_hsmmc binding (including "ti,omap4-hsmmc" compatible) and omap_hsmmc driver will be removed. Till then dt nodes with "ti,omap4-hsmmc" compatible will use omap_hsmmc driver and "ti,dra7-sdhci" compatible will use sdhci_omap driver. Hari Nagalla (2): ARM: dts: dra72-evm-common: Add wilink8 wlan support ARM: dts: dra7-evm: Add wilink8 wlan support Kishon Vijay Abraham I (11): ARM: dts: dra72-evm-common: Remove mmc specific pinmux ARM: dts: dra71-evm: Add "vqmmc-supply" property for mmc2 ARM: dts: dra72x-mmc-iodelay: Add a new pinctrl group for clk line without pullup ARM: dts: dra74x-mmc-iodelay: Add a new pinctrl group for clk line without pullup ARM: dts: dra76x-mmc-iodelay: Add a new pinctrl group for clk line without pullup ARM: dts: am57xx-idk: Use pinctrl group from dra7xx-mmc-iodelay.dtsi to select pulldown ARM: dts: dra71-evm: Use pinctrl group from dra72x-mmc-iodelay.dtsi to select pulldown ARM: dts: dra7-evm: Model EVM_3V6 regulator ARM: dts: dra7: Use sdhci-omap programming model ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node Documentation: ARM: Add new MMC requirements for DRA7/K2G Sekhar Nori (1): ARM: dts: am574x-idk: Add pinmux configuration for MMC Vishal Mahaveer (1): ARM: dts: dra76-evm: Add wilink8 wlan support Documentation/arm/OMAP/README | 4 ++ arch/arm/boot/dts/am571x-idk.dts | 2 +- arch/arm/boot/dts/am572x-idk.dts | 2 +- arch/arm/boot/dts/am574x-idk.dts | 19 +++++ .../boot/dts/am57xx-beagle-x15-common.dtsi | 4 +- arch/arm/boot/dts/am57xx-beagle-x15.dts | 1 + arch/arm/boot/dts/am57xx-idk-common.dtsi | 3 +- arch/arm/boot/dts/dra7-evm-common.dtsi | 15 ++++ arch/arm/boot/dts/dra7-evm.dts | 68 ++++++++++++++++++ arch/arm/boot/dts/dra7.dtsi | 30 ++++---- arch/arm/boot/dts/dra71-evm.dts | 16 +---- arch/arm/boot/dts/dra72-evm-common.dtsi | 71 +++++++++++-------- arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 22 ++++++ arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 11 +++ arch/arm/boot/dts/dra76-evm.dts | 34 ++++++++- arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 11 +++ 16 files changed, 248 insertions(+), 65 deletions(-) -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html