This series adds DT nodes and documentation for eDMA and MMC IPs on
Keystone 66AK2G SoC. Also enable the required configs in keystone_defconfig.
This series depends on Keerthy's gpio node patches on 66AK2G:
https://patchwork.kernel.org/patch/9864311/
Tested:
k2g-evm with rootfs on mmc: http://pastebin.ubuntu.com/25217978/
Lokesh Vutla (5):
dt-bindings: ti,edma: Add 66AK2G specific information
dt-bindings: ti,omap-hsmmc: Add 66AK2G mmc controller
ARM: dts: keystone-k2g: add MMC0 and MMC1 nodes
ARM: dts: keystone-k2g-evm: Enable MMC0 and MMC1
ARM: configs: keystone: Enable MMC and regulators
Peter Ujfalusi (1):
ARM: dts: keystone-k2g: Add eDMA nodes
Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++++++++++--
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 ++++++++----
arch/arm/boot/dts/keystone-k2g-evm.dts | 53 ++++++++++++
arch/arm/boot/dts/keystone-k2g.dtsi | 98 ++++++++++++++++++++++
arch/arm/configs/keystone_defconfig | 4 +
5 files changed, 282 insertions(+), 20 deletions(-)
--
2.13.0
Update the ti,omap-hsmmc.txt to include information about
66AK2G specific mmc controller. Also cleanup the entries
under optional properties to look a bit nicer.
Signed-off-by: Lokesh Vutla <[email protected]>
---
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 +++++++++++++++-------
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index 0e026c151c1c..016741402e37 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -1,33 +1,55 @@
-* TI Highspeed MMC host controller for OMAP
+* TI Highspeed MMC host controller for OMAP and 66AK2G family.
-The Highspeed MMC Host Controller on TI OMAP family
+The Highspeed MMC Host Controller on TI OMAP and 66AK2G family
provides an interface for MMC, SD, and SDIO types of memory cards.
This file documents differences between the core properties described
by mmc.txt and the properties used by the omap_hsmmc driver.
Required properties:
+--------------------
- compatible:
Should be "ti,omap2-hsmmc", for OMAP2 controllers
Should be "ti,omap3-hsmmc", for OMAP3 controllers
Should be "ti,omap3-pre-es3-hsmmc" for OMAP3 controllers pre ES3.0
Should be "ti,omap4-hsmmc", for OMAP4 controllers
Should be "ti,am33xx-hsmmc", for AM335x controllers
-- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+ Should be "ti,k2g-hsmmc", "ti,omap4-hsmmc" for 66AK2G controllers.
+
+SoC specific required properties:
+---------------------------------
+The following are mandatory properties for OMAPs, AM33xx and AM43xx SoCs only:
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1.
+
+The following are mandatory properties for 66AK2G SoCs only:
+- power-domains:Should contain a phandle to a PM domain provider node
+ and an args specifier containing the MMC device id
+ value. This property is as per the binding,
+ Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+- clocks: Must contain an entry for each entry in clock-names. Should
+ be defined as per the he appropriate clock bindings consumer
+ usage in Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+- clock-names: Shall be "fck" for the functional clock,
+ and "mmchsdb_fck" for the debounce clock.
+
Optional properties:
-ti,dual-volt: boolean, supports dual voltage cards
-<supply-name>-supply: phandle to the regulator device tree node
-"supply-name" examples are "vmmc", "vmmc_aux"(deprecated)/"vqmmc" etc
-ti,non-removable: non-removable slot (like eMMC)
-ti,needs-special-reset: Requires a special softreset sequence
-ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
-dmas: List of DMA specifiers with the controller specific format
-as described in the generic DMA client binding. A tx and rx
-specifier is required.
-dma-names: List of DMA request names. These strings correspond
-1:1 with the DMA specifiers listed in dmas. The string naming is
-to be "rx" and "tx" for RX and TX DMA requests, respectively.
+--------------------
+- ti,dual-volt: boolean, supports dual voltage cards
+- <supply-name>-supply: phandle to the regulator device tree node
+ "supply-name" examples are "vmmc",
+ "vmmc_aux"(deprecated)/"vqmmc" etc
+- ti,non-removable: non-removable slot (like eMMC)
+- ti,needs-special-reset: Requires a special softreset sequence
+- ti,needs-special-hs-handling: HSMMC IP needs special setting
+ for handling High Speed
+- dmas: List of DMA specifiers with the controller specific
+ format as described in the generic DMA client
+ binding. A tx and rx specifier is required.
+- dma-names: List of DMA request names. These strings correspond
+ 1:1 with the DMA specifiers listed in dmas.
+ The string naming is to be "rx" and "tx" for
+ RX and TX DMA requests, respectively.
Examples:
--
2.13.0
Update ti,edma binding documentation to reflect 66AK2G specific
properties.
Signed-off-by: Lokesh Vutla <[email protected]>
---
Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++++++++++++--
1 file changed, 90 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt
index 18090e7226b4..05fe2931d025 100644
--- a/Documentation/devicetree/bindings/dma/ti-edma.txt
+++ b/Documentation/devicetree/bindings/dma/ti-edma.txt
@@ -9,7 +9,12 @@ execute the actual DMA tansfer.
eDMA3 Channel Controller
Required properties:
-- compatible: "ti,edma3-tpcc" for the channel controller(s)
+--------------------
+- compatible: Should be:
+ - "ti,edma3-tpcc" for the channel controller(s) on OMAP,
+ AM33xx and AM43xx SoCs.
+ - "ti,k2g-edma3-tpcc", "ti,edma3-tpcc" for the
+ channel controller(s) on 66AK2G.
- #dma-cells: Should be set to <2>. The first number is the DMA request
number and the second is the TC the channel is serviced on.
- reg: Memory map of eDMA CC
@@ -19,8 +24,19 @@ Required properties:
- ti,tptcs: List of TPTCs associated with the eDMA in the following form:
<&tptc_phandle TC_priority_number>. The highest priority is 0.
+SoC-specific Required properties:
+--------------------------------
+The following are mandatory properties for OMAP, AM33xx and AM43xx SoCs only:
+- ti,hwmods: Name of the hwmods associated to the eDMA CC.
+
+The following are mandatory properties for 66AK2G SoCs only:
+- power-domains:Should contain a phandle to a PM domain provider node
+ and an args specifier containing the device id
+ value. This property is as per the binding,
+ Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+
Optional properties:
-- ti,hwmods: Name of the hwmods associated to the eDMA CC
+-------------------
- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow
these channels will be SW triggered channels. See example.
- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by
@@ -31,17 +47,34 @@ Optional properties:
eDMA3 Transfer Controller
Required properties:
-- compatible: "ti,edma3-tptc" for the transfer controller(s)
+--------------------
+- compatible: Should be:
+ - "ti,edma3-tptc" for the transfer controller(s) on OMAP,
+ AM33xx and AM43xx SoCs.
+ - "ti,k2g-edma3-tptc", "ti,edma3-tptc" for the
+ transfer controller(s) on 66AK2G.
- reg: Memory map of eDMA TC
- interrupts: Interrupt number for TCerrint.
+SoC-specific Required properties:
+--------------------------------
+The following are mandatory properties for OMAP, AM33xx and AM43xx SoCs only:
+- ti,hwmods: Name of the hwmods associated to the eDMA TC.
+
+The following are mandatory properties for 66AK2G SoCs only:
+- power-domains:Should contain a phandle to a PM domain provider node
+ and an args specifier containing the device id
+ value. This property is as per the binding,
+ Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+
Optional properties:
-- ti,hwmods: Name of the hwmods associated to the given eDMA TC
+-------------------
- interrupt-names: "edma3_tcerrint"
------------------------------------------------------------------------------
-Example:
+Examples:
+1.
edma: edma@49000000 {
compatible = "ti,edma3-tpcc";
ti,hwmods = "tpcc";
@@ -109,6 +142,58 @@ mcasp0: mcasp@48038000 {
dma-names = "tx", "rx";
};
+2.
+edma1: edma@02728000 {
+ compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";
+ reg = <0x02728000 0x8000>;
+ reg-names = "edma3_cc";
+ interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 219 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 220 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "edma3_ccint", "emda3_mperr",
+ "edma3_ccerrint";
+ dma-requests = <64>;
+ #dma-cells = <2>;
+
+ ti,tptcs = <&edma1_tptc0 7>, <&edma1_tptc1 0>;
+
+ /*
+ * memcpy is disabled, can be enabled with:
+ * ti,edma-memcpy-channels = <12 13 14 15>;
+ * for example.
+ */
+
+ power-domains = <&k2g_pds 0x4f>;
+};
+
+edma1_tptc0: tptc@027b0000 {
+ compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x027b0000 0x400>;
+ power-domains = <&k2g_pds 0x4f>;
+};
+
+edma1_tptc1: tptc@027b8000 {
+ compatible = "ti, k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x027b8000 0x400>;
+ power-domains = <&k2g_pds 0x4f>;
+};
+
+mmc0: mmc@23000000 {
+ compatible = "ti,k2g-hsmmc", "ti,omap4-hsmmc";
+ reg = <0x23000000 0x400>;
+ interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
+ dmas = <&edma1 24 0>, <&edma1 25 0>;
+ dma-names = "tx", "rx";
+ bus-width = <4>;
+ ti,needs-special-reset;
+ no-1-8-v;
+ max-frequency = <96000000>;
+ power-domains = <&k2g_pds 0xb>;
+ clocks = <&k2g_clks 0xb 1>, <&k2g_clks 0xb 2>;
+ clock-names = "fck", "mmchsdb_fck";
+ status = "disabled";
+};
+
------------------------------------------------------------------------------
DEPRECATED binding, new DTS files must use the ti,edma3-tpcc/ti,edma3-tptc
binding.
--
2.13.0
From: Peter Ujfalusi <[email protected]>
Add nodes for eDMA0 and eDMA1.
Signed-off-by: Peter Ujfalusi <[email protected]>
Signed-off-by: Dave Gerlach <[email protected]>
Signed-off-by: Lokesh Vutla <[email protected]>
---
arch/arm/boot/dts/keystone-k2g.dtsi | 66 +++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index f9ff29972295..3f1fd3df76d5 100644
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -210,5 +210,71 @@
clocks = <&k2g_clks 0x001c 0x0>;
clock-names = "gpio";
};
+
+ edma0: edma@02700000 {
+ compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";
+ reg = <0x02700000 0x8000>;
+ reg-names = "edma3_cc";
+ interrupts = <GIC_SPI 200 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "edma3_ccint", "emda3_mperr",
+ "edma3_ccerrint";
+ dma-requests = <64>;
+ #dma-cells = <2>;
+
+ ti,tptcs = <&edma0_tptc0 7>, <&edma0_tptc1 0>;
+
+ ti,edma-memcpy-channels = <32 33 34 35>;
+
+ power-domains = <&k2g_pds 0x3f>;
+ };
+
+ edma0_tptc0: tptc@02760000 {
+ compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x02760000 0x400>;
+ power-domains = <&k2g_pds 0x3f>;
+ };
+
+ edma0_tptc1: tptc@02768000 {
+ compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x02768000 0x400>;
+ power-domains = <&k2g_pds 0x3f>;
+ };
+
+ edma1: edma@02728000 {
+ compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";
+ reg = <0x02728000 0x8000>;
+ reg-names = "edma3_cc";
+ interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 219 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 220 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "edma3_ccint", "emda3_mperr",
+ "edma3_ccerrint";
+ dma-requests = <64>;
+ #dma-cells = <2>;
+
+ ti,tptcs = <&edma1_tptc0 7>, <&edma1_tptc1 0>;
+
+ /*
+ * memcpy is disabled, can be enabled with:
+ * ti,edma-memcpy-channels = <12 13 14 15>;
+ * for example.
+ */
+
+ power-domains = <&k2g_pds 0x4f>;
+ };
+
+ edma1_tptc0: tptc@027b0000 {
+ compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x027b0000 0x400>;
+ power-domains = <&k2g_pds 0x4f>;
+ };
+
+ edma1_tptc1: tptc@027b8000 {
+ compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
+ reg = <0x027b8000 0x400>;
+ power-domains = <&k2g_pds 0x4f>;
+ };
};
};
--
2.13.0
Enable the TI OMAP HSMMC and fixed regulator support
for keystone platforms.
Signed-off-by: Lokesh Vutla <[email protected]>
---
arch/arm/configs/keystone_defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index d47ea43d097e..3397e91a5db1 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -156,6 +156,8 @@ CONFIG_POWER_RESET_KEYSTONE=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_DAVINCI_WATCHDOG=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
@@ -164,6 +166,8 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_DWC3=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_KEYSTONE_USB_PHY=y
+CONFIG_MMC=y
+CONFIG_MMC_OMAP_HS=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
--
2.13.0
Add device tree nodes for MMC0 and MMC1 pesent
on 66AK2G device.
Signed-off-by: Lokesh Vutla <[email protected]>
[[email protected]: fix clock-names for mmc1 node]
Signed-off-by: Sekhar Nori <[email protected]>
---
arch/arm/boot/dts/keystone-k2g.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 3f1fd3df76d5..9ecea2c27d76 100644
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -276,5 +276,37 @@
reg = <0x027b8000 0x400>;
power-domains = <&k2g_pds 0x4f>;
};
+
+ mmc0: mmc@23000000 {
+ compatible = "ti,k2g-hsmmc", "ti,omap4-hsmmc";
+ reg = <0x23000000 0x400>;
+ interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
+ dmas = <&edma1 24 0>, <&edma1 25 0>;
+ dma-names = "tx", "rx";
+ bus-width = <4>;
+ ti,needs-special-reset;
+ no-1-8-v;
+ max-frequency = <96000000>;
+ power-domains = <&k2g_pds 0xb>;
+ clocks = <&k2g_clks 0xb 1>, <&k2g_clks 0xb 2>;
+ clock-names = "fck", "mmchsdb_fck";
+ status = "disabled";
+ };
+
+ mmc1: mmc@23100000 {
+ compatible = "ti,k2g-hsmmc", "ti,omap4-hsmmc";
+ reg = <0x23100000 0x400>;
+ interrupts = <GIC_SPI 97 IRQ_TYPE_EDGE_RISING>;
+ dmas = <&edma1 26 0>, <&edma1 27 0>;
+ dma-names = "tx", "rx";
+ bus-width = <8>;
+ ti,needs-special-reset;
+ ti,non-removable;
+ max-frequency = <96000000>;
+ power-domains = <&k2g_pds 0xc>;
+ clocks = <&k2g_clks 0xc 1>, <&k2g_clks 0xc 2>;
+ clock-names = "fck", "mmchsdb_fck";
+ status = "disabled";
+ };
};
};
--
2.13.0
Enable MMC0 which is used for micro SD and MMC1 which is used for the on
board EMMC.
Signed-off-by: Lokesh Vutla <[email protected]>
[[email protected]: add mmc1, bufferclass and pullup/pulldown settings]
Signed-off-by: Franklin S Cooper Jr <[email protected]>
[[email protected]: add card detect GPIO support]
Signed-off-by: Sekhar Nori <[email protected]>
---
arch/arm/boot/dts/keystone-k2g-evm.dts | 53 ++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts
index 61883cb969d2..f47f95d8bf1c 100644
--- a/arch/arm/boot/dts/keystone-k2g-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2g-evm.dts
@@ -25,6 +25,13 @@
reg = <0x00000008 0x00000000 0x00000000 0x80000000>;
};
+ vcc3v3_dcin_reg: fixedregulator-vcc3v3-dcin {
+ compatible = "regulator-fixed";
+ regulator-name = "mmc0_fixed";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
};
&k2g_pinctrl {
@@ -34,6 +41,33 @@
K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
>;
};
+
+ mmc0_pins: pinmux_mmc0_pins {
+ pinctrl-single,pins = <
+ K2G_CORE_IOPAD(0x1300) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat3.mmc0_dat3 */
+ K2G_CORE_IOPAD(0x1304) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat2.mmc0_dat2 */
+ K2G_CORE_IOPAD(0x1308) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat1.mmc0_dat1 */
+ K2G_CORE_IOPAD(0x130c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat0.mmc0_dat0 */
+ K2G_CORE_IOPAD(0x1310) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_clk.mmc0_clk */
+ K2G_CORE_IOPAD(0x1314) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_cmd.mmc0_cmd */
+ K2G_CORE_IOPAD(0x12ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* mmc0_sdcd.gpio1_12 */
+ >;
+ };
+
+ mmc1_pins: pinmux_mmc1_pins {
+ pinctrl-single,pins = <
+ K2G_CORE_IOPAD(0x10ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat7.mmc1_dat7 */
+ K2G_CORE_IOPAD(0x10f0) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat6.mmc1_dat6 */
+ K2G_CORE_IOPAD(0x10f4) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat5.mmc1_dat5 */
+ K2G_CORE_IOPAD(0x10f8) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat4.mmc1_dat4 */
+ K2G_CORE_IOPAD(0x10fc) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat3.mmc1_dat3 */
+ K2G_CORE_IOPAD(0x1100) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat2.mmc1_dat2 */
+ K2G_CORE_IOPAD(0x1104) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat1.mmc1_dat1 */
+ K2G_CORE_IOPAD(0x1108) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat0.mmc1_dat0 */
+ K2G_CORE_IOPAD(0x110c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_clk.mmc1_clk */
+ K2G_CORE_IOPAD(0x1110) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc1_cmd */
+ >;
+ };
};
&uart0 {
@@ -41,3 +75,22 @@
pinctrl-0 = <&uart0_pins>;
status = "okay";
};
+
+&gpio1 {
+ status = "okay";
+};
+
+&mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
+ vmmc-supply = <&vcc3v3_dcin_reg>;
+ cd-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+&mmc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ vmmc-supply = <&vcc3v3_dcin_reg>; /* VCC3V3_EMMC is connected to VCC3V3_DCIN */
+ status = "okay";
+};
--
2.13.0
On 2017-08-01 07:41, Lokesh Vutla wrote:
> Update ti,edma binding documentation to reflect 66AK2G specific
> properties.
>
> Signed-off-by: Lokesh Vutla <[email protected]>
> ---
> Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++++++++++++--
> 1 file changed, 90 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt
> index 18090e7226b4..05fe2931d025 100644
> --- a/Documentation/devicetree/bindings/dma/ti-edma.txt
> +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt
> @@ -9,7 +9,12 @@ execute the actual DMA tansfer.
> eDMA3 Channel Controller
>
> Required properties:
> -- compatible: "ti,edma3-tpcc" for the channel controller(s)
> +--------------------
> +- compatible: Should be:
> + - "ti,edma3-tpcc" for the channel controller(s) on OMAP,
> + AM33xx and AM43xx SoCs.
> + - "ti,k2g-edma3-tpcc", "ti,edma3-tpcc" for the
> + channel controller(s) on 66AK2G.
> - #dma-cells: Should be set to <2>. The first number is the DMA request
> number and the second is the TC the channel is serviced on.
> - reg: Memory map of eDMA CC
> @@ -19,8 +24,19 @@ Required properties:
> - ti,tptcs: List of TPTCs associated with the eDMA in the following form:
> <&tptc_phandle TC_priority_number>. The highest priority is 0.
>
> +SoC-specific Required properties:
> +--------------------------------
> +The following are mandatory properties for OMAP, AM33xx and AM43xx SoCs only:
> +- ti,hwmods: Name of the hwmods associated to the eDMA CC.
> +
> +The following are mandatory properties for 66AK2G SoCs only:
> +- power-domains:Should contain a phandle to a PM domain provider node
> + and an args specifier containing the device id
> + value. This property is as per the binding,
> + Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
> +
> Optional properties:
> -- ti,hwmods: Name of the hwmods associated to the eDMA CC
> +-------------------
> - ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow
> these channels will be SW triggered channels. See example.
> - ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by
> @@ -31,17 +47,34 @@ Optional properties:
> eDMA3 Transfer Controller
>
> Required properties:
> -- compatible: "ti,edma3-tptc" for the transfer controller(s)
> +--------------------
> +- compatible: Should be:
> + - "ti,edma3-tptc" for the transfer controller(s) on OMAP,
> + AM33xx and AM43xx SoCs.
> + - "ti,k2g-edma3-tptc", "ti,edma3-tptc" for the
> + transfer controller(s) on 66AK2G.
> - reg: Memory map of eDMA TC
> - interrupts: Interrupt number for TCerrint.
>
> +SoC-specific Required properties:
> +--------------------------------
> +The following are mandatory properties for OMAP, AM33xx and AM43xx SoCs only:
> +- ti,hwmods: Name of the hwmods associated to the eDMA TC.
> +
> +The following are mandatory properties for 66AK2G SoCs only:
> +- power-domains:Should contain a phandle to a PM domain provider node
> + and an args specifier containing the device id
> + value. This property is as per the binding,
> + Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
> +
> Optional properties:
> -- ti,hwmods: Name of the hwmods associated to the given eDMA TC
> +-------------------
> - interrupt-names: "edma3_tcerrint"
>
> ------------------------------------------------------------------------------
> -Example:
> +Examples:
Do we really need to expand the examples to have identical set, but with
power-domains?
>
> +1.
> edma: edma@49000000 {
> compatible = "ti,edma3-tpcc";
> ti,hwmods = "tpcc";
> @@ -109,6 +142,58 @@ mcasp0: mcasp@48038000 {
> dma-names = "tx", "rx";
> };
>
> +2.
> +edma1: edma@02728000 {
> + compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";
> + reg = <0x02728000 0x8000>;
> + reg-names = "edma3_cc";
> + interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 219 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 220 IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "edma3_ccint", "emda3_mperr",
> + "edma3_ccerrint";
> + dma-requests = <64>;
> + #dma-cells = <2>;
> +
> + ti,tptcs = <&edma1_tptc0 7>, <&edma1_tptc1 0>;
> +
> + /*
> + * memcpy is disabled, can be enabled with:
> + * ti,edma-memcpy-channels = <12 13 14 15>;
> + * for example.
> + */
> +
> + power-domains = <&k2g_pds 0x4f>;
> +};
> +
> +edma1_tptc0: tptc@027b0000 {
> + compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
> + reg = <0x027b0000 0x400>;
> + power-domains = <&k2g_pds 0x4f>;
> +};
> +
> +edma1_tptc1: tptc@027b8000 {
> + compatible = "ti, k2g-edma3-tptc", "ti,edma3-tptc";
> + reg = <0x027b8000 0x400>;
> + power-domains = <&k2g_pds 0x4f>;
> +};
> +
> +mmc0: mmc@23000000 {
> + compatible = "ti,k2g-hsmmc", "ti,omap4-hsmmc";
> + reg = <0x23000000 0x400>;
> + interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
> + dmas = <&edma1 24 0>, <&edma1 25 0>;
> + dma-names = "tx", "rx";
> + bus-width = <4>;
> + ti,needs-special-reset;
> + no-1-8-v;
> + max-frequency = <96000000>;
> + power-domains = <&k2g_pds 0xb>;
> + clocks = <&k2g_clks 0xb 1>, <&k2g_clks 0xb 2>;
> + clock-names = "fck", "mmchsdb_fck";
> + status = "disabled";
> +};
> +
> ------------------------------------------------------------------------------
> DEPRECATED binding, new DTS files must use the ti,edma3-tpcc/ti,edma3-tptc
> binding.
>
- P?ter
On 7/31/2017 9:41 PM, Lokesh Vutla wrote:
> This series adds DT nodes and documentation for eDMA and MMC IPs on
> Keystone 66AK2G SoC. Also enable the required configs in keystone_defconfig.
>
> This series depends on Keerthy's gpio node patches on 66AK2G:
Am waiting for Keerthy to send refresh series. Thanks for
note about the deps.
Regards,
Santosh
On Tuesday 01 August 2017 11:40 PM, Santosh Shilimkar wrote:
>
> On 7/31/2017 9:41 PM, Lokesh Vutla wrote:
>> This series adds DT nodes and documentation for eDMA and MMC IPs on
>> Keystone 66AK2G SoC. Also enable the required configs in
>> keystone_defconfig.
>>
>> This series depends on Keerthy's gpio node patches on 66AK2G:
> Am waiting for Keerthy to send refresh series. Thanks for
> note about the deps.
Thanks Santosh. I am waiting for a response from Rob H on Suman's
question on whether to include power-domains property.
>
> Regards,
> Santosh
On 8/1/2017 6:20 PM, Peter Ujfalusi wrote:
>
>
> On 2017-08-01 07:41, Lokesh Vutla wrote:
>> Update ti,edma binding documentation to reflect 66AK2G specific
>> properties.
>>
>> Signed-off-by: Lokesh Vutla <[email protected]>
>> ---
>> Documentation/devicetree/bindings/dma/ti-edma.txt | 95
>> +++++++++++++++++++++--
>> 1 file changed, 90 insertions(+), 5 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt
>> b/Documentation/devicetree/bindings/dma/ti-edma.txt
>> index 18090e7226b4..05fe2931d025 100644
>> --- a/Documentation/devicetree/bindings/dma/ti-edma.txt
>> +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt
>> @@ -9,7 +9,12 @@ execute the actual DMA tansfer.
>> eDMA3 Channel Controller
>>
>> Required properties:
>> -- compatible: "ti,edma3-tpcc" for the channel controller(s)
>> +--------------------
>> +- compatible: Should be:
>> + - "ti,edma3-tpcc" for the channel controller(s) on OMAP,
>> + AM33xx and AM43xx SoCs.
>> + - "ti,k2g-edma3-tpcc", "ti,edma3-tpcc" for the
>> + channel controller(s) on 66AK2G.
>> - #dma-cells: Should be set to <2>. The first number is the DMA
>> request
>> number and the second is the TC the channel is serviced on.
>> - reg: Memory map of eDMA CC
>> @@ -19,8 +24,19 @@ Required properties:
>> - ti,tptcs: List of TPTCs associated with the eDMA in the
>> following form:
>> <&tptc_phandle TC_priority_number>. The highest priority is 0.
>>
>> +SoC-specific Required properties:
>> +--------------------------------
>> +The following are mandatory properties for OMAP, AM33xx and AM43xx
>> SoCs only:
>> +- ti,hwmods: Name of the hwmods associated to the eDMA CC.
>> +
>> +The following are mandatory properties for 66AK2G SoCs only:
>> +- power-domains:Should contain a phandle to a PM domain provider node
>> + and an args specifier containing the device id
>> + value. This property is as per the binding,
>> + Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
>> +
>> Optional properties:
>> -- ti,hwmods: Name of the hwmods associated to the eDMA CC
>> +-------------------
>> - ti,edma-memcpy-channels: List of channels allocated to be used for
>> memcpy, iow
>> these channels will be SW triggered channels. See example.
>> - ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be
>> used by
>> @@ -31,17 +47,34 @@ Optional properties:
>> eDMA3 Transfer Controller
>>
>> Required properties:
>> -- compatible: "ti,edma3-tptc" for the transfer controller(s)
>> +--------------------
>> +- compatible: Should be:
>> + - "ti,edma3-tptc" for the transfer controller(s) on OMAP,
>> + AM33xx and AM43xx SoCs.
>> + - "ti,k2g-edma3-tptc", "ti,edma3-tptc" for the
>> + transfer controller(s) on 66AK2G.
>> - reg: Memory map of eDMA TC
>> - interrupts: Interrupt number for TCerrint.
>>
>> +SoC-specific Required properties:
>> +--------------------------------
>> +The following are mandatory properties for OMAP, AM33xx and AM43xx
>> SoCs only:
>> +- ti,hwmods: Name of the hwmods associated to the eDMA TC.
>> +
>> +The following are mandatory properties for 66AK2G SoCs only:
>> +- power-domains:Should contain a phandle to a PM domain provider node
>> + and an args specifier containing the device id
>> + value. This property is as per the binding,
>> + Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
>> +
>> Optional properties:
>> -- ti,hwmods: Name of the hwmods associated to the given eDMA TC
>> +-------------------
>> - interrupt-names: "edma3_tcerrint"
>>
>> ------------------------------------------------------------------------------
>>
>> -Example:
>> +Examples:
>
> Do we really need to expand the examples to have identical set, but with
> power-domains?
IIRC, there was a feedback to add an example(not able to fine that
specific email). If you strongly disagree with this, I can drop it and
resend it.
Thanks and regards,
Lokesh
>
>>
>> +1.
>> edma: edma@49000000 {
>> compatible = "ti,edma3-tpcc";
>> ti,hwmods = "tpcc";
>> @@ -109,6 +142,58 @@ mcasp0: mcasp@48038000 {
>> dma-names = "tx", "rx";
>> };
>>
>> +2.
>> +edma1: edma@02728000 {
>> + compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";
>> + reg = <0x02728000 0x8000>;
>> + reg-names = "edma3_cc";
>> + interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 219 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 220 IRQ_TYPE_EDGE_RISING>;
>> + interrupt-names = "edma3_ccint", "emda3_mperr",
>> + "edma3_ccerrint";
>> + dma-requests = <64>;
>> + #dma-cells = <2>;
>> +
>> + ti,tptcs = <&edma1_tptc0 7>, <&edma1_tptc1 0>;
>> +
>> + /*
>> + * memcpy is disabled, can be enabled with:
>> + * ti,edma-memcpy-channels = <12 13 14 15>;
>> + * for example.
>> + */
>> +
>> + power-domains = <&k2g_pds 0x4f>;
>> +};
>> +
>> +edma1_tptc0: tptc@027b0000 {
>> + compatible = "ti,k2g-edma3-tptc", "ti,edma3-tptc";
>> + reg = <0x027b0000 0x400>;
>> + power-domains = <&k2g_pds 0x4f>;
>> +};
>> +
>> +edma1_tptc1: tptc@027b8000 {
>> + compatible = "ti, k2g-edma3-tptc", "ti,edma3-tptc";
>> + reg = <0x027b8000 0x400>;
>> + power-domains = <&k2g_pds 0x4f>;
>> +};
>> +
>> +mmc0: mmc@23000000 {
>> + compatible = "ti,k2g-hsmmc", "ti,omap4-hsmmc";
>> + reg = <0x23000000 0x400>;
>> + interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
>> + dmas = <&edma1 24 0>, <&edma1 25 0>;
>> + dma-names = "tx", "rx";
>> + bus-width = <4>;
>> + ti,needs-special-reset;
>> + no-1-8-v;
>> + max-frequency = <96000000>;
>> + power-domains = <&k2g_pds 0xb>;
>> + clocks = <&k2g_clks 0xb 1>, <&k2g_clks 0xb 2>;
>> + clock-names = "fck", "mmchsdb_fck";
>> + status = "disabled";
>> +};
>> +
>> ------------------------------------------------------------------------------
>>
>> DEPRECATED binding, new DTS files must use the
>> ti,edma3-tpcc/ti,edma3-tptc
>> binding.
>>
>
> - P?ter
On Wednesday 02 August 2017 10:33 PM, Lokesh Vutla wrote:
> On 8/1/2017 6:20 PM, Peter Ujfalusi wrote:
>> On 2017-08-01 07:41, Lokesh Vutla wrote:
>>> -Example:
>>> +Examples:
>>
>> Do we really need to expand the examples to have identical set, but with
>> power-domains?
>
> IIRC, there was a feedback to add an example(not able to fine that
> specific email). If you strongly disagree with this, I can drop it and
> resend it.
This is only an example, not a comprehensive set of possibilities. I
think it should be kept to one.
Thanks,
Sekhar
On 8/1/17 11:10 AM, Santosh Shilimkar wrote:
>
> On 7/31/2017 9:41 PM, Lokesh Vutla wrote:
>> This series adds DT nodes and documentation for eDMA and MMC IPs on
>> Keystone 66AK2G SoC. Also enable the required configs in
>> keystone_defconfig.
>>
>> This series depends on Keerthy's gpio node patches on 66AK2G:
> Am waiting for Keerthy to send refresh series. Thanks for
> note about the deps.
>
Series applied !!
On Thu, Aug 03, 2017 at 11:04:45AM +0530, Sekhar Nori wrote:
> On Wednesday 02 August 2017 10:33 PM, Lokesh Vutla wrote:
> > On 8/1/2017 6:20 PM, Peter Ujfalusi wrote:
> >> On 2017-08-01 07:41, Lokesh Vutla wrote:
>
> >>> -Example:
> >>> +Examples:
> >>
> >> Do we really need to expand the examples to have identical set, but with
> >> power-domains?
> >
> > IIRC, there was a feedback to add an example(not able to fine that
> > specific email). If you strongly disagree with this, I can drop it and
> > resend it.
>
> This is only an example, not a comprehensive set of possibilities. I
> think it should be kept to one.
Agreed.
Rob
On Tue, Aug 01, 2017 at 10:11:14AM +0530, Lokesh Vutla wrote:
> Update ti,edma binding documentation to reflect 66AK2G specific
> properties.
>
> Signed-off-by: Lokesh Vutla <[email protected]>
> ---
> Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++++++++++++--
> 1 file changed, 90 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt
> index 18090e7226b4..05fe2931d025 100644
> --- a/Documentation/devicetree/bindings/dma/ti-edma.txt
> +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt
> @@ -9,7 +9,12 @@ execute the actual DMA tansfer.
> eDMA3 Channel Controller
>
> Required properties:
> -- compatible: "ti,edma3-tpcc" for the channel controller(s)
> +--------------------
> +- compatible: Should be:
> + - "ti,edma3-tpcc" for the channel controller(s) on OMAP,
> + AM33xx and AM43xx SoCs.
> + - "ti,k2g-edma3-tpcc", "ti,edma3-tpcc" for the
If power-domains is mandatory, I don't think the fallback is
appropriate. Or do you expect it to work if the driver ignores the power
domain?
On Tue, Aug 01, 2017 at 10:11:15AM +0530, Lokesh Vutla wrote:
> Update the ti,omap-hsmmc.txt to include information about
> 66AK2G specific mmc controller. Also cleanup the entries
> under optional properties to look a bit nicer.
>
> Signed-off-by: Lokesh Vutla <[email protected]>
> ---
> .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 +++++++++++++++-------
> 1 file changed, 37 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> index 0e026c151c1c..016741402e37 100644
> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> @@ -1,33 +1,55 @@
> -* TI Highspeed MMC host controller for OMAP
> +* TI Highspeed MMC host controller for OMAP and 66AK2G family.
>
> -The Highspeed MMC Host Controller on TI OMAP family
> +The Highspeed MMC Host Controller on TI OMAP and 66AK2G family
> provides an interface for MMC, SD, and SDIO types of memory cards.
>
> This file documents differences between the core properties described
> by mmc.txt and the properties used by the omap_hsmmc driver.
>
> Required properties:
> +--------------------
> - compatible:
> Should be "ti,omap2-hsmmc", for OMAP2 controllers
> Should be "ti,omap3-hsmmc", for OMAP3 controllers
> Should be "ti,omap3-pre-es3-hsmmc" for OMAP3 controllers pre ES3.0
> Should be "ti,omap4-hsmmc", for OMAP4 controllers
> Should be "ti,am33xx-hsmmc", for AM335x controllers
> -- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
> + Should be "ti,k2g-hsmmc", "ti,omap4-hsmmc" for 66AK2G controllers.
Same comment here.
> +
> +SoC specific required properties:
> +---------------------------------
> +The following are mandatory properties for OMAPs, AM33xx and AM43xx SoCs only:
> +- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1.
> +
> +The following are mandatory properties for 66AK2G SoCs only:
> +- power-domains:Should contain a phandle to a PM domain provider node
> + and an args specifier containing the MMC device id
> + value. This property is as per the binding,
> + Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
> +- clocks: Must contain an entry for each entry in clock-names. Should
> + be defined as per the he appropriate clock bindings consumer
> + usage in Documentation/devicetree/bindings/clock/ti,sci-clk.txt
> +- clock-names: Shall be "fck" for the functional clock,
> + and "mmchsdb_fck" for the debounce clock.
> +
>
> Optional properties:
> -ti,dual-volt: boolean, supports dual voltage cards
> -<supply-name>-supply: phandle to the regulator device tree node
> -"supply-name" examples are "vmmc", "vmmc_aux"(deprecated)/"vqmmc" etc
> -ti,non-removable: non-removable slot (like eMMC)
> -ti,needs-special-reset: Requires a special softreset sequence
> -ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
> -dmas: List of DMA specifiers with the controller specific format
> -as described in the generic DMA client binding. A tx and rx
> -specifier is required.
> -dma-names: List of DMA request names. These strings correspond
> -1:1 with the DMA specifiers listed in dmas. The string naming is
> -to be "rx" and "tx" for RX and TX DMA requests, respectively.
> +--------------------
> +- ti,dual-volt: boolean, supports dual voltage cards
> +- <supply-name>-supply: phandle to the regulator device tree node
> + "supply-name" examples are "vmmc",
> + "vmmc_aux"(deprecated)/"vqmmc" etc
> +- ti,non-removable: non-removable slot (like eMMC)
> +- ti,needs-special-reset: Requires a special softreset sequence
> +- ti,needs-special-hs-handling: HSMMC IP needs special setting
> + for handling High Speed
> +- dmas: List of DMA specifiers with the controller specific
> + format as described in the generic DMA client
> + binding. A tx and rx specifier is required.
> +- dma-names: List of DMA request names. These strings correspond
> + 1:1 with the DMA specifiers listed in dmas.
> + The string naming is to be "rx" and "tx" for
> + RX and TX DMA requests, respectively.
Is there some change here or just reformatting? Please make reformatting
a separate patch.
Rob
On Thursday 10 August 2017 05:30 AM, Rob Herring wrote:
> On Tue, Aug 01, 2017 at 10:11:14AM +0530, Lokesh Vutla wrote:
>> Update ti,edma binding documentation to reflect 66AK2G specific
>> properties.
>>
>> Signed-off-by: Lokesh Vutla <[email protected]>
>> ---
>> Documentation/devicetree/bindings/dma/ti-edma.txt | 95 +++++++++++++++++++++--
>> 1 file changed, 90 insertions(+), 5 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt
>> index 18090e7226b4..05fe2931d025 100644
>> --- a/Documentation/devicetree/bindings/dma/ti-edma.txt
>> +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt
>> @@ -9,7 +9,12 @@ execute the actual DMA tansfer.
>> eDMA3 Channel Controller
>>
>> Required properties:
>> -- compatible: "ti,edma3-tpcc" for the channel controller(s)
>> +--------------------
>> +- compatible: Should be:
>> + - "ti,edma3-tpcc" for the channel controller(s) on OMAP,
>> + AM33xx and AM43xx SoCs.
>> + - "ti,k2g-edma3-tpcc", "ti,edma3-tpcc" for the
>
> If power-domains is mandatory, I don't think the fallback is
> appropriate. Or do you expect it to work if the driver ignores the power
> domain?
power-domains is required for pm_runtime_*() apis to work on 66AK2G.
Driver doesn't handle this property separately. Driver still works with
"ti,edma3-tpcc" compatible.
Thanks and regards,
Lokesh