* [PATCH 2/5] ARM: dts: i.MX51: Update CPU node
2013-11-07 8:45 [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Alexander Shiyan
@ 2013-11-07 8:45 ` Alexander Shiyan
2013-11-07 8:45 ` [PATCH 3/5] ARM: dts: i.MX51: Add dummy clock to AUDMUX Alexander Shiyan
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2013-11-07 8:45 UTC (permalink / raw)
To: linux-arm-kernel
This patch updates i.MX51 CPU node:
- Alias for CPU is added to allow using this node in the parent DTS files.
- Removed useless "clock_names" property.
- "clock-latency" value increased to safe using with 32 kHz OSC.
- Defined operating points voltages and "voltage tolerance" properties.
Values are safe for both commercial and industrial CPU variants.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 1075a7d..20e07bf 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -65,18 +65,18 @@
cpus {
#address-cells = <1>;
#size-cells = <0>;
- cpu at 0 {
+ cpu: cpu at 0 {
device_type = "cpu";
compatible = "arm,cortex-a8";
reg = <0>;
- clock-latency = <61036>; /* two CLK32 periods */
+ clock-latency = <62500>;
clocks = <&clks 24>;
- clock-names = "cpu";
operating-points = <
- /* kHz uV (No regulator support) */
- 160000 0
- 800000 0
+ 166000 1000000
+ 600000 1050000
+ 800000 1100000
>;
+ voltage-tolerance = <5>;
};
};
--
1.8.1.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] ARM: dts: i.MX51: Add dummy clock to AUDMUX
2013-11-07 8:45 [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Alexander Shiyan
2013-11-07 8:45 ` [PATCH 2/5] ARM: dts: i.MX51: Update CPU node Alexander Shiyan
@ 2013-11-07 8:45 ` Alexander Shiyan
2013-11-07 8:45 ` [PATCH 4/5] ARM: dts: i.MX51: Add missing pinctrl definitions Alexander Shiyan
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2013-11-07 8:45 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds dummy clock for AUDMUX. This change avoids useless
debug message "cannot get clock" during driver initialization.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 20e07bf..e0d7f5b 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -455,6 +455,8 @@
audmux: audmux at 83fd0000 {
compatible = "fsl,imx51-audmux", "fsl,imx31-audmux";
reg = <0x83fd0000 0x4000>;
+ clocks = <&clks 0>;
+ clock-names = "audmux";
status = "disabled";
};
--
1.8.1.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] ARM: dts: i.MX51: Add missing pinctrl definitions
2013-11-07 8:45 [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Alexander Shiyan
2013-11-07 8:45 ` [PATCH 2/5] ARM: dts: i.MX51: Update CPU node Alexander Shiyan
2013-11-07 8:45 ` [PATCH 3/5] ARM: dts: i.MX51: Add dummy clock to AUDMUX Alexander Shiyan
@ 2013-11-07 8:45 ` Alexander Shiyan
2013-11-07 8:45 ` [PATCH 5/5] ARM: dts: i.MX51: Switch to use standard IRQ flags definitions Alexander Shiyan
2013-11-11 8:11 ` [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Shawn Guo
4 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2013-11-07 8:45 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds missing pinctrl definitions for Keypad (columns 4 and 5),
NFC, 1-Wire and WEIM.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-pingrp.h | 93 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/arch/arm/boot/dts/imx51-pingrp.h b/arch/arm/boot/dts/imx51-pingrp.h
index 550d0d1..41a67ba 100644
--- a/arch/arm/boot/dts/imx51-pingrp.h
+++ b/arch/arm/boot/dts/imx51-pingrp.h
@@ -157,6 +157,32 @@
MX51_PAD_KEY_COL2__KEY_COL2 0xe8 \
MX51_PAD_KEY_COL3__KEY_COL3 0xe8
+#define MX51_KPP_COL45_PINGRP1 \
+ MX51_PAD_KEY_COL4__KEY_COL4 0xe8 \
+ MX51_PAD_KEY_COL5__KEY_COL5 0xe8
+
+#define MX51_NFC_PINGRP1 \
+ MX51_PAD_NANDF_D0__NANDF_D0 0x80000000 \
+ MX51_PAD_NANDF_D1__NANDF_D1 0x80000000 \
+ MX51_PAD_NANDF_D2__NANDF_D2 0x80000000 \
+ MX51_PAD_NANDF_D3__NANDF_D3 0x80000000 \
+ MX51_PAD_NANDF_D4__NANDF_D4 0x80000000 \
+ MX51_PAD_NANDF_D5__NANDF_D5 0x80000000 \
+ MX51_PAD_NANDF_D6__NANDF_D6 0x80000000 \
+ MX51_PAD_NANDF_D7__NANDF_D7 0x80000000 \
+ MX51_PAD_NANDF_ALE__NANDF_ALE 0x80000000 \
+ MX51_PAD_NANDF_CLE__NANDF_CLE 0x80000000 \
+ MX51_PAD_NANDF_RE_B__NANDF_RE_B 0x80000000 \
+ MX51_PAD_NANDF_WE_B__NANDF_WE_B 0x80000000 \
+ MX51_PAD_NANDF_WP_B__NANDF_WP_B 0x80000000
+
+#define MX51_NFC_CS0_PINGRP1 \
+ MX51_PAD_NANDF_CS0__NANDF_CS0 0x80000000 \
+ MX51_PAD_NANDF_RB0__NANDF_RB0 0x80000000
+
+#define MX51_OWIRE_PINGRP1 \
+ X51_PAD_OWIRE_LINE__OWIRE_LINE 0x40000000
+
#define MX51_PATA_PINGRP1 \
MX51_PAD_NANDF_WE_B__PATA_DIOW 0x2004 \
MX51_PAD_NANDF_RE_B__PATA_DIOR 0x2004 \
@@ -244,4 +270,71 @@
MX51_PAD_EIM_A27__USBH2_NXT 0x1e5 \
MX51_PAD_EIM_A26__USBH2_STP 0x1e5
+#define MX51_WEIM_PINGRP1 \
+ MX51_PAD_EIM_DA0__EIM_DA0 0x80000000 \
+ MX51_PAD_EIM_DA1__EIM_DA1 0x80000000 \
+ MX51_PAD_EIM_DA2__EIM_DA2 0x80000000 \
+ MX51_PAD_EIM_DA3__EIM_DA3 0x80000000 \
+ MX51_PAD_EIM_DA4__EIM_DA4 0x80000000 \
+ MX51_PAD_EIM_DA5__EIM_DA5 0x80000000 \
+ MX51_PAD_EIM_DA6__EIM_DA6 0x80000000 \
+ MX51_PAD_EIM_DA7__EIM_DA7 0x80000000 \
+ MX51_PAD_EIM_DA8__EIM_DA8 0x80000000 \
+ MX51_PAD_EIM_DA9__EIM_DA9 0x80000000 \
+ MX51_PAD_EIM_DA10__EIM_DA10 0x80000000 \
+ MX51_PAD_EIM_DA11__EIM_DA11 0x80000000 \
+ MX51_PAD_EIM_DA12__EIM_DA12 0x80000000 \
+ MX51_PAD_EIM_DA13__EIM_DA13 0x80000000 \
+ MX51_PAD_EIM_DA14__EIM_DA14 0x80000000 \
+ MX51_PAD_EIM_DA15__EIM_DA15 0x80000000 \
+ MX51_PAD_EIM_A16__EIM_A16 0x80000000 \
+ MX51_PAD_EIM_A17__EIM_A17 0x80000000 \
+ MX51_PAD_EIM_A18__EIM_A18 0x80000000 \
+ MX51_PAD_EIM_A19__EIM_A19 0x80000000 \
+ MX51_PAD_EIM_A20__EIM_A20 0x80000000 \
+ MX51_PAD_EIM_A21__EIM_A21 0x80000000 \
+ MX51_PAD_EIM_A22__EIM_A22 0x80000000 \
+ MX51_PAD_EIM_A23__EIM_A23 0x80000000 \
+ MX51_PAD_EIM_A24__EIM_A24 0x80000000 \
+ MX51_PAD_EIM_A25__EIM_A25 0x80000000 \
+ MX51_PAD_EIM_A26__EIM_A26 0x80000000 \
+ MX51_PAD_EIM_A27__EIM_A27 0x80000000 \
+ MX51_PAD_EIM_D16__EIM_D16 0x80000000 \
+ MX51_PAD_EIM_D17__EIM_D17 0x80000000 \
+ MX51_PAD_EIM_D18__EIM_D18 0x80000000 \
+ MX51_PAD_EIM_D19__EIM_D19 0x80000000 \
+ MX51_PAD_EIM_D20__EIM_D20 0x80000000 \
+ MX51_PAD_EIM_D21__EIM_D21 0x80000000 \
+ MX51_PAD_EIM_D22__EIM_D22 0x80000000 \
+ MX51_PAD_EIM_D23__EIM_D23 0x80000000 \
+ MX51_PAD_EIM_D24__EIM_D24 0x80000000 \
+ MX51_PAD_EIM_D25__EIM_D25 0x80000000 \
+ MX51_PAD_EIM_D26__EIM_D26 0x80000000 \
+ MX51_PAD_EIM_D27__EIM_D27 0x80000000 \
+ MX51_PAD_EIM_D28__EIM_D28 0x80000000 \
+ MX51_PAD_EIM_D29__EIM_D29 0x80000000 \
+ MX51_PAD_EIM_D30__EIM_D30 0x80000000 \
+ MX51_PAD_EIM_D31__EIM_D31 0x80000000 \
+ MX51_PAD_EIM_OE__EIM_OE 0x80000000 \
+ MX51_PAD_EIM_DTACK__EIM_DTACK 0x80000000 \
+ MX51_PAD_EIM_LBA__EIM_LBA 0x80000000
+
+#define MX51_WEIM_CS0_PINGRP1 \
+ MX51_PAD_EIM_CS0__EIM_CS0 0x80000000
+
+#define MX51_WEIM_CS1_PINGRP1 \
+ MX51_PAD_EIM_CS1__EIM_CS1 0x80000000
+
+#define MX51_WEIM_CS2_PINGRP1 \
+ MX51_PAD_EIM_CS2__EIM_CS2 0x80000000
+
+#define MX51_WEIM_CS3_PINGRP1 \
+ MX51_PAD_EIM_CS3__EIM_CS3 0x80000000
+
+#define MX51_WEIM_CS4_PINGRP1 \
+ MX51_PAD_EIM_CS4__EIM_CS4 0x80000000
+
+#define MX51_WEIM_CS5_PINGRP1 \
+ MX51_PAD_EIM_CS5__EIM_CS5 0x80000000
+
#endif /* __DTS_IMX51_PINGRP_H */
--
1.8.1.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/5] ARM: dts: i.MX51: Switch to use standard IRQ flags definitions
2013-11-07 8:45 [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Alexander Shiyan
` (2 preceding siblings ...)
2013-11-07 8:45 ` [PATCH 4/5] ARM: dts: i.MX51: Add missing pinctrl definitions Alexander Shiyan
@ 2013-11-07 8:45 ` Alexander Shiyan
2013-11-11 8:11 ` [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Shawn Guo
4 siblings, 0 replies; 8+ messages in thread
From: Alexander Shiyan @ 2013-11-07 8:45 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boot/dts/imx51-babbage.dts | 2 +-
arch/arm/boot/dts/imx51.dtsi | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 8245b1f..5a77d33 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -148,7 +148,7 @@
spi-cs-high;
reg = <0>;
interrupt-parent = <&gpio1>;
- interrupts = <8 0x4>;
+ interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
regulators {
sw1_reg: sw1 {
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index e0d7f5b..0ffddb5 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -13,6 +13,7 @@
#include "skeleton.dtsi"
#include "imx51-pinfunc.h"
#include "imx51-pingrp.h"
+#include <dt-bindings/interrupt-controller/irq.h>
/ {
aliases {
--
1.8.1.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1
2013-11-07 8:45 [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Alexander Shiyan
` (3 preceding siblings ...)
2013-11-07 8:45 ` [PATCH 5/5] ARM: dts: i.MX51: Switch to use standard IRQ flags definitions Alexander Shiyan
@ 2013-11-11 8:11 ` Shawn Guo
2013-11-11 8:15 ` Alexander Shiyan
4 siblings, 1 reply; 8+ messages in thread
From: Shawn Guo @ 2013-11-11 8:11 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote:
> usbphy0 is not a part of AIPS1, so move this node under usbotg.
> Additionally this patch removes useless "status" property.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Applied all except #4. I would add those pingroups only when there are
in-tree users of it.
Shawn
> ---
> arch/arm/boot/dts/imx51.dtsi | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
> index 463dfe8..1075a7d 100644
> --- a/arch/arm/boot/dts/imx51.dtsi
> +++ b/arch/arm/boot/dts/imx51.dtsi
> @@ -189,13 +189,6 @@
> };
> };
>
> - usbphy0: usbphy at 0 {
> - compatible = "usb-nop-xceiv";
> - clocks = <&clks 75>;
> - clock-names = "main_clk";
> - status = "okay";
> - };
> -
> usbotg: usb at 73f80000 {
> compatible = "fsl,imx51-usb", "fsl,imx27-usb";
> reg = <0x73f80000 0x0200>;
> @@ -204,6 +197,12 @@
> fsl,usbmisc = <&usbmisc 0>;
> fsl,usbphy = <&usbphy0>;
> status = "disabled";
> +
> + usbphy0: usbphy at 0 {
> + compatible = "usb-nop-xceiv";
> + clocks = <&clks 75>;
> + clock-names = "main_clk";
> + };
> };
>
> usbh1: usb at 73f80200 {
> --
> 1.8.1.5
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1
2013-11-11 8:11 ` [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1 Shawn Guo
@ 2013-11-11 8:15 ` Alexander Shiyan
2013-11-11 8:28 ` Shawn Guo
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Shiyan @ 2013-11-11 8:15 UTC (permalink / raw)
To: linux-arm-kernel
> On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote:
> > usbphy0 is not a part of AIPS1, so move this node under usbotg.
> > Additionally this patch removes useless "status" property.
> >
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
>
> Applied all except #4. I would add those pingroups only when there are
> in-tree users of it.
Please revert this one part too [1/5]. This change is incorrect. I will make
other solution later.
Thanks.
---
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/5] ARM: dts: i.MX51: Move usbphy0 node from AIPS1
2013-11-11 8:15 ` Alexander Shiyan
@ 2013-11-11 8:28 ` Shawn Guo
0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2013-11-11 8:28 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 11, 2013 at 12:15:06PM +0400, Alexander Shiyan wrote:
> > On Thu, Nov 07, 2013 at 12:45:04PM +0400, Alexander Shiyan wrote:
> > > usbphy0 is not a part of AIPS1, so move this node under usbotg.
> > > Additionally this patch removes useless "status" property.
> > >
> > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> >
> > Applied all except #4. I would add those pingroups only when there are
> > in-tree users of it.
>
> Please revert this one part too [1/5]. This change is incorrect. I will make
> other solution later.
> Thanks.
Okay. Dropped the patch 'ARM: dts: i.MX51: Move usbphy0 node from AIPS1'.
Shawn
^ permalink raw reply [flat|nested] 8+ messages in thread