Andrew Ruder (6):
arm: pxa2xx.dtsi: compatible tags for usb, mmc
pxa-usb: devicetree bindings docs update
arm: pxa27x.dtsi: header typo - wrong file
arm: pxa2xx.dtsi: disable RTC by default
arm: pxa27x.dtsi: add pwri2c definition
arm: pxa{27x,3xx}.dtsi: gpio cleanups
Documentation/devicetree/bindings/usb/pxa-usb.txt | 5 +++--
arch/arm/boot/dts/pxa27x.dtsi | 14 +++++++++++++-
arch/arm/boot/dts/pxa2xx.dtsi | 9 +++++----
arch/arm/boot/dts/pxa3xx.dtsi | 7 -------
4 files changed, 21 insertions(+), 14 deletions(-)
--
1.9.0.rc3.12.gbc97e2d
This changes pxa2xx.dtsi's compatible tags for MMC and USB to match both
the documentation and the code.
Signed-off-by: Andrew Ruder <[email protected]>
---
arch/arm/boot/dts/pxa2xx.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index a5e90f0..c08f846 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -113,14 +113,14 @@
};
usb0: ohci@4c000000 {
- compatible = "mrvl,pxa-ohci";
+ compatible = "marvell,pxa-ohci";
reg = <0x4c000000 0x10000>;
interrupts = <3>;
status = "disabled";
};
mmc0: mmc@41100000 {
- compatible = "mrvl,pxa-mmc";
+ compatible = "marvell,pxa-mmc";
reg = <0x41100000 0x1000>;
interrupts = <23>;
status = "disabled";
--
1.9.0.rc3.12.gbc97e2d
This sets the status="disabled" flag in pxa2xx.dtsi in the same style as
the other optional components. This can be overridden on a case-by-case
basis by boards that use this functionality.
Signed-off-by: Andrew Ruder <[email protected]>
---
arch/arm/boot/dts/pxa2xx.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index c08f846..d233088 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -130,6 +130,7 @@
compatible = "marvell,pxa-rtc";
reg = <0x40900000 0x3c>;
interrupts = <30 31>;
+ status = "disabled";
};
};
};
--
1.9.0.rc3.12.gbc97e2d
A few tags documented in pxa-usb.txt don't match the code and one isn't
documented at all. Updating documentation to match the code.
marvell,power-sense-low -> marvell,port-sense-low
marvell,power_on_delay -> marvell,power-on-delay
marvell,power-budget (new to documentation)
Signed-off-by: Andrew Ruder <[email protected]>
---
Documentation/devicetree/bindings/usb/pxa-usb.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt b/Documentation/devicetree/bindings/usb/pxa-usb.txt
index 79729a9..13ab5b0 100644
--- a/Documentation/devicetree/bindings/usb/pxa-usb.txt
+++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt
@@ -13,11 +13,12 @@ Optional properties:
1 = PMM_NPS_MODE
2 = PMM_GLOBAL_MODE
3 = PMM_PERPORT_MODE
- - "marvell,power-sense-low" - power sense pin is low-active.
+ - "marvell,port-sense-low" - power sense pin is low-active.
- "marvell,power-control-low" - power control pin is low-active.
- "marvell,no-oc-protection" - disable over-current protection.
- "marvell,oc-mode-perport" - enable per-port over-current protection.
- - "marvell,power_on_delay" Power On to Power Good time - in ms.
+ - "marvell,power-on-delay" - Power On to Power Good time - in ms.
+ - "marvell,power-budget" - Power budget in mA (0 is no limit)
Example:
--
1.9.0.rc3.12.gbc97e2d
Fixing a copy-paste error calling this file the pxa3xx skeleton when it
is actually the pxa27x skeleton.
Signed-off-by: Andrew Ruder <[email protected]>
---
arch/arm/boot/dts/pxa27x.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index a705469..931e1d5 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -1,4 +1,4 @@
-/* The pxa3xx skeleton simply augments the 2xx version */
+/* The pxa27x skeleton simply augments the 2xx version */
/include/ "pxa2xx.dtsi"
/ {
--
1.9.0.rc3.12.gbc97e2d
* Define gpio0, gpio1 interrupts in pxa2xx since they are also used by
the pxa27x, pxa25x and pxa3xx.
* Remove several redundant tags from pxa3xx's gpio since they are the
same as the included pxa2xx.dtsi
* Correctly override the compatible tag in the pxa27x for the gpio
module.
Signed-off-by: Andrew Ruder <[email protected]>
---
arch/arm/boot/dts/pxa27x.dtsi | 3 +++
arch/arm/boot/dts/pxa2xx.dtsi | 4 ++--
arch/arm/boot/dts/pxa3xx.dtsi | 7 -------
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 2d05aa9..26841d8 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -43,5 +43,8 @@
#size-cells = <0>;
status = "disabled";
};
+ gpio: gpio@40e00000 {
+ compatible = "intel,pxa27x-gpio";
+ };
};
};
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index d233088..c21e80f 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -53,8 +53,8 @@
reg = <0x40e00000 0x10000>;
gpio-controller;
#gpio-cells = <0x2>;
- interrupts = <10>;
- interrupt-names = "gpio_mux";
+ interrupts = <8 9 10>;
+ interrupt-names = "gpio0", "gpio1", "gpio_mux";
interrupt-controller;
#interrupt-cells = <0x2>;
ranges;
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 83bb0ef..e689b99 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -31,13 +31,6 @@
gpio: gpio@40e00000 {
compatible = "intel,pxa3xx-gpio";
- reg = <0x40e00000 0x10000>;
- interrupt-names = "gpio0", "gpio1", "gpio_mux";
- interrupts = <8 9 10>;
- gpio-controller;
- #gpio-cells = <0x2>;
- interrupt-controller;
- #interrupt-cells = <0x2>;
};
};
};
--
1.9.0.rc3.12.gbc97e2d
This adds the pwri2c definition to the pxa27x device tree. This is
already called out in pxa3xx.dtsi.
Signed-off-by: Andrew Ruder <[email protected]>
---
arch/arm/boot/dts/pxa27x.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 931e1d5..2d05aa9 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -34,5 +34,14 @@
reg = <0x40c00010 0x10>;
#pwm-cells = <1>;
};
+
+ pwri2c: i2c@40f00180 {
+ compatible = "mrvl,pxa-i2c";
+ reg = <0x40f00180 0x30>;
+ interrupts = <6>;
+ #address-cells = <0x1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
};
};
--
1.9.0.rc3.12.gbc97e2d