From: Faiz Abbas <faiz_abbas@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 01/13] arm64: dts: k3: Sync sdhci0 node from kernel
Date: Tue, 12 Feb 2019 14:28:07 +0530 [thread overview]
Message-ID: <20190212085819.31395-2-faiz_abbas@ti.com> (raw)
In-Reply-To: <20190212085819.31395-1-faiz_abbas@ti.com>
Sync the sdhci0 node from kernel. This changes the compatible that is
required to be there in the driver. Change the same for the SD card node
which is not yet supported in kernel.
Also sync the main_pmx0 node as a side effect.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
arch/arm/dts/k3-am65-main.dtsi | 22 ++++++++++++
arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 37 +-------------------
arch/arm/dts/k3-am654-base-board.dts | 28 +++++++++++++++
3 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi
index adcd6341e4..84fed12fbd 100644
--- a/arch/arm/dts/k3-am65-main.dtsi
+++ b/arch/arm/dts/k3-am65-main.dtsi
@@ -69,4 +69,26 @@
clock-frequency = <48000000>;
current-speed = <115200>;
};
+
+ main_pmx0: pinmux at 11c000 {
+ compatible = "pinctrl-single";
+ reg = <0x0 0x11c000 0x0 0x2e4>;
+ #pinctrl-cells = <1>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0xffffffff>;
+ };
+
+ sdhci0: sdhci at 4f80000 {
+ compatible = "ti,am654-sdhci-5.1";
+ reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>;
+ power-domains = <&k3_pds 47>;
+ clocks = <&k3_clks 47 0>, <&k3_clks 47 1>;
+ clock-names = "clk_ahb", "clk_xin";
+ interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
+ mmc-ddr-1_8v;
+ mmc-hs200-1_8v;
+ ti,otap-del-sel = <0x2>;
+ ti,trm-icp = <0x8>;
+ dma-coherent;
+ };
};
diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index 143eb6d630..f53fe463ac 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -18,14 +18,6 @@
&cbass_main{
u-boot,dm-spl;
- main_pmx0: pinmux at 11c000 {
- compatible = "pinctrl-single";
- reg = <0x0 0x11c000 0x0 0x2e4>;
- #pinctrl-cells = <1>;
- pinctrl-single,register-width = <32>;
- pinctrl-single,function-mask = <0xffffffff>;
- };
-
main_pmx1: pinmux at 11c2e8 {
compatible = "pinctrl-single";
reg = <0x0 0x11c2e8 0x0 0x24>;
@@ -34,17 +26,8 @@
pinctrl-single,function-mask = <0xffffffff>;
};
- sdhci0: sdhci at 04F80000 {
- compatible = "arasan,sdhci-5.1";
- reg = <0x0 0x4F80000 0x0 0x1000>,
- <0x0 0x4F90000 0x0 0x400>;
- clocks = <&k3_clks 47 1>;
- power-domains = <&k3_pds 47>;
- max-frequency = <25000000>;
- };
-
sdhci1: sdhci at 04FA0000 {
- compatible = "arasan,sdhci-5.1";
+ compatible = "ti,am654-sdhci-5.1";
reg = <0x0 0x4FA0000 0x0 0x1000>,
<0x0 0x4FB0000 0x0 0x400>;
clocks = <&k3_clks 48 1>;
@@ -106,19 +89,6 @@
};
main_mmc0_pins_default: main_mmc0_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN | MUX_MODE0) /* (B25) MMC0_CLK */
- AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP | MUX_MODE0) /* (B27) MMC0_CMD */
- AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP | MUX_MODE0) /* (A26) MMC0_DAT0 */
- AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP | MUX_MODE0) /* (E25) MMC0_DAT1 */
- AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP | MUX_MODE0) /* (C26) MMC0_DAT2 */
- AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP | MUX_MODE0) /* (A25) MMC0_DAT3 */
- AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP | MUX_MODE0) /* (E24) MMC0_DAT4 */
- AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP | MUX_MODE0) /* (A24) MMC0_DAT5 */
- AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP | MUX_MODE0) /* (B26) MMC0_DAT6 */
- AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP | MUX_MODE0) /* (D25) MMC0_DAT7 */
- AM65X_IOPAD(0x01b0, PIN_INPUT | MUX_MODE0) /* (C25) MMC0_DS */
- >;
u-boot,dm-spl;
};
@@ -151,11 +121,6 @@
&sdhci0 {
u-boot,dm-spl;
- status = "okay";
- non-removable;
- bus-width = <8>;
- pinctrl-names = "default";
- pinctrl-0 = <&main_mmc0_pins_default>;
};
&sdhci1 {
diff --git a/arch/arm/dts/k3-am654-base-board.dts b/arch/arm/dts/k3-am654-base-board.dts
index af6956fdc1..845c3ee2dd 100644
--- a/arch/arm/dts/k3-am654-base-board.dts
+++ b/arch/arm/dts/k3-am654-base-board.dts
@@ -6,6 +6,7 @@
/dts-v1/;
#include "k3-am654.dtsi"
+#include <dt-bindings/pinctrl/k3-am65.h>
/ {
compatible = "ti,am654-evm", "ti,am654";
@@ -34,3 +35,30 @@
};
};
};
+
+&main_pmx0 {
+ main_mmc0_pins_default: main_mmc0_pins_default {
+ pinctrl-single,pins = <
+ AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN | MUX_MODE0) /* (B25) MMC0_CLK */
+ AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP | MUX_MODE0) /* (B27) MMC0_CMD */
+ AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP | MUX_MODE0) /* (A26) MMC0_DAT0 */
+ AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP | MUX_MODE0) /* (E25) MMC0_DAT1 */
+ AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP | MUX_MODE0) /* (C26) MMC0_DAT2 */
+ AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP | MUX_MODE0) /* (A25) MMC0_DAT3 */
+ AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP | MUX_MODE0) /* (E24) MMC0_DAT4 */
+ AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP | MUX_MODE0) /* (A24) MMC0_DAT5 */
+ AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP | MUX_MODE0) /* (B26) MMC0_DAT6 */
+ AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP | MUX_MODE0) /* (D25) MMC0_DAT7 */
+ AM65X_IOPAD(0x01b4, PIN_INPUT_PULLUP | MUX_MODE0) /* (A23) MMC0_SDCD */
+ AM65X_IOPAD(0x01b0, PIN_INPUT | MUX_MODE0) /* (C25) MMC0_DS */
+ >;
+ };
+};
+
+&sdhci0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&main_mmc0_pins_default>;
+ bus-width = <8>;
+ non-removable;
+ ti,driver-strength-ohm = <50>;
+};
--
2.19.2
next prev parent reply other threads:[~2019-02-12 8:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 8:58 [U-Boot] [PATCH v3 00/13] Add Support for eMMC in AM65x-evm Faiz Abbas
2019-02-12 8:58 ` Faiz Abbas [this message]
2019-02-19 11:30 ` [U-Boot] [PATCH v3 01/13] arm64: dts: k3: Sync sdhci0 node from kernel Lokesh Vutla
2019-04-12 16:28 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 02/13] mmc: am654_mmc: Change driver name Faiz Abbas
2019-04-12 16:28 ` [U-Boot] [U-Boot,v3,02/13] " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 03/13] mmc: am654_sdhci: Remove quirks Faiz Abbas
2019-04-12 16:28 ` [U-Boot] [U-Boot,v3,03/13] " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 04/13] regmap: Add API regmap_init_mem_index() Faiz Abbas
2019-04-12 16:28 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 05/13] regmap: Add support for polling on a register Faiz Abbas
2019-02-13 7:55 ` Faiz Abbas
2019-04-15 5:46 ` Faiz Abbas
2019-04-12 16:28 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 06/13] mmc: sdhci: Add support for sdhci-caps-mask Faiz Abbas
2019-03-27 14:55 ` Andrew F. Davis
2019-04-12 16:28 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-04-12 16:28 ` Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 07/13] mmc: sdhci: Make sdhci_set_clock() non static Faiz Abbas
2019-04-12 16:28 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 08/13] arm: dts: k3: Add phy specific properties to SD card node Faiz Abbas
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 09/13] mmc: sdhci: Make set_ios_post() return int Faiz Abbas
2019-02-13 0:56 ` Tom Rini
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 10/13] mmc: am654_sdhci: Add Support for PHY Faiz Abbas
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 11/13] configs: am65x_evm: Enable CONFIG_REGMAP Faiz Abbas
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 12/13] mmc: sdhci: Add support for HOST_CONTROL2 and setting UHS timings Faiz Abbas
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-02-12 8:58 ` [U-Boot] [PATCH v3 13/13] mmc: am654_sdhci: Add a platform specific set_control_reg() callback Faiz Abbas
2019-04-12 16:29 ` [U-Boot] [U-Boot, v3, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190212085819.31395-2-faiz_abbas@ti.com \
--to=faiz_abbas@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.