You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
149 lines
4.0 KiB
149 lines
4.0 KiB
Add properties to the gpio nodes to allow them to be also used
|
|
as pwm lines.
|
|
|
|
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
|
|
---
|
|
arch/arm/boot/dts/armada-370.dtsi | 10 ++++++++--
|
|
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++--
|
|
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 8 ++++++--
|
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++--
|
|
4 files changed, 30 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370.dtsi
|
|
@@ -162,24 +162,30 @@
|
|
|
|
gpio0: gpio@18100 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18100 0x40>;
|
|
+ reg = <0x18100 0x40>, <0x181c0 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio1: gpio@18140 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18140 0x40>;
|
|
+ reg = <0x18140 0x40>, <0x181c8 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio2: gpio@18180 {
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
@@ -203,24 +203,30 @@
|
|
internal-regs {
|
|
gpio0: gpio@18100 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18100 0x40>;
|
|
+ reg = <0x18100 0x40>, <0x181c0 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio1: gpio@18140 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18140 0x40>;
|
|
+ reg = <0x18140 0x40>, <0x181c8 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <17>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
@@ -286,24 +286,28 @@
|
|
internal-regs {
|
|
gpio0: gpio@18100 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18100 0x40>;
|
|
+ reg = <0x18100 0x40>, <0x181c0 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio1: gpio@18140 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18140 0x40>;
|
|
+ reg = <0x18140 0x40>, <0x181c8 0x08>;
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio2: gpio@18180 {
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
@@ -324,24 +324,30 @@
|
|
internal-regs {
|
|
gpio0: gpio@18100 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18100 0x40>;
|
|
+ reg = <0x18100 0x40>, <0x181c0 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <82>, <83>, <84>, <85>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio1: gpio@18140 {
|
|
compatible = "marvell,orion-gpio";
|
|
- reg = <0x18140 0x40>;
|
|
+ reg = <0x18140 0x40>, <0x181c8 0x08>;
|
|
+ reg-names = "gpio", "pwm";
|
|
ngpios = <32>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
+ #pwm-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <87>, <88>, <89>, <90>;
|
|
+ clocks = <&coreclk 0>;
|
|
};
|
|
|
|
gpio2: gpio@18180 {
|
|
|