* [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC
@ 2014-04-16 7:24 Alexander Shiyan
2014-04-16 7:24 ` [PATCH 2/8] ARM: dts: imx51-babbage: Move "hog" pins into corresponded pin groups Alexander Shiyan
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
This patch allow to define partitions onto NFC in user defined
devicetrees.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 --
arch/arm/boot/dts/imx51.dtsi | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index 7787f46..321662f 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -195,8 +195,6 @@
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-on-flash-bbt;
- #address-cells = <1>;
- #size-cells = <1>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 51b8670..bebbf3b 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -538,6 +538,8 @@
};
nfc: nand at 83fdb000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
compatible = "fsl,imx51-nand";
reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>;
interrupts = <8>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/8] ARM: dts: imx51-babbage: Move "hog" pins into corresponded pin groups
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 3/8] ARM: dts: imx51-babbage: Add missing pingroup for PMIC Alexander Shiyan
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
Move "hog" pins into corresponded pin groups for eSDHC1, eSDHC2,
eCSPI1, gpio-keys, regulator-fixed and codec clock.
Additionally, this patch fixes GPIO active level definition for
USB regulator.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 49 +++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 2dda06b..ad143eb 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -82,6 +82,8 @@
gpio-keys {
compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_keys>;
power {
label = "Power Button";
@@ -137,11 +139,13 @@
reg_usb_vbus: regulator at 0 {
compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbreg>;
reg = <0>;
regulator-name = "usb_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
- gpio = <&gpio2 5 0>;
+ gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
@@ -323,23 +327,7 @@
};
&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-
imx51-babbage {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX51_PAD_GPIO1_0__SD1_CD 0x20d5
- MX51_PAD_GPIO1_1__SD1_WP 0x20d5
- MX51_PAD_GPIO1_5__GPIO1_5 0x100
- MX51_PAD_GPIO1_6__GPIO1_6 0x100
- MX51_PAD_EIM_A27__GPIO2_21 0x5
- MX51_PAD_CSPI1_SS0__GPIO4_24 0x85
- MX51_PAD_CSPI1_SS1__GPIO4_25 0x85
- MX51_PAD_CSPI1_RDY__GPIO4_26 0x80000000
- >;
- };
-
pinctrl_audmux: audmuxgrp {
fsl,pins = <
MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
@@ -349,11 +337,19 @@
>;
};
+ pinctrl_clkcodec: clkcodecgrp {
+ fsl,pins = <
+ MX51_PAD_CSPI1_RDY__GPIO4_26 0x80000000
+ >;
+ };
+
pinctrl_ecspi1: ecspi1grp {
fsl,pins = <
MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
+ MX51_PAD_CSPI1_SS0__GPIO4_24 0x85 /* CS0 */
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x85 /* CS1 */
>;
};
@@ -365,6 +361,8 @@
MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
+ MX51_PAD_GPIO1_0__SD1_CD 0x20d5
+ MX51_PAD_GPIO1_1__SD1_WP 0x20d5
>;
};
@@ -376,6 +374,8 @@
MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
+ MX51_PAD_GPIO1_5__GPIO1_5 0x100 /* WP */
+ MX51_PAD_GPIO1_6__GPIO1_6 0x100 /* CD */
>;
};
@@ -402,6 +402,12 @@
>;
};
+ pinctrl_gpio_keys: gpiokeysgrp {
+ fsl,pins = <
+ MX51_PAD_EIM_A27__GPIO2_21 0x5
+ >;
+ };
+
pinctrl_gpio_leds: gpioledsgrp {
fsl,pins = <
MX51_PAD_EIM_D22__GPIO2_6 0x80000000
@@ -522,7 +528,12 @@
MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x80000000
MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x80000000
MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x80000000
- MX51_PAD_EIM_D21__GPIO2_5 0x80000000
+ >;
+ };
+
+ pinctrl_usbreg: usbreggrp {
+ fsl,pins = <
+ MX51_PAD_EIM_D21__GPIO2_5 0x85
>;
};
};
@@ -548,6 +559,8 @@
sgtl5000: codec at 0a {
compatible = "fsl,sgtl5000";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_clkcodec>;
reg = <0x0a>;
clocks = <&clk_26M>;
VDDA-supply = <&vdig_reg>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/8] ARM: dts: imx51-babbage: Add missing pingroup for PMIC
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
2014-04-16 7:24 ` [PATCH 2/8] ARM: dts: imx51-babbage: Move "hog" pins into corresponded pin groups Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 4/8] ARM: dts: imx51-babbage: Use predefined constants for keys definition Alexander Shiyan
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds missing pin definition for PMIC IRQ GPIO.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index ad143eb..1652f6a 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -199,6 +199,8 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mc13892";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pmic>;
spi-max-frequency = <6000000>;
spi-cs-high;
reg = <0>;
@@ -490,6 +492,12 @@
>;
};
+ pinctrl_pmic: pmicgrp {
+ fsl,pins = <
+ MX51_PAD_GPIO1_8__GPIO1_8 0xe5 /* IRQ */
+ >;
+ };
+
pinctrl_uart1: uart1grp {
fsl,pins = <
MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/8] ARM: dts: imx51-babbage: Use predefined constants for keys definition
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
2014-04-16 7:24 ` [PATCH 2/8] ARM: dts: imx51-babbage: Move "hog" pins into corresponded pin groups Alexander Shiyan
2014-04-16 7:24 ` [PATCH 3/8] ARM: dts: imx51-babbage: Add missing pingroup for PMIC Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 5/8] ARM: dts: imx51-babbage: Add USB OTG regulator node Alexander Shiyan
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 1652f6a..a8d6168 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -88,7 +88,7 @@
power {
label = "Power Button";
gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
- linux,code = <116>; /* KEY_POWER */
+ linux,code = <KEY_POWER>;
gpio-key,wakeup;
};
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/8] ARM: dts: imx51-babbage: Add USB OTG regulator node
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
` (2 preceding siblings ...)
2014-04-16 7:24 ` [PATCH 4/8] ARM: dts: imx51-babbage: Use predefined constants for keys definition Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 6/8] ARM: dts: imx51-babbage: Sort nodes by name Alexander Shiyan
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds a regulator node and pinctrl group for USB OTG.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index a8d6168..ed9d769 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -137,17 +137,29 @@
#address-cells = <1>;
#size-cells = <0>;
- reg_usb_vbus: regulator at 0 {
+ reg_usbh1_vbus: regulator at 0 {
compatible = "regulator-fixed";
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usbreg>;
+ pinctrl-0 = <&pinctrl_usbh1reg>;
reg = <0>;
- regulator-name = "usb_vbus";
+ regulator-name = "usbh1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
+
+ reg_usbotg_vbus: regulator at 1 {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotgreg>;
+ reg = <1>;
+ regulator-name = "usbotg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
};
usbphy {
@@ -539,11 +551,17 @@
>;
};
- pinctrl_usbreg: usbreggrp {
+ pinctrl_usbh1reg: usbh1reggrp {
fsl,pins = <
MX51_PAD_EIM_D21__GPIO2_5 0x85
>;
};
+
+ pinctrl_usbotgreg: usbotgreggrp {
+ fsl,pins = <
+ MX51_PAD_GPIO1_7__GPIO1_7 0x85
+ >;
+ };
};
};
@@ -618,7 +636,7 @@
&usbh1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>;
- vbus-supply = <®_usb_vbus>;
+ vbus-supply = <®_usbh1_vbus>;
fsl,usbphy = <&usbh1phy>;
phy_type = "ulpi";
status = "okay";
@@ -628,5 +646,6 @@
dr_mode = "otg";
disable-over-current;
phy_type = "utmi_wide";
+ vbus-supply = <®_usbotg_vbus>;
status = "okay";
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/8] ARM: dts: imx51-babbage: Sort nodes by name
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
` (3 preceding siblings ...)
2014-04-16 7:24 ` [PATCH 5/8] ARM: dts: imx51-babbage: Add USB OTG regulator node Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 7/8] ARM: dts: imx51-babbage: Add devicetree node for I2C1 Alexander Shiyan
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
This patch sorts nodes by name and moves "iomux" configuration at
the bottom of file.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 266 ++++++++++++++++++------------------
1 file changed, 133 insertions(+), 133 deletions(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index ed9d769..6484b73 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -21,6 +21,20 @@
reg = <0x90000000 0x20000000>;
};
+ clocks {
+ ckih1 {
+ clock-frequency = <22579200>;
+ };
+
+ clk_26M: codec_clock {
+ compatible = "fixed-clock";
+ reg=<0>;
+ #clock-cells = <0>;
+ clock-frequency = <26000000>;
+ gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+ };
+ };
+
display0: display at di0 {
compatible = "fsl,imx-parallel-display";
interface-pix-fmt = "rgb24";
@@ -104,34 +118,6 @@
};
};
- sound {
- compatible = "fsl,imx51-babbage-sgtl5000",
- "fsl,imx-audio-sgtl5000";
- model = "imx51-babbage-sgtl5000";
- ssi-controller = <&ssi2>;
- audio-codec = <&sgtl5000>;
- audio-routing =
- "MIC_IN", "Mic Jack",
- "Mic Jack", "Mic Bias",
- "Headphone Jack", "HP_OUT";
- mux-int-port = <2>;
- mux-ext-port = <3>;
- };
-
- clocks {
- ckih1 {
- clock-frequency = <22579200>;
- };
-
- clk_26M: codec_clock {
- compatible = "fixed-clock";
- reg=<0>;
- #clock-cells = <0>;
- clock-frequency = <26000000>;
- gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
- };
- };
-
regulators {
compatible = "simple-bus";
#address-cells = <1>;
@@ -162,6 +148,20 @@
};
};
+ sound {
+ compatible = "fsl,imx51-babbage-sgtl5000",
+ "fsl,imx-audio-sgtl5000";
+ model = "imx51-babbage-sgtl5000";
+ ssi-controller = <&ssi2>;
+ audio-codec = <&sgtl5000>;
+ audio-routing =
+ "MIC_IN", "Mic Jack",
+ "Mic Jack", "Mic Bias",
+ "Headphone Jack", "HP_OUT";
+ mux-int-port = <2>;
+ mux-ext-port = <3>;
+ };
+
usbphy {
#address-cells = <1>;
#size-cells = <0>;
@@ -176,26 +176,9 @@
};
};
-&esdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc1>;
- fsl,cd-controller;
- fsl,wp-controller;
- status = "okay";
-};
-
-&esdhc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc2>;
- cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
- wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
- status = "okay";
-};
-
-&uart3 {
+&audmux {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart3>;
- fsl,uart-has-rtscts;
+ pinctrl-0 = <&pinctrl_audmux>;
status = "okay";
};
@@ -327,6 +310,47 @@
};
};
+&esdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc1>;
+ fsl,cd-controller;
+ fsl,wp-controller;
+ status = "okay";
+};
+
+&esdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2>;
+ cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+ wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec>;
+ phy-mode = "mii";
+ phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
+ phy-reset-duration = <1>;
+ status = "okay";
+};
+
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ sgtl5000: codec at 0a {
+ compatible = "fsl,sgtl5000";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_clkcodec>;
+ reg = <0x0a>;
+ clocks = <&clk_26M>;
+ VDDA-supply = <&vdig_reg>;
+ VDDIO-supply = <&vvideo_reg>;
+ };
+};
+
&ipu_di0_disp0 {
remote-endpoint = <&display0_in>;
};
@@ -335,11 +359,72 @@
remote-endpoint = <&display1_in>;
};
+&kpp {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_kpp>;
+ linux,keymap = <
+ MATRIX_KEY(0, 0, KEY_UP)
+ MATRIX_KEY(0, 1, KEY_DOWN)
+ MATRIX_KEY(0, 2, KEY_VOLUMEDOWN)
+ MATRIX_KEY(0, 3, KEY_HOME)
+ MATRIX_KEY(1, 0, KEY_RIGHT)
+ MATRIX_KEY(1, 1, KEY_LEFT)
+ MATRIX_KEY(1, 2, KEY_ENTER)
+ MATRIX_KEY(1, 3, KEY_VOLUMEUP)
+ MATRIX_KEY(2, 0, KEY_F6)
+ MATRIX_KEY(2, 1, KEY_F8)
+ MATRIX_KEY(2, 2, KEY_F9)
+ MATRIX_KEY(2, 3, KEY_F10)
+ MATRIX_KEY(3, 0, KEY_F1)
+ MATRIX_KEY(3, 1, KEY_F2)
+ MATRIX_KEY(3, 2, KEY_F3)
+ MATRIX_KEY(3, 3, KEY_POWER)
+ >;
+ status = "okay";
+};
+
&ssi2 {
fsl,mode = "i2s-slave";
status = "okay";
};
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart1>;
+ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2>;
+ status = "okay";
+};
+
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart3>;
+ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
+&usbh1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbh1>;
+ vbus-supply = <®_usbh1_vbus>;
+ fsl,usbphy = <&usbh1phy>;
+ phy_type = "ulpi";
+ status = "okay";
+};
+
+&usbotg {
+ dr_mode = "otg";
+ disable-over-current;
+ phy_type = "utmi_wide";
+ vbus-supply = <®_usbotg_vbus>;
+ status = "okay";
+};
+
&iomuxc {
imx51-babbage {
pinctrl_audmux: audmuxgrp {
@@ -412,7 +497,7 @@
MX51_PAD_NANDF_CS6__FEC_TDATA3 0x80000000
MX51_PAD_NANDF_CS7__FEC_TX_EN 0x80000000
MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK 0x80000000
- MX51_PAD_EIM_A20__GPIO2_14 0x85 /* Reset */
+ MX51_PAD_EIM_A20__GPIO2_14 0x85 /* Reset */
>;
};
@@ -564,88 +649,3 @@
};
};
};
-
-&uart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1>;
- fsl,uart-has-rtscts;
- status = "okay";
-};
-
-&uart2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart2>;
- status = "okay";
-};
-
-&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
-
- sgtl5000: codec at 0a {
- compatible = "fsl,sgtl5000";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_clkcodec>;
- reg = <0x0a>;
- clocks = <&clk_26M>;
- VDDA-supply = <&vdig_reg>;
- VDDIO-supply = <&vvideo_reg>;
- };
-};
-
-&audmux {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_audmux>;
- status = "okay";
-};
-
-&fec {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "mii";
- phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <1>;
- status = "okay";
-};
-
-&kpp {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_kpp>;
- linux,keymap = <
- MATRIX_KEY(0, 0, KEY_UP)
- MATRIX_KEY(0, 1, KEY_DOWN)
- MATRIX_KEY(0, 2, KEY_VOLUMEDOWN)
- MATRIX_KEY(0, 3, KEY_HOME)
- MATRIX_KEY(1, 0, KEY_RIGHT)
- MATRIX_KEY(1, 1, KEY_LEFT)
- MATRIX_KEY(1, 2, KEY_ENTER)
- MATRIX_KEY(1, 3, KEY_VOLUMEUP)
- MATRIX_KEY(2, 0, KEY_F6)
- MATRIX_KEY(2, 1, KEY_F8)
- MATRIX_KEY(2, 2, KEY_F9)
- MATRIX_KEY(2, 3, KEY_F10)
- MATRIX_KEY(3, 0, KEY_F1)
- MATRIX_KEY(3, 1, KEY_F2)
- MATRIX_KEY(3, 2, KEY_F3)
- MATRIX_KEY(3, 3, KEY_POWER)
- >;
- status = "okay";
-};
-
-&usbh1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usbh1>;
- vbus-supply = <®_usbh1_vbus>;
- fsl,usbphy = <&usbh1phy>;
- phy_type = "ulpi";
- status = "okay";
-};
-
-&usbotg {
- dr_mode = "otg";
- disable-over-current;
- phy_type = "utmi_wide";
- vbus-supply = <®_usbotg_vbus>;
- status = "okay";
-};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/8] ARM: dts: imx51-babbage: Add devicetree node for I2C1
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
` (4 preceding siblings ...)
2014-04-16 7:24 ` [PATCH 6/8] ARM: dts: imx51-babbage: Sort nodes by name Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-16 7:24 ` [PATCH 8/8] ARM: dts: imx51-babbage: Use predefined constants for clock definition Alexander Shiyan
2014-04-17 4:28 ` [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds devicetree node and pinctrl group for I2C1.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 6484b73..5a50bbf 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -335,6 +335,12 @@
status = "okay";
};
+&i2c1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "okay";
+};
+
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
@@ -513,6 +519,13 @@
>;
};
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX51_PAD_EIM_D19__I2C1_SCL 0x400001ed
+ MX51_PAD_EIM_D16__I2C1_SDA 0x400001ed
+ >;
+ };
+
pinctrl_i2c2: i2c2grp {
fsl,pins = <
MX51_PAD_KEY_COL4__I2C2_SCL 0x400001ed
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 8/8] ARM: dts: imx51-babbage: Use predefined constants for clock definition
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
` (5 preceding siblings ...)
2014-04-16 7:24 ` [PATCH 7/8] ARM: dts: imx51-babbage: Add devicetree node for I2C1 Alexander Shiyan
@ 2014-04-16 7:24 ` Alexander Shiyan
2014-04-17 4:28 ` [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Alexander Shiyan @ 2014-04-16 7:24 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 5a50bbf..e9ce0c0 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -170,7 +170,7 @@
usbh1phy: usbh1phy at 0 {
compatible = "usb-nop-xceiv";
reg = <0>;
- clocks = <&clks 0>;
+ clocks = <&clks IMX5_CLK_DUMMY>;
clock-names = "main_clk";
};
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
` (6 preceding siblings ...)
2014-04-16 7:24 ` [PATCH 8/8] ARM: dts: imx51-babbage: Use predefined constants for clock definition Alexander Shiyan
@ 2014-04-17 4:28 ` Shawn Guo
7 siblings, 0 replies; 9+ messages in thread
From: Shawn Guo @ 2014-04-17 4:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 16, 2014 at 11:24:50AM +0400, Alexander Shiyan wrote:
> This patch allow to define partitions onto NFC in user defined
> devicetrees.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Applied all 8, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-04-17 4:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-16 7:24 [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Alexander Shiyan
2014-04-16 7:24 ` [PATCH 2/8] ARM: dts: imx51-babbage: Move "hog" pins into corresponded pin groups Alexander Shiyan
2014-04-16 7:24 ` [PATCH 3/8] ARM: dts: imx51-babbage: Add missing pingroup for PMIC Alexander Shiyan
2014-04-16 7:24 ` [PATCH 4/8] ARM: dts: imx51-babbage: Use predefined constants for keys definition Alexander Shiyan
2014-04-16 7:24 ` [PATCH 5/8] ARM: dts: imx51-babbage: Add USB OTG regulator node Alexander Shiyan
2014-04-16 7:24 ` [PATCH 6/8] ARM: dts: imx51-babbage: Sort nodes by name Alexander Shiyan
2014-04-16 7:24 ` [PATCH 7/8] ARM: dts: imx51-babbage: Add devicetree node for I2C1 Alexander Shiyan
2014-04-16 7:24 ` [PATCH 8/8] ARM: dts: imx51-babbage: Use predefined constants for clock definition Alexander Shiyan
2014-04-17 4:28 ` [PATCH 1/8] ARM: dts: i.MX51: Allow to define partitions onto NFC Shawn Guo
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).