[PATCH 1/4 V2] ARM: mx28: Add SPI 2 pinmux into imx28.dtsi

[PATCH 1/4 V2] ARM: mx28: Add SPI 2 pinmux into imx28.dtsi

[Marek Vasut]

Add this SSP port 2 pin multiplexing configuration into the imx28.dtsi file.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28.dtsi |   13 +++++++++++++
 1 file changed, 13 insertions(+)

V2: Add only SSP2 pinmux.

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 91b43e9..b996c2d 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -507,6 +507,19 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
 				};
+
+				spi2_pins_a: spi2 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x2100 /* MX28_PAD_SSP2_SCK__SSP2_SCK */
+						0x2110 /* MX28_PAD_SSP2_MOSI__SSP2_CMD */
+						0x2120 /* MX28_PAD_SSP2_MISO__SSP2_D0 */
+						0x2130 /* MX28_PAD_SSP2_SS0__SSP2_D3 */
+					>;
+					fsl,drive-strength = <1>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <1>;
+				};
 			};
 
 			digctl at 8001c000 {
-- 
1.7.10.4

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Marek Vasut]

Add the pinmux settings for USB PHY overcurrent pins.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28.dtsi |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

V2: This is pulled from the M28EVK and SPS1 board files, put it into common
    file.

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index b996c2d..3cba62d 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -520,6 +520,36 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <1>;
 				};
+
+				usbphy0_pins_a: usbphy0 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x2152 /* MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				usbphy0_pins_b: usbphy0 at 1 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x3061 /* MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				usbphy1_pins_a: usbphy1 at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x2142 /* MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
+					>;
+					fsl,drive-strength = <2>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
 			};
 
 			digctl at 8001c000 {
-- 
1.7.10.4

[PATCH 3/4 V2] ARM: mxs: Update DENX M28 machine and dts file

[Marek Vasut]

Update the mach-mxs machine by removing the enet_clkout(). The new
revision of the board doesn't need that. Also, update the DTS file
with all the new drivers pulled in the mainline recently, that is,
SPI, LRADC, USB.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28-m28evk.dts |   81 +++++++++++++++++++++++++++++++++---
 arch/arm/mach-mxs/mach-mxs.c       |    1 -
 2 files changed, 75 insertions(+), 7 deletions(-)

Move the usbphy overcurrent definition to include file.

diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 183a3fd..229d26c 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -23,6 +23,8 @@
 	apb at 80000000 {
 		apbh at 80000000 {
 			gpmi-nand at 8000c000 {
+				#address-cells = <1>;
+				#size-cells = <1>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
 				status = "okay";
@@ -62,9 +64,27 @@
 					     &mmc0_sck_cfg>;
 				bus-width = <8>;
 				wp-gpios = <&gpio3 10 1>;
+				vmmc-supply = <&reg_vddio_sd0>;
 				status = "okay";
 			};
 
+			ssp2: ssp at 80014000 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,imx28-spi";
+				pinctrl-names = "default";
+				pinctrl-0 = <&spi2_pins_a>;
+				status = "okay";
+
+				flash: m25p80 at 0 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "m25p80";
+					spi-max-frequency = <40000000>;
+					reg = <0>;
+				};
+			};
+
 			pinctrl at 80018000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&hog_pins_a>;
@@ -72,8 +92,11 @@
 				hog_pins_a: hog-gpios at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
+						0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */
 						0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */
 						0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */
+						0x30c3 /* MX28_PAD_AUART3_RX__GPIO_3_12 */
+						0x30d3 /* MX28_PAD_AUART3_TX__GPIO_3_13 */
 					>;
 					fsl,drive-strength = <0>;
 					fsl,voltage = <1>;
@@ -129,6 +152,7 @@
 			i2c0: i2c at 80058000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&i2c0_pins_a>;
+				clock-frequency = <400000>;
 				status = "okay";
 
 				sgtl5000: codec at 0a {
@@ -151,32 +175,51 @@
 				};
 			};
 
+			lradc at 80050000 {
+				status = "okay";
+			};
+
 			duart: serial at 80074000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&duart_pins_a>;
 				status = "okay";
 			};
 
-			auart0: serial at 8006a000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&auart0_2pins_a>;
+			usbphy0: usbphy at 8007c000 {
 				status = "okay";
 			};
 
-			auart3: serial at 80070000 {
+			usbphy1: usbphy at 8007e000 {
+				status = "okay";
+			};
+
+			auart0: serial at 8006a000 {
 				pinctrl-names = "default";
-				pinctrl-0 = <&auart3_pins_a>;
+				pinctrl-0 = <&auart0_2pins_a>;
 				status = "okay";
 			};
 		};
 	};
 
 	ahb at 80080000 {
+		usb0: usb at 80080000 {
+			vbus-supply = <&reg_usb0_vbus>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&usbphy0_pins_a>;
+			status = "okay";
+		};
+
+		usb1: usb at 80090000 {
+			vbus-supply = <&reg_usb1_vbus>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&usbphy1_pins_a>;
+			status = "okay";
+		};
+
 		mac0: ethernet at 800f0000 {
 			phy-mode = "rmii";
 			pinctrl-names = "default";
 			pinctrl-0 = <&mac0_pins_a>;
-			phy-reset-gpios = <&gpio3 11 0>;
 			status = "okay";
 		};
 
@@ -198,6 +241,32 @@
 			regulator-max-microvolt = <3300000>;
 			regulator-always-on;
 		};
+
+		reg_vddio_sd0: vddio-sd0 {
+			compatible = "regulator-fixed";
+			regulator-name = "vddio-sd0";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio3 28 0>;
+		};
+
+		reg_usb0_vbus: usb0_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb0_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio3 12 0>;
+			enable-active-low;
+		};
+
+		reg_usb1_vbus: usb1_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb1_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio3 13 0>;
+			enable-active-low;
+		};
 	};
 
 	sound {
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 8dabfe8..5ac45a1 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -241,7 +241,6 @@ static void __init imx28_evk_init(void)
 
 static void __init m28evk_init(void)
 {
-	enable_clk_enet_out();
 	update_fec_mac_prop(OUI_DENX);
 
 	mxsfb_pdata.mode_list = m28evk_video_modes;
-- 
1.7.10.4

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Marek Vasut]

Add DTS file for this custom board.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28-sps1.dts |  168 ++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c     |    3 +
 2 files changed, 171 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx28-sps1.dts

diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
new file mode 100644
index 0000000..d05b1cb
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2012 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/ "imx28.dtsi"
+
+/ {
+	model = "SchulerControl GmbH, SC SPS 1";
+	compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			pinctrl at 80018000 {
+				led_pins_sps1: leds at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x0003 /* MX28_PAD_GPMI_D00__GPIO_0_0 */
+						0x0033 /* MX28_PAD_GPMI_D03__GPIO_0_3 */
+						0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+			};
+
+			ssp0: ssp at 80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_4bit_pins_a>;
+				bus-width = <4>;
+				status = "okay";
+			};
+
+			ssp2: ssp at 80014000 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,imx28-spi";
+				pinctrl-names = "default";
+				pinctrl-0 = <&spi2_pins_a>;
+				status = "okay";
+
+				flash: m25p80 at 0 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "everspin,mr25h256", "mr25h256";
+					spi-max-frequency = <40000000>;
+					reg = <0>;
+				};
+			};
+		};
+
+		apbx at 80040000 {
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				clock-frequency = <400000>;
+				status = "okay";
+
+				rtc: rtc at 51 {
+					compatible = "nxp,pcf8563";
+					reg = <0x51>;
+				};
+
+				eeprom: eeprom at 52 {
+					compatible = "atmel,24c64";
+					reg = <0x52>;
+					pagesize = <32>;
+				};
+			};
+
+			duart: serial at 80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_a>;
+				status = "okay";
+			};
+
+			usbphy0: usbphy at 8007c000 {
+				status = "okay";
+			};
+
+			auart0: serial at 8006a000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&auart0_pins_a>;
+				status = "okay";
+			};
+
+			rtc at 80056000 {
+				status = "okay";
+			};
+		};
+	};
+
+	ahb at 80080000 {
+		usb0: usb at 80080000 {
+			vbus-supply = <&reg_usb0_vbus>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&usbphy0_pins_b>;
+			status = "okay";
+		};
+
+		mac0: ethernet at 800f0000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac0_pins_a>;
+			status = "okay";
+		};
+
+		mac1: ethernet at 800f4000 {
+			phy-mode = "rmii";
+			pinctrl-names = "default";
+			pinctrl-0 = <&mac1_pins_a>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_usb0_vbus: usb0_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb0_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio3 9 0>;
+			enable-active-low;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins_sps1>;
+		status = "okay";
+
+		led at 1 {
+			label = "sps1-1:yellow:user";
+			gpios = <&gpio0 6 0>;
+			linux,default-trigger = "heartbeat";
+		};
+
+		led at 2 {
+			label = "sps1-2:red:user";
+			gpios = <&gpio0 3 0>;
+			linux,default-trigger = "heartbeat";
+		};
+
+		led at 3 {
+			label = "sps1-3:red:user";
+			gpios = <&gpio0 0 0>;
+			default-trigger = "heartbeat";
+		};
+
+	};
+};
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 5ac45a1..f131ff1 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -279,6 +279,8 @@ static void __init mxs_machine_init(void)
 		m28evk_init();
 	else if (of_machine_is_compatible("bluegiga,apx4devkit"))
 		apx4devkit_init();
+	else if (of_machine_is_compatible("schulercontrol,imx28-sps1"))
+		imx28_evk_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     mxs_auxdata_lookup, NULL);
@@ -298,6 +300,7 @@ static const char *imx28_dt_compat[] __initdata = {
 	"denx,m28evk",
 	"fsl,imx28-evk",
 	"karo,tx28",
+	"schulercontrol,imx28-sps1",
 	"fsl,imx28",
 	NULL,
 };
-- 
1.7.10.4

[PATCH 1/4 V2] ARM: mx28: Add SPI 2 pinmux into imx28.dtsi

[Shawn Guo]

On Sat, Aug 25, 2012 at 01:51:37AM +0200, Marek Vasut wrote:
> Add this SSP port 2 pin multiplexing configuration into the imx28.dtsi file.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>

Applied, thanks.

-- 
Regards,
Shawn

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Shawn Guo]

On Sat, Aug 25, 2012 at 01:51:38AM +0200, Marek Vasut wrote:
> Add the pinmux settings for USB PHY overcurrent pins.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
>  arch/arm/boot/dts/imx28.dtsi |   30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> V2: This is pulled from the M28EVK and SPS1 board files, put it into common
>     file.
> 
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> index b996c2d..3cba62d 100644
> --- a/arch/arm/boot/dts/imx28.dtsi
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -520,6 +520,36 @@
>  					fsl,voltage = <1>;
>  					fsl,pull-up = <1>;
>  				};
> +
> +				usbphy0_pins_a: usbphy0 at 0 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x2152 /* MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
> +
> +				usbphy0_pins_b: usbphy0 at 1 {
> +					reg = <0>;

This should be
					reg = <1>;

Fixed it up and applied the patch.

> +					fsl,pinmux-ids = <
> +						0x3061 /* MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
> +
> +				usbphy1_pins_a: usbphy1 at 0 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x2142 /* MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
>  			};
>  
>  			digctl at 8001c000 {
> -- 
> 1.7.10.4
> 

-- 
Regards,
Shawn

[PATCH 3/4 V2] ARM: mxs: Update DENX M28 machine and dts file

[Shawn Guo]

On Sat, Aug 25, 2012 at 01:51:39AM +0200, Marek Vasut wrote:
> +
> +		reg_vddio_sd0: vddio-sd0 {
> +			compatible = "regulator-fixed";
> +			regulator-name = "vddio-sd0";
> +			regulator-min-microvolt = <3300000>;
> +			regulator-max-microvolt = <3300000>;
> +			gpio = <&gpio3 28 0>;
> +		};
> +
> +		reg_usb0_vbus: usb0_vbus {
> +			compatible = "regulator-fixed";
> +			regulator-name = "usb0_vbus";
> +			regulator-min-microvolt = <5000000>;
> +			regulator-max-microvolt = <5000000>;
> +			gpio = <&gpio3 12 0>;
> +			enable-active-low;

Documentation/devicetree/bindings/regulator/fixed-regulator.txt:

- enable-active-high: Polarity of GPIO is Active high
If this property is missing, the default assumed is Active low.

I suspect you need to recheck this aspect for all these 3 fixed
regulators.

> +		};
> +
> +		reg_usb1_vbus: usb1_vbus {
> +			compatible = "regulator-fixed";
> +			regulator-name = "usb1_vbus";
> +			regulator-min-microvolt = <5000000>;
> +			regulator-max-microvolt = <5000000>;
> +			gpio = <&gpio3 13 0>;
> +			enable-active-low;
> +		};

-- 
Regards,
Shawn

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Shawn Guo]

Please base it on my mxs/dt-for-3.7 branch.

On Sat, Aug 25, 2012 at 01:51:40AM +0200, Marek Vasut wrote:
> Add DTS file for this custom board.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
>  arch/arm/boot/dts/imx28-sps1.dts |  168 ++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-mxs/mach-mxs.c     |    3 +
>  2 files changed, 171 insertions(+)
>  create mode 100644 arch/arm/boot/dts/imx28-sps1.dts
> 
> diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
> new file mode 100644
> index 0000000..d05b1cb
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx28-sps1.dts
> @@ -0,0 +1,168 @@
> +/*
> + * Copyright (C) 2012 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/ "imx28.dtsi"
> +
> +/ {
> +	model = "SchulerControl GmbH, SC SPS 1";
> +	compatible = "schulercontrol,imx28-sps1", "fsl,imx28";

We should use the short name as prefix if it has one.

> +
> +	memory {
> +		reg = <0x40000000 0x08000000>;
> +	};
> +
> +	apb at 80000000 {
> +		apbh at 80000000 {
> +			pinctrl at 80018000 {
> +				led_pins_sps1: leds at 0 {

It should be referenced by the pinctrl state directly under node
pinctrl at 80018000, otherwise the pins will not be set up.

Also we usually use a generic name here something like

				hog_pins_a: hog at 0 {

so that we do not need to create new node every time we add pins
for a new module.

> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x0003 /* MX28_PAD_GPMI_D00__GPIO_0_0 */
> +						0x0033 /* MX28_PAD_GPMI_D03__GPIO_0_3 */
> +						0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 */
> +					>;
> +					fsl,drive-strength = <0>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
> +
> +			};
> +
> +			ssp0: ssp at 80010000 {
> +				compatible = "fsl,imx28-mmc";
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&mmc0_4bit_pins_a>;
> +				bus-width = <4>;
> +				status = "okay";
> +			};
> +
> +			ssp2: ssp at 80014000 {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				compatible = "fsl,imx28-spi";
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&spi2_pins_a>;
> +				status = "okay";
> +
> +				flash: m25p80 at 0 {
> +					#address-cells = <1>;
> +					#size-cells = <1>;
> +					compatible = "everspin,mr25h256", "mr25h256";

Node name "m25p80" and "mr25h256", same thing?

> +					spi-max-frequency = <40000000>;
> +					reg = <0>;
> +				};
> +			};
> +		};
> +
> +		apbx at 80040000 {
> +			i2c0: i2c at 80058000 {
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&i2c0_pins_a>;
> +				clock-frequency = <400000>;
> +				status = "okay";
> +
> +				rtc: rtc at 51 {
> +					compatible = "nxp,pcf8563";
> +					reg = <0x51>;
> +				};
> +
> +				eeprom: eeprom at 52 {
> +					compatible = "atmel,24c64";
> +					reg = <0x52>;
> +					pagesize = <32>;
> +				};
> +			};
> +
> +			duart: serial at 80074000 {
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&duart_pins_a>;
> +				status = "okay";
> +			};
> +
> +			usbphy0: usbphy at 8007c000 {
> +				status = "okay";
> +			};
> +
> +			auart0: serial at 8006a000 {
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&auart0_pins_a>;
> +				status = "okay";
> +			};
> +
> +			rtc at 80056000 {
> +				status = "okay";
> +			};

This is not needed.  We have rtc enabled in imx28.dtsi by default now.

> +		};
> +	};
> +
> +	ahb at 80080000 {
> +		usb0: usb at 80080000 {
> +			vbus-supply = <&reg_usb0_vbus>;
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&usbphy0_pins_b>;
> +			status = "okay";
> +		};
> +
> +		mac0: ethernet at 800f0000 {
> +			phy-mode = "rmii";
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&mac0_pins_a>;
> +			status = "okay";
> +		};
> +
> +		mac1: ethernet at 800f4000 {
> +			phy-mode = "rmii";
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&mac1_pins_a>;
> +			status = "okay";
> +		};
> +	};
> +
> +	regulators {
> +		compatible = "simple-bus";
> +
> +		reg_usb0_vbus: usb0_vbus {
> +			compatible = "regulator-fixed";
> +			regulator-name = "usb0_vbus";
> +			regulator-min-microvolt = <5000000>;
> +			regulator-max-microvolt = <5000000>;
> +			gpio = <&gpio3 9 0>;
> +			enable-active-low;

Same comment I put on patch #3.

> +		};
> +	};
> +
> +	leds {
> +		compatible = "gpio-leds";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&led_pins_sps1>;

Aha, you put it here.  But do you have leds-gpio driver call pinctrl
to set them up?

> +		status = "okay";
> +
> +		led at 1 {

There should be a "reg" property matching the number after @.  So you
need to either give it a unique node name without @?, or you add a reg
property.

> +			label = "sps1-1:yellow:user";
> +			gpios = <&gpio0 6 0>;
> +			linux,default-trigger = "heartbeat";
> +		};
> +
> +		led at 2 {
> +			label = "sps1-2:red:user";
> +			gpios = <&gpio0 3 0>;
> +			linux,default-trigger = "heartbeat";
> +		};
> +
> +		led at 3 {
> +			label = "sps1-3:red:user";
> +			gpios = <&gpio0 0 0>;
> +			default-trigger = "heartbeat";
> +		};
> +
> +	};
> +};
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 5ac45a1..f131ff1 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -279,6 +279,8 @@ static void __init mxs_machine_init(void)
>  		m28evk_init();
>  	else if (of_machine_is_compatible("bluegiga,apx4devkit"))
>  		apx4devkit_init();
> +	else if (of_machine_is_compatible("schulercontrol,imx28-sps1"))
> +		imx28_evk_init();

Call imx28_evk_init for imx28-sps1 board?

>  
>  	of_platform_populate(NULL, of_default_bus_match_table,
>  			     mxs_auxdata_lookup, NULL);
> @@ -298,6 +300,7 @@ static const char *imx28_dt_compat[] __initdata = {
>  	"denx,m28evk",
>  	"fsl,imx28-evk",
>  	"karo,tx28",
> +	"schulercontrol,imx28-sps1",

See mxs/dt-for-3.7 branch.  We are using generic compat string for
matching.

>  	"fsl,imx28",
>  	NULL,
>  };
> -- 
> 1.7.10.4
> 

-- 
Regards,
Shawn

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Marek Vasut]

Dear Shawn Guo,

> Please base it on my mxs/dt-for-3.7 branch.
> 
> On Sat, Aug 25, 2012 at 01:51:40AM +0200, Marek Vasut wrote:
> > Add DTS file for this custom board.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > ---
> > 
> >  arch/arm/boot/dts/imx28-sps1.dts |  168
> >  ++++++++++++++++++++++++++++++++++++++ arch/arm/mach-mxs/mach-mxs.c    
> >  |    3 +
> >  2 files changed, 171 insertions(+)
> >  create mode 100644 arch/arm/boot/dts/imx28-sps1.dts
> > 
> > diff --git a/arch/arm/boot/dts/imx28-sps1.dts
> > b/arch/arm/boot/dts/imx28-sps1.dts new file mode 100644
> > index 0000000..d05b1cb
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx28-sps1.dts
> > @@ -0,0 +1,168 @@
> > +/*
> > + * Copyright (C) 2012 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/ "imx28.dtsi"
> > +
> > +/ {
> > +	model = "SchulerControl GmbH, SC SPS 1";
> > +	compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
> 
> We should use the short name as prefix if it has one.
> 
> > +
> > +	memory {
> > +		reg = <0x40000000 0x08000000>;
> > +	};
> > +
> > +	apb at 80000000 {
> > +		apbh at 80000000 {
> > +			pinctrl at 80018000 {
> > +				led_pins_sps1: leds at 0 {
> 
> It should be referenced by the pinctrl state directly under node
> pinctrl at 80018000, otherwise the pins will not be set up.
> 
> Also we usually use a generic name here something like
> 
> 				hog_pins_a: hog at 0 {
> 
> so that we do not need to create new node every time we add pins
> for a new module.

So I'll ignore this comment and add pinctrl call into leds-gpio ... can we agree 
on that ?

[...]

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Shawn Guo]

On Sat, Aug 25, 2012 at 02:35:52PM +0200, Marek Vasut wrote:
> So I'll ignore this comment and add pinctrl call into leds-gpio ... can we agree 
> on that ?
> 
I'm fine.  But I have to postpone this part of dts change until I see
the driver part gets accepted.

-- 
Regards,
Shawn

[PATCH 3/4 V2] ARM: mxs: Update DENX M28 machine and dts file

[Marek Vasut]

Dear Shawn Guo,

> On Sat, Aug 25, 2012 at 01:51:39AM +0200, Marek Vasut wrote:
> > +
> > +		reg_vddio_sd0: vddio-sd0 {
> > +			compatible = "regulator-fixed";
> > +			regulator-name = "vddio-sd0";
> > +			regulator-min-microvolt = <3300000>;
> > +			regulator-max-microvolt = <3300000>;
> > +			gpio = <&gpio3 28 0>;
> > +		};
> > +
> > +		reg_usb0_vbus: usb0_vbus {
> > +			compatible = "regulator-fixed";
> > +			regulator-name = "usb0_vbus";
> > +			regulator-min-microvolt = <5000000>;
> > +			regulator-max-microvolt = <5000000>;
> > +			gpio = <&gpio3 12 0>;
> > +			enable-active-low;
> 
> Documentation/devicetree/bindings/regulator/fixed-regulator.txt:
> 
> - enable-active-high: Polarity of GPIO is Active high
> If this property is missing, the default assumed is Active low.
> 
> I suspect you need to recheck this aspect for all these 3 fixed
> regulators.

Ok, so the prop had no impact? I'll retest and resubmit. Also, put the SPS1 on 
hold until the led issue is done for.

Thanks

> > +		};
> > +
> > +		reg_usb1_vbus: usb1_vbus {
> > +			compatible = "regulator-fixed";
> > +			regulator-name = "usb1_vbus";
> > +			regulator-min-microvolt = <5000000>;
> > +			regulator-max-microvolt = <5000000>;
> > +			gpio = <&gpio3 13 0>;
> > +			enable-active-low;
> > +		};

Best regards,
Marek Vasut

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Shawn Guo]

On Sat, Aug 25, 2012 at 04:30:45PM +0800, Shawn Guo wrote:
> > +				flash: m25p80 at 0 {
> > +					#address-cells = <1>;
> > +					#size-cells = <1>;
> > +					compatible = "everspin,mr25h256", "mr25h256";
> 
> Node name "m25p80" and "mr25h256", same thing?
> 
Ok, just got reminded by Fabio, m25p80 covers many devices including
mr25h256 here.

-- 
Regards,
Shawn

[PATCH 4/4] ARM: mxs: Add SchulerControl SPS1 DTS file

[Marek Vasut]

Dear Shawn Guo,

> On Sat, Aug 25, 2012 at 04:30:45PM +0800, Shawn Guo wrote:
> > > +				flash: m25p80 at 0 {
> > > +					#address-cells = <1>;
> > > +					#size-cells = <1>;
> > > +					compatible = "everspin,mr25h256", 
"mr25h256";
> > 
> > Node name "m25p80" and "mr25h256", same thing?
> 
> Ok, just got reminded by Fabio, m25p80 covers many devices including
> mr25h256 here.

I still need to look into the OUI

Best regards,
Marek Vasut

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Michael Grzeschik]

Hi Marek, Peter,

On Sat, Aug 25, 2012 at 01:51:38AM +0200, Marek Vasut wrote:
> Add the pinmux settings for USB PHY overcurrent pins.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> ---
>  arch/arm/boot/dts/imx28.dtsi |   30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> V2: This is pulled from the M28EVK and SPS1 board files, put it into common
>     file.
> 
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> index b996c2d..3cba62d 100644
> --- a/arch/arm/boot/dts/imx28.dtsi
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -520,6 +520,36 @@
>  					fsl,voltage = <1>;
>  					fsl,pull-up = <1>;
>  				};
> +
> +				usbphy0_pins_a: usbphy0 at 0 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x2152 /* MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
> +
> +				usbphy0_pins_b: usbphy0 at 1 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x3061 /* MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
> +
> +				usbphy1_pins_a: usbphy1 at 0 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						0x2142 /* MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> +					>;
> +					fsl,drive-strength = <2>;
> +					fsl,voltage = <1>;
> +					fsl,pull-up = <0>;
> +				};
>  			};
>  
>  			digctl at 8001c000 {
> -- 
> 1.7.10.4


@Marek: Did you test the overcurrent functionality with the MX28 and this pinmux?

I currently can not trigger any overcurrent events and also don't
see changes in the PORTSC register after pulling the OC pin to 3V3.

Thanks,
Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Peter Chen]

 
> >
> > diff --git a/arch/arm/boot/dts/imx28.dtsi
> b/arch/arm/boot/dts/imx28.dtsi
> > index b996c2d..3cba62d 100644
> > --- a/arch/arm/boot/dts/imx28.dtsi
> > +++ b/arch/arm/boot/dts/imx28.dtsi
> > @@ -520,6 +520,36 @@
> >  					fsl,voltage = <1>;
> >  					fsl,pull-up = <1>;
> >  				};
> > +
> > +				usbphy0_pins_a: usbphy0 at 0 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x2152 /*
> MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> > +
> > +				usbphy0_pins_b: usbphy0 at 1 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x3061 /*
> MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> > +
> > +				usbphy1_pins_a: usbphy1 at 0 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x2142 /*
> MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> >  			};
> >
> >  			digctl at 8001c000 {
> > --
> > 1.7.10.4
> 
> 
> @Marek: Did you test the overcurrent functionality with the MX28 and this
> pinmux?
> 
> I currently can not trigger any overcurrent events and also don't
> see changes in the PORTSC register after pulling the OC pin to 3V3.
> 

I haven't checked pinmux detail, have you enabled oc and
set oc's polarity (HW_DIGCTL_CTRL - 8001_C000h)?

Peter

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Michael Grzeschik]

On Sat, Nov 23, 2013 at 02:48:48PM +0000, Peter Chen wrote:
> 
>  
> > >
> > > diff --git a/arch/arm/boot/dts/imx28.dtsi
> > b/arch/arm/boot/dts/imx28.dtsi
> > > index b996c2d..3cba62d 100644
> > > --- a/arch/arm/boot/dts/imx28.dtsi
> > > +++ b/arch/arm/boot/dts/imx28.dtsi
> > > @@ -520,6 +520,36 @@
> > >  					fsl,voltage = <1>;
> > >  					fsl,pull-up = <1>;
> > >  				};
> > > +
> > > +				usbphy0_pins_a: usbphy0 at 0 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x2152 /*
> > MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > > +
> > > +				usbphy0_pins_b: usbphy0 at 1 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x3061 /*
> > MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > > +
> > > +				usbphy1_pins_a: usbphy1 at 0 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x2142 /*
> > MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > >  			};
> > >
> > >  			digctl at 8001c000 {
> > > --
> > > 1.7.10.4
> > 
> > 
> > @Marek: Did you test the overcurrent functionality with the MX28 and this
> > pinmux?
> > 
> > I currently can not trigger any overcurrent events and also don't
> > see changes in the PORTSC register after pulling the OC pin to 3V3.
> > 
> 
> I haven't checked pinmux detail, have you enabled oc and
> set oc's polarity (HW_DIGCTL_CTRL - 8001_C000h)?

No, I was not aware those DIG*DEEP*CTL bits exist. :)

Thank you Peter!

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Marek Vasut]

Hello Michael,

> Hi Marek, Peter,
> 
> On Sat, Aug 25, 2012 at 01:51:38AM +0200, Marek Vasut wrote:
> > Add the pinmux settings for USB PHY overcurrent pins.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Chris Ball <cjb@laptop.org>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > ---
> > 
> >  arch/arm/boot/dts/imx28.dtsi |   30 ++++++++++++++++++++++++++++++
> >  1 file changed, 30 insertions(+)
> > 
> > V2: This is pulled from the M28EVK and SPS1 board files, put it into
> > common
> > 
> >     file.
> > 
> > diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> > index b996c2d..3cba62d 100644
> > --- a/arch/arm/boot/dts/imx28.dtsi
> > +++ b/arch/arm/boot/dts/imx28.dtsi
> > @@ -520,6 +520,36 @@
> > 
> >  					fsl,voltage = <1>;
> >  					fsl,pull-up = <1>;
> >  				
> >  				};
> > 
> > +
> > +				usbphy0_pins_a: usbphy0 at 0 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x2152 /* 
MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> > +
> > +				usbphy0_pins_b: usbphy0 at 1 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x3061 /* 
MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> > +
> > +				usbphy1_pins_a: usbphy1 at 0 {
> > +					reg = <0>;
> > +					fsl,pinmux-ids = <
> > +						0x2142 /* 
MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> > +					>;
> > +					fsl,drive-strength = <2>;
> > +					fsl,voltage = <1>;
> > +					fsl,pull-up = <0>;
> > +				};
> > 
> >  			};
> >  			
> >  			digctl at 8001c000 {
> 
> @Marek: Did you test the overcurrent functionality with the MX28 and this
> pinmux?
> 
> I currently can not trigger any overcurrent events and also don't
> see changes in the PORTSC register after pulling the OC pin to 3V3.

Sorry for the late reply, I see Peter already replied. Do you see the changes if 
you configure the pin as a GPIO at least ?

Best regards,

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Michael Grzeschik]

Hi Marek, Peter,

On Mon, Nov 25, 2013 at 12:58:32AM +0100, Marek Vasut wrote:
> Hello Michael,
> 
> > Hi Marek, Peter,
> > 
> > On Sat, Aug 25, 2012 at 01:51:38AM +0200, Marek Vasut wrote:
> > > Add the pinmux settings for USB PHY overcurrent pins.
> > > 
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Chris Ball <cjb@laptop.org>
> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > > Cc: Shawn Guo <shawn.guo@linaro.org>
> > > ---
> > > 
> > >  arch/arm/boot/dts/imx28.dtsi |   30 ++++++++++++++++++++++++++++++
> > >  1 file changed, 30 insertions(+)
> > > 
> > > V2: This is pulled from the M28EVK and SPS1 board files, put it into
> > > common
> > > 
> > >     file.
> > > 
> > > diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> > > index b996c2d..3cba62d 100644
> > > --- a/arch/arm/boot/dts/imx28.dtsi
> > > +++ b/arch/arm/boot/dts/imx28.dtsi
> > > @@ -520,6 +520,36 @@
> > > 
> > >  					fsl,voltage = <1>;
> > >  					fsl,pull-up = <1>;
> > >  				
> > >  				};
> > > 
> > > +
> > > +				usbphy0_pins_a: usbphy0 at 0 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x2152 /* 
> MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > > +
> > > +				usbphy0_pins_b: usbphy0 at 1 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x3061 /* 
> MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > > +
> > > +				usbphy1_pins_a: usbphy1 at 0 {
> > > +					reg = <0>;
> > > +					fsl,pinmux-ids = <
> > > +						0x2142 /* 
> MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */
> > > +					>;
> > > +					fsl,drive-strength = <2>;
> > > +					fsl,voltage = <1>;
> > > +					fsl,pull-up = <0>;
> > > +				};
> > > 
> > >  			};
> > >  			
> > >  			digctl at 8001c000 {
> > 
> > @Marek: Did you test the overcurrent functionality with the MX28 and this
> > pinmux?
> > 
> > I currently can not trigger any overcurrent events and also don't
> > see changes in the PORTSC register after pulling the OC pin to 3V3.
> 
> Sorry for the late reply, I see Peter already replied. Do you see the changes if 
> you configure the pin as a GPIO at least ?

The GPIO is working for this pin. But also the DIGCTL register bits
helped here.  Now the OC event triggers if the pin gets pulled to 3V3.

I am currently looking for a good place to enable the DIGCTL bits.
I suggest to enable them per default.  As we don't have USBMISC registers
in MX28, the bits should be toggled in ci_hdrc_imx.c if the of property
"disable-overcurrent" is not found.  I will use the syscon interface to
reach them with the regmap interface.

Any objections?

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Peter Chen]

 
> 
> The GPIO is working for this pin. But also the DIGCTL register bits
> helped here.  Now the OC event triggers if the pin gets pulled to 3V3.
> 
> I am currently looking for a good place to enable the DIGCTL bits.
> I suggest to enable them per default.  As we don't have USBMISC registers
> in MX28, the bits should be toggled in ci_hdrc_imx.c if the of property
> "disable-overcurrent" is not found.  I will use the syscon interface to
> reach them with the regmap interface.
> 

Hi Michael,

usbmisc register doesn't stand for the register needs to be in usb controller.
Any registers which are related to USB function can be considered as usbmisc
registers. You will see FSL-style SoC, the over-current or other related setting
are at controller base + 0x800 (0x600), but Sigmatel-style SoC (mx28/mx23), the usb
register are not at controller register region.

My suggestion is: create usbmisc node for mx28, and put oc setting at there, it can
keep ci_hdrc_imx.c clean.
Besides, you may need two dts user setting for oc enable and oc polarity.

Peter

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Michael Grzeschik]

Hi Peter,

On Tue, Nov 26, 2013 at 12:08:03PM +0000, Peter Chen wrote:
> > The GPIO is working for this pin. But also the DIGCTL register bits
> > helped here.  Now the OC event triggers if the pin gets pulled to 3V3.
> > 
> > I am currently looking for a good place to enable the DIGCTL bits.
> > I suggest to enable them per default.  As we don't have USBMISC registers
> > in MX28, the bits should be toggled in ci_hdrc_imx.c if the of property
> > "disable-overcurrent" is not found.  I will use the syscon interface to
> > reach them with the regmap interface.
> > 
> usbmisc register doesn't stand for the register needs to be in usb controller.
> Any registers which are related to USB function can be considered as usbmisc
> registers. You will see FSL-style SoC, the over-current or other related setting
> are at controller base + 0x800 (0x600), but Sigmatel-style SoC (mx28/mx23), the usb
> register are not at controller register region.
> 
> My suggestion is: create usbmisc node for mx28, and put oc setting at there, it can
> keep ci_hdrc_imx.c clean.
> Besides, you may need two dts user setting for oc enable and oc polarity.

IMHO usbmisc is a driver with memery mapped region. So it would probably
make more sense to use syscon for that purpose, as we only need special
registers out of the digctl register.

What do you think of that code:

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 68f7f5e..ddac5cb 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -19,12 +19,18 @@
 #include <linux/dma-mapping.h>
 #include <linux/usb/chipidea.h>
 #include <linux/clk.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
 
 #include "ci.h"
 #include "ci_hdrc_imx.h"
 
 #define CI_HDRC_IMX_IMX28_WRITE_FIX BIT(0)
 
+#define DIGCTL_CTRL_SET				0x4
+#define USB_OTG_OC_ENABLE_BIT			BIT(23)
+#define USB_H1_OC_ENABLE_BIT			BIT(24)
+
 struct ci_hdrc_imx_platform_flag {
 	unsigned int flags;
 };
@@ -105,6 +111,26 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 	const struct of_device_id *of_id =
 			of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev);
 	const struct ci_hdrc_imx_platform_flag *imx_platform_flag = of_id->data;
+	struct device_node *np = pdev->dev.of_node;
+	struct regmap *digctl;
+
+	/* Some SoCs don't have digctl registers */
+	if (of_get_property(np, "fsl,digctl", NULL)) {
+		struct of_phandle_args args;
+		int enable_bit = USB_OTG_OC_ENABLE_BIT;
+		ret = of_parse_phandle_with_args(np, "fsl,digctl", "#index-cells",
+					0, &args);
+		digctl = syscon_regmap_lookup_by_phandle
+			(np, "fsl,digctl");
+		if (IS_ERR(digctl)) {
+			dev_dbg(&pdev->dev,
+				"failed to find regmap for digctl\n");
+		} else {
+			if (args.args[0])
+				enable_bit = USB_H1_OC_ENABLE_BIT;
+			regmap_write(digctl, DIGCTL_CTRL_SET, enable_bit);
+		}
+	}
 
 	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
 	if (!data) {


diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 600f7cb..bb61c49 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -668,11 +668,12 @@
 				};
 			};
 
-			digctl at 8001c000 {
-				compatible = "fsl,imx28-digctl";
+			digctl: digctl at 8001c000 {
+				#index-cells = <1>;
+				compatible = "fsl,imx28-digctl", "syscon";
 				reg = <0x8001c000 0x2000>;
 				interrupts = <89>;
-				status = "disabled";
+				status = "okay";
 			};
 
 			etm at 80022000 {
@@ -976,6 +977,7 @@
 			interrupts = <93>;
 			clocks = <&clks 60>;
 			fsl,usbphy = <&usbphy0>;
+			fsl,digctl = <&digctl 0>;
 			status = "disabled";
 		};
 
@@ -985,6 +987,7 @@
 			interrupts = <92>;
 			clocks = <&clks 61>;
 			fsl,usbphy = <&usbphy1>;
+			fsl,digctl = <&digctl 1>;
 			status = "disabled";
 		};
 
Thanks,
Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/4 V2] ARM: mx28: Add USB PHY overcurrent pinmux

[Peter Chen]

On Fri, Dec 06, 2013 at 04:17:33PM +0100, Michael Grzeschik wrote:
> Hi Peter,
> 
> On Tue, Nov 26, 2013 at 12:08:03PM +0000, Peter Chen wrote:
> > > The GPIO is working for this pin. But also the DIGCTL register bits
> > > helped here.  Now the OC event triggers if the pin gets pulled to 3V3.
> > > 
> > > I am currently looking for a good place to enable the DIGCTL bits.
> > > I suggest to enable them per default.  As we don't have USBMISC registers
> > > in MX28, the bits should be toggled in ci_hdrc_imx.c if the of property
> > > "disable-overcurrent" is not found.  I will use the syscon interface to
> > > reach them with the regmap interface.
> > > 
> > usbmisc register doesn't stand for the register needs to be in usb controller.
> > Any registers which are related to USB function can be considered as usbmisc
> > registers. You will see FSL-style SoC, the over-current or other related setting
> > are at controller base + 0x800 (0x600), but Sigmatel-style SoC (mx28/mx23), the usb
> > register are not at controller register region.
> > 
> > My suggestion is: create usbmisc node for mx28, and put oc setting at there, it can
> > keep ci_hdrc_imx.c clean.
> > Besides, you may need two dts user setting for oc enable and oc polarity.
> 
> IMHO usbmisc is a driver with memery mapped region. So it would probably
> make more sense to use syscon for that purpose, as we only need special
> registers out of the digctl register.
> 

Hi Michael, the reason why we have usbmisc is that we want to hide SoC's
differentiate at ci_hdrc_imx.c, and call uniform APIs in it. We already
have over-current handling at usbmisc for other SoCs, it is better to put
all i.mx over-current handlings at the same place.

Yes, when we design usbmisc, we just thought it was for usb non-core register
and this register region is only for USB, but now, we find it is not correct 
for  i.mx28 whose usb registers are at other regions and shared with others
modules.

I think usbmisc should handle it, that is some SoCs uses memory mapped region,
and others use syscon. It is SoC differentiate, the dts can describe it.

Peter

> What do you think of that code:
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> index 68f7f5e..ddac5cb 100644
> --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> @@ -19,12 +19,18 @@
>  #include <linux/dma-mapping.h>
>  #include <linux/usb/chipidea.h>
>  #include <linux/clk.h>
> +#include <linux/regmap.h>
> +#include <linux/mfd/syscon.h>
>  
>  #include "ci.h"
>  #include "ci_hdrc_imx.h"
>  
>  #define CI_HDRC_IMX_IMX28_WRITE_FIX BIT(0)
>  
> +#define DIGCTL_CTRL_SET				0x4
> +#define USB_OTG_OC_ENABLE_BIT			BIT(23)
> +#define USB_H1_OC_ENABLE_BIT			BIT(24)
> +
>  struct ci_hdrc_imx_platform_flag {
>  	unsigned int flags;
>  };
> @@ -105,6 +111,26 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
>  	const struct of_device_id *of_id =
>  			of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev);
>  	const struct ci_hdrc_imx_platform_flag *imx_platform_flag = of_id->data;
> +	struct device_node *np = pdev->dev.of_node;
> +	struct regmap *digctl;
> +
> +	/* Some SoCs don't have digctl registers */
> +	if (of_get_property(np, "fsl,digctl", NULL)) {
> +		struct of_phandle_args args;
> +		int enable_bit = USB_OTG_OC_ENABLE_BIT;
> +		ret = of_parse_phandle_with_args(np, "fsl,digctl", "#index-cells",
> +					0, &args);
> +		digctl = syscon_regmap_lookup_by_phandle
> +			(np, "fsl,digctl");
> +		if (IS_ERR(digctl)) {
> +			dev_dbg(&pdev->dev,
> +				"failed to find regmap for digctl\n");
> +		} else {
> +			if (args.args[0])
> +				enable_bit = USB_H1_OC_ENABLE_BIT;
> +			regmap_write(digctl, DIGCTL_CTRL_SET, enable_bit);
> +		}
> +	}
>  
>  	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>  	if (!data) {
> 
> 
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> index 600f7cb..bb61c49 100644
> --- a/arch/arm/boot/dts/imx28.dtsi
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -668,11 +668,12 @@
>  				};
>  			};
>  
> -			digctl at 8001c000 {
> -				compatible = "fsl,imx28-digctl";
> +			digctl: digctl at 8001c000 {
> +				#index-cells = <1>;
> +				compatible = "fsl,imx28-digctl", "syscon";
>  				reg = <0x8001c000 0x2000>;
>  				interrupts = <89>;
> -				status = "disabled";
> +				status = "okay";
>  			};
>  
>  			etm at 80022000 {
> @@ -976,6 +977,7 @@
>  			interrupts = <93>;
>  			clocks = <&clks 60>;
>  			fsl,usbphy = <&usbphy0>;
> +			fsl,digctl = <&digctl 0>;
>  			status = "disabled";
>  		};
>  
> @@ -985,6 +987,7 @@
>  			interrupts = <92>;
>  			clocks = <&clks 61>;
>  			fsl,usbphy = <&usbphy1>;
> +			fsl,digctl = <&digctl 1>;
>  			status = "disabled";
>  		};
>  
> Thanks,
> Michael
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 

-- 

Best Regards,
Peter Chen