* [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments
@ 2015-11-04 22:14 Marek Vasut
2015-11-04 22:14 ` [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Marek Vasut @ 2015-11-04 22:14 UTC (permalink / raw)
To: linux-arm-kernel
Synchronise the comments in mmc0 pinmux node with HSMCI0 pinmux
description in the Atmel SAMA5D4 datasheet from 24-Aug-15 page
1119, section 37.6.1, Table 37-3 .
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Josh Wu <josh.wu@atmel.com>
Reported-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/boot/dts/sama5d4.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 8d1de29..48ca530 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1640,15 +1640,15 @@
pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {
atmel,pins =
<AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* MCI0_CK, conflict with PCK1(ISI_MCK) */
- AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDB, conflict with NAND_D0 */
- AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB0, conflict with NAND_D1 */
+ AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDA, conflict with NAND_D0 */
+ AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA0, conflict with NAND_D1 */
>;
};
pinctrl_mmc0_dat1_3: mmc0_dat1_3 {
atmel,pins =
- <AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB1, conflict with NAND_D2 */
- AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB2, conflict with NAND_D3 */
- AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB3, conflict with NAND_D4 */
+ <AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA1, conflict with NAND_D2 */
+ AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA2, conflict with NAND_D3 */
+ AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
>;
};
};
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-04 22:14 [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Marek Vasut
@ 2015-11-04 22:14 ` Marek Vasut
2015-11-05 2:15 ` Josh Wu
2015-11-04 22:14 ` [PATCH V2 3/3] ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK Marek Vasut
2015-11-05 2:03 ` [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Josh Wu
2 siblings, 1 reply; 9+ messages in thread
From: Marek Vasut @ 2015-11-04 22:14 UTC (permalink / raw)
To: linux-arm-kernel
Add pinmux for the 4 remaining signals used in 8-bit MMC 0
bus configuration.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Josh Wu <josh.wu@atmel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/boot/dts/sama5d4.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
V2: Repair the incorrect comments for the pinmux, original version
of the commment contained wrong MCI0_DAx references.
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 48ca530..d086a7d 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1651,6 +1651,14 @@
AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
>;
};
+ pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
+ atmel,pins =
+ <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
+ AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
+ AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
+ AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_D8 */
+ >;
+ };
};
mmc1 {
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 3/3] ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK
2015-11-04 22:14 [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Marek Vasut
2015-11-04 22:14 ` [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus Marek Vasut
@ 2015-11-04 22:14 ` Marek Vasut
2015-11-05 2:03 ` [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Josh Wu
2 siblings, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2015-11-04 22:14 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the DENX MA5D4 SoM and MA5D4EVK board. The system
consists of a SoM with eMMC, SPI NOR for booting, 2x SPI CAN chip
and an EVK with microSD slot, 2x UART, 2x CAN port, 3x USB port,
LEDs and expansion headers.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Josh Wu <josh.wu@atmel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 127 +++++++++++++++++++++
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 170 ++++++++++++++++++++++++++++
3 files changed, 298 insertions(+)
create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
V2: - Zap bogus bootargs, zap clock at 0 and clk20m .
- Zap bogus address-cells / size-cells / ranges in the clocks node.
- Drop duplicated /clocks/slow_xtal and /clocks/main_xtal, which is
already present in sama5d4.dtsi
- Sort nodes by address in ascending order
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index bb8fa02..67130bb 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -48,6 +48,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \
sama5d34ek.dtb \
sama5d35ek.dtb \
sama5d36ek.dtb \
+ at91-sama5d4_ma5d4evk.dtb \
at91-sama5d4_xplained.dtb \
at91-sama5d4ek.dtb
dtb-$(CONFIG_ARCH_ATLAS6) += \
diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
new file mode 100644
index 0000000..e7b2109
--- /dev/null
+++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "sama5d4.dtsi"
+
+/ {
+ model = "DENX MA5D4";
+ compatible = "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";
+
+ memory {
+ reg = <0x20000000 0x10000000>;
+ };
+
+ clocks {
+ main_clock: main_clock {
+ compatible = "atmel,osc", "fixed-clock";
+ clock-frequency = <12000000>;
+ };
+
+ clk20m: clk20m {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <20000000>;
+ clock-output-names = "clk20m";
+ };
+ };
+
+ ahb {
+ apb {
+ mmc0: mmc at f8000000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
+ vmmc-supply = <&vcc_mmc0_reg>;
+ vqmmc-supply = <&vcc_3v3_reg>;
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <8>;
+ broken-cd;
+ };
+ };
+
+ spi0: spi at f8010000 {
+ cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
+ status = "okay";
+
+ m25p80 at 0 {
+ compatible = "atmel,at25df321a";
+ spi-max-frequency = <50000000>;
+ reg = <0>;
+ };
+ };
+
+ i2c0: i2c at f8014000 {
+ status = "okay";
+ };
+
+ spi1: spi at fc018000 {
+ cs-gpios = <&pioB 22 0>, <&pioB 23 0>, <0>, <0>;
+ status = "okay";
+
+ can0: can at 0 {
+ compatible = "microchip,mcp2515";
+ reg = <0>;
+ clocks = <&clk20m>;
+ interrupt-parent = <&pioE>;
+ interrupts = <6 GPIO_ACTIVE_LOW>;
+ spi-max-frequency = <10000000>;
+ };
+
+ can1: can at 1 {
+ compatible = "microchip,mcp2515";
+ reg = <1>;
+ clocks = <&clk20m>;
+ interrupt-parent = <&pioE>;
+ interrupts = <7 GPIO_ACTIVE_LOW>;
+ spi-max-frequency = <10000000>;
+ };
+ };
+
+ adc0: adc at fc034000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ /* external trigger conflicts with USBA_VBUS */
+ &pinctrl_adc0_ad0
+ &pinctrl_adc0_ad1
+ &pinctrl_adc0_ad2
+ &pinctrl_adc0_ad3
+ &pinctrl_adc0_ad4
+ >;
+ atmel,adc-vref = <3300>;
+ status = "okay";
+ };
+
+ watchdog at fc068640 {
+ status = "okay";
+ };
+ };
+ };
+
+ vcc_3v3_reg: fixedregulator at 0 {
+ compatible = "regulator-fixed";
+ regulator-name = "VCC 3V3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vcc_mmc0_reg: fixedregulator at 1 {
+ compatible = "regulator-fixed";
+ gpio = <&pioE 15 GPIO_ACTIVE_HIGH>;
+ regulator-name = "RST_n MCI0";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_3v3_reg>;
+ regulator-boot-on;
+ };
+};
diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts b/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
new file mode 100644
index 0000000..abaaba5
--- /dev/null
+++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "at91-sama5d4_ma5d4.dtsi"
+
+/ {
+ model = "DENX MA5D4EVK";
+ compatible = "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";
+
+ chosen {
+ stdout-path = "serial3:115200n8";
+ };
+
+ ahb {
+ usb0: gadget at 00400000 {
+ atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usba_vbus>;
+ status = "okay";
+ };
+
+ usb1: ohci at 00500000 {
+ num-ports = <3>;
+ atmel,vbus-gpio = <0
+ &pioE 11 GPIO_ACTIVE_LOW
+ &pioE 14 GPIO_ACTIVE_LOW
+ >;
+ status = "okay";
+ };
+
+ usb2: ehci at 00600000 {
+ status = "okay";
+ };
+
+ apb {
+ hlcdc: hlcdc at f0000000 {
+ status = "okay";
+
+ hlcdc-display-controller {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
+
+ port at 0 {
+ hlcdc_panel_output: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&panel_input>;
+ };
+ };
+ };
+
+ };
+
+ macb0: ethernet at f8020000 {
+ phy-mode = "rmii";
+ status = "okay";
+
+ phy0: ethernet-phy at 0 {
+ reg = <0>;
+ };
+ };
+
+ usart0: serial at f802c000 {
+ status = "okay";
+ };
+
+ usart1: serial at f8030000 {
+ status = "okay";
+ };
+
+ mmc1: mmc at fc000000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
+ vmmc-supply = <&vcc_mmc1_reg>;
+ vqmmc-supply = <&vcc_3v3_reg>;
+ status = "okay";
+ slot at 0 {
+ reg = <0>;
+ bus-width = <4>;
+ cd-gpios = <&pioE 5 0>;
+ };
+ };
+
+ adc0: adc at fc034000 {
+ atmel,adc-ts-wires = <4>;
+ atmel,adc-ts-pressure-threshold = <10000>;
+ };
+
+
+ pinctrl at fc06a000 {
+ board {
+ pinctrl_mmc1_cd: mmc1_cd {
+ atmel,pins = <AT91_PIOE 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
+ };
+ pinctrl_usba_vbus: usba_vbus {
+ atmel,pins =
+ <AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
+ };
+ };
+ };
+ };
+ };
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pwms = <&hlcdc_pwm 0 50000 0>;
+ brightness-levels = <0 4 8 16 32 64 128 255>;
+ default-brightness-level = <6>;
+ status = "okay";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ status = "okay";
+
+ user1 {
+ label = "user1";
+ gpios = <&pioD 28 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ user2 {
+ label = "user2";
+ gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ user3 {
+ label = "user3";
+ gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ panel: panel {
+ /* Actually Ampire 800480R2 */
+ compatible = "foxlink,fl500wvr00-a0t", "simple-panel";
+ backlight = <&backlight>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ panel_input: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&hlcdc_panel_output>;
+ };
+ };
+ };
+
+ vcc_mmc1_reg: fixedregulator at 2 {
+ compatible = "regulator-fixed";
+ gpio = <&pioE 17 GPIO_ACTIVE_LOW>;
+ regulator-name = "VDD MCI1";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_3v3_reg>;
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments
2015-11-04 22:14 [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Marek Vasut
2015-11-04 22:14 ` [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus Marek Vasut
2015-11-04 22:14 ` [PATCH V2 3/3] ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK Marek Vasut
@ 2015-11-05 2:03 ` Josh Wu
2 siblings, 0 replies; 9+ messages in thread
From: Josh Wu @ 2015-11-05 2:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Marek
On 11/5/2015 6:14 AM, Marek Vasut wrote:
> Synchronise the comments in mmc0 pinmux node with HSMCI0 pinmux
> description in the Atmel SAMA5D4 datasheet from 24-Aug-15 page
> 1119, section 37.6.1, Table 37-3 .
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Josh Wu <josh.wu@atmel.com>
> Reported-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
Thanks for the correction.
Reviewed-by: Josh Wu <josh.wu@atmel.com>
Best Regards,
Josh Wu
> arch/arm/boot/dts/sama5d4.dtsi | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
> index 8d1de29..48ca530 100644
> --- a/arch/arm/boot/dts/sama5d4.dtsi
> +++ b/arch/arm/boot/dts/sama5d4.dtsi
> @@ -1640,15 +1640,15 @@
> pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {
> atmel,pins =
> <AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* MCI0_CK, conflict with PCK1(ISI_MCK) */
> - AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDB, conflict with NAND_D0 */
> - AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB0, conflict with NAND_D1 */
> + AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_CDA, conflict with NAND_D0 */
> + AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA0, conflict with NAND_D1 */
> >;
> };
> pinctrl_mmc0_dat1_3: mmc0_dat1_3 {
> atmel,pins =
> - <AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB1, conflict with NAND_D2 */
> - AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB2, conflict with NAND_D3 */
> - AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DB3, conflict with NAND_D4 */
> + <AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA1, conflict with NAND_D2 */
> + AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA2, conflict with NAND_D3 */
> + AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
> >;
> };
> };
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-04 22:14 ` [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus Marek Vasut
@ 2015-11-05 2:15 ` Josh Wu
2015-11-05 2:25 ` [PATCH V3 " Marek Vasut
2015-11-05 2:25 ` [PATCH V2 " Marek Vasut
0 siblings, 2 replies; 9+ messages in thread
From: Josh Wu @ 2015-11-05 2:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Marek
On 11/5/2015 6:14 AM, Marek Vasut wrote:
> Add pinmux for the 4 remaining signals used in 8-bit MMC 0
> bus configuration.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Josh Wu <josh.wu@atmel.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/boot/dts/sama5d4.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> V2: Repair the incorrect comments for the pinmux, original version
> of the commment contained wrong MCI0_DAx references.
>
> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
> index 48ca530..d086a7d 100644
> --- a/arch/arm/boot/dts/sama5d4.dtsi
> +++ b/arch/arm/boot/dts/sama5d4.dtsi
> @@ -1651,6 +1651,14 @@
> AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
> >;
> };
> + pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
> + atmel,pins =
> + <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
> + AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
> + AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
> + AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_D8 */
PC13 is conflicted with NRD/NANDOE, not D8 (PB18).
with this comment fix, you can add:
Reviewed-by: Josh Wu <josh.wu@atmel.com>
Best Regards,
Josh Wu
> + >;
> + };
> };
>
> mmc1 {
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V3 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-05 2:15 ` Josh Wu
@ 2015-11-05 2:25 ` Marek Vasut
2015-11-05 3:05 ` Josh Wu
2015-11-05 2:25 ` [PATCH V2 " Marek Vasut
1 sibling, 1 reply; 9+ messages in thread
From: Marek Vasut @ 2015-11-05 2:25 UTC (permalink / raw)
To: linux-arm-kernel
Add pinmux for the 4 remaining signals used in 8-bit MMC 0
bus configuration.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Josh Wu <josh.wu@atmel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/boot/dts/sama5d4.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
V2: Repair the incorrect comments for the pinmux, original version
of the commment contained wrong MCI0_DAx references.
V3: Fix NAND_D8 -> NAND_OE
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 48ca530..ae6041b 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1651,6 +1651,14 @@
AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
>;
};
+ pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
+ atmel,pins =
+ <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
+ AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
+ AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
+ AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_OE */
+ >;
+ };
};
mmc1 {
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-05 2:15 ` Josh Wu
2015-11-05 2:25 ` [PATCH V3 " Marek Vasut
@ 2015-11-05 2:25 ` Marek Vasut
1 sibling, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2015-11-05 2:25 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday, November 05, 2015 at 03:15:41 AM, Josh Wu wrote:
> Hi, Marek
>
> On 11/5/2015 6:14 AM, Marek Vasut wrote:
> > Add pinmux for the 4 remaining signals used in 8-bit MMC 0
> > bus configuration.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: Josh Wu <josh.wu@atmel.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> >
> > arch/arm/boot/dts/sama5d4.dtsi | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > V2: Repair the incorrect comments for the pinmux, original version
> >
> > of the commment contained wrong MCI0_DAx references.
> >
> > diff --git a/arch/arm/boot/dts/sama5d4.dtsi
> > b/arch/arm/boot/dts/sama5d4.dtsi index 48ca530..d086a7d 100644
> > --- a/arch/arm/boot/dts/sama5d4.dtsi
> > +++ b/arch/arm/boot/dts/sama5d4.dtsi
> > @@ -1651,6 +1651,14 @@
> >
> > AT91_PIOC 9
AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3,
> > conflict with NAND_D4
*/
> >
> > >;
> >
> > };
> >
> > + pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
> > + atmel,pins =
> > + <AT91_PIOC 10
AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4,
> > conflict with NAND_D5 */ +
AT91_PIOC 11 AT91_PERIPH_B
> > AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */ +
> > AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict
> > with NAND_D7 */ +
AT91_PIOC 13 AT91_PERIPH_B
> > AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_D8 */
>
> PC13 is conflicted with NRD/NANDOE, not D8 (PB18).
> with this comment fix, you can add:
> Reviewed-by: Josh Wu <josh.wu@atmel.com>
Thanks, patch is out, hope I got it right this time.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V3 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-05 2:25 ` [PATCH V3 " Marek Vasut
@ 2015-11-05 3:05 ` Josh Wu
2015-11-05 4:01 ` Marek Vasut
0 siblings, 1 reply; 9+ messages in thread
From: Josh Wu @ 2015-11-05 3:05 UTC (permalink / raw)
To: linux-arm-kernel
On 11/5/2015 10:25 AM, Marek Vasut wrote:
> Add pinmux for the 4 remaining signals used in 8-bit MMC 0
> bus configuration.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Josh Wu <josh.wu@atmel.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
Thanks Marek for the quick fix ;-), and
Reviewed-by: Josh Wu <josh.wu@atmel.com>
Best Regards,
Josh Wu
> arch/arm/boot/dts/sama5d4.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> V2: Repair the incorrect comments for the pinmux, original version
> of the commment contained wrong MCI0_DAx references.
> V3: Fix NAND_D8 -> NAND_OE
>
> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
> index 48ca530..ae6041b 100644
> --- a/arch/arm/boot/dts/sama5d4.dtsi
> +++ b/arch/arm/boot/dts/sama5d4.dtsi
> @@ -1651,6 +1651,14 @@
> AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA3, conflict with NAND_D4 */
> >;
> };
> + pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
> + atmel,pins =
> + <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA4, conflict with NAND_D5 */
> + AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA5, conflict with NAND_D6 */
> + AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA6, conflict with NAND_D7 */
> + AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* MCI0_DA7, conflict with NAND_OE */
> + >;
> + };
> };
>
> mmc1 {
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V3 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
2015-11-05 3:05 ` Josh Wu
@ 2015-11-05 4:01 ` Marek Vasut
0 siblings, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2015-11-05 4:01 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday, November 05, 2015 at 04:05:03 AM, Josh Wu wrote:
> On 11/5/2015 10:25 AM, Marek Vasut wrote:
> > Add pinmux for the 4 remaining signals used in 8-bit MMC 0
> > bus configuration.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: Josh Wu <josh.wu@atmel.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
>
> Thanks Marek for the quick fix ;-), and
You're welcome :)
> Reviewed-by: Josh Wu <josh.wu@atmel.com>
Thanks!
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-11-05 4:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-04 22:14 [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Marek Vasut
2015-11-04 22:14 ` [PATCH V2 2/3] ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus Marek Vasut
2015-11-05 2:15 ` Josh Wu
2015-11-05 2:25 ` [PATCH V3 " Marek Vasut
2015-11-05 3:05 ` Josh Wu
2015-11-05 4:01 ` Marek Vasut
2015-11-05 2:25 ` [PATCH V2 " Marek Vasut
2015-11-04 22:14 ` [PATCH V2 3/3] ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK Marek Vasut
2015-11-05 2:03 ` [PATCH 1/3] ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments Josh Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).