From: Daniel Mack <daniel@zonque•org>
To: robert.jarzmik@free•fr, haojian.zhuang@gmail•com
Cc: devicetree@vger•kernel.org, robh+dt@kernel•org,
Daniel Mack <daniel@zonque•org>,
linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/7] ARM: dts: pxa: merge &pxa3xx_ohci with &usb0
Date: Fri, 30 Nov 2018 18:55:40 +0100 [thread overview]
Message-ID: <20181130175543.32628-5-daniel@zonque.org> (raw)
In-Reply-To: <20181130175543.32628-1-daniel@zonque.org>
Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge
them, and get rid of the one in pxa3xx.dtsi.
Signed-off-by: Daniel Mack <daniel@zonque•org>
---
arch/arm/boot/dts/pxa2xx.dtsi | 1 +
arch/arm/boot/dts/pxa3xx.dtsi | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 30e77ebbcc4d..c00b1115f2a7 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -138,6 +138,7 @@
compatible = "marvell,pxa-ohci";
reg = <0x4c000000 0x10000>;
interrupts = <3>;
+ clocks = <&clks CLK_USBH>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index eb3223e85f9a..eb9443208578 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -202,14 +202,6 @@
status = "disabled";
};
- pxa3xx_ohci: usb@4c000000 {
- compatible = "marvell,pxa-ohci";
- reg = <0x4c000000 0x10000>;
- interrupts = <3>;
- clocks = <&clks CLK_USBH>;
- status = "disabled";
- };
-
pwm0: pwm@40b00000 {
compatible = "marvell,pxa270-pwm";
reg = <0x40b00000 0x10>;
--
2.19.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-11-30 17:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 17:55 [PATCH 0/7] ARM: dts: fixes and additions for pxa platform Daniel Mack
2018-11-30 17:55 ` [PATCH 1/7] ARM: dts: pxa2xx: drop #address-cells and #size-cells from /cpus Daniel Mack
2018-12-01 13:31 ` Robert Jarzmik
2018-11-30 17:55 ` [PATCH 2/7] ARM: dts: pxa3xx: drop #address-cells and #size-cells from pinctrl node Daniel Mack
2018-12-01 13:31 ` Robert Jarzmik
2018-11-30 17:55 ` [PATCH 3/7] ARM: dts: pxa2xx: fix hwuart memory range Daniel Mack
2018-12-01 13:31 ` Robert Jarzmik
2018-11-30 17:55 ` Daniel Mack [this message]
2018-12-01 13:30 ` [PATCH 4/7] ARM: dts: pxa: merge &pxa3xx_ohci with &usb0 Robert Jarzmik
2018-12-01 13:49 ` Daniel Mack
2018-11-30 17:55 ` [PATCH 5/7] ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus Daniel Mack
2018-12-02 10:10 ` Robert Jarzmik
2018-11-30 17:55 ` [PATCH 6/7] ARM: dts: pxa3xx: clean up pxa3xx clock controller node name Daniel Mack
2018-12-02 10:12 ` Robert Jarzmik
2018-11-30 17:55 ` [PATCH 7/7 v2] ARM: dts: pxa3xx: Add Raumfeld DTS files Daniel Mack
2018-12-03 21:31 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181130175543.32628-5-daniel@zonque.org \
--to=daniel@zonque$(echo .)org \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=haojian.zhuang@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=robert.jarzmik@free$(echo .)fr \
--cc=robh+dt@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox