From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 9/9] ARM: pxa: add .dtsi files
Date: Sun, 29 Jul 2012 02:02:36 +0200 [thread overview]
Message-ID: <50147D9C.1060002@gmail.com> (raw)
In-Reply-To: <CANTYSETB8Lth5MqNq=4idZm48-nzt=Ezoj7ES-bRVEX6oUkqrw@mail.gmail.com>
On 28.07.2012 20:41, Amar Nath wrote:
> Hi Daniel,
>
> On Sat, Jul 28, 2012 at 3:37 PM, Daniel Mack <zonque@gmail.com
> <mailto:zonque@gmail.com>> wrote:
>
> This adds .dtsi files to describe the PXA SoCs. pxa3xx simply augments
> pxa2xx. Not all devices are listed yet, and it will need some time to
> get all the drivers ported.
>
> Signed-off-by: Daniel Mack <zonque at gmail.com <mailto:zonque@gmail.com>>
> ---
> arch/arm/boot/dts/pxa2xx.dtsi | 132
> ++++++++++++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/pxa3xx.dtsi | 27 +++++++++
> 2 files changed, 159 insertions(+)
> create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
> create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
>
> diff --git a/arch/arm/boot/dts/pxa2xx.dtsi
> b/arch/arm/boot/dts/pxa2xx.dtsi
> new file mode 100644
> index 0000000..4fe3b91
> --- /dev/null
> +++ b/arch/arm/boot/dts/pxa2xx.dtsi
> @@ -0,0 +1,132 @@
> +/*
> + * pxa2xx.dtsi - Device Tree Include file for Marvell PXA2xx family SoC
> + *
> + * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com
> <mailto:marek.vasut@gmail.com>>
> + *
> + * Licensed under GPLv2 or later.
> + */
> +
> +/include/ "skeleton.dtsi"
> +
> +/ {
> + model = "Marvell PXA2xx family SoC";
> + compatible = "marvell,pxa2xx";
> + interrupt-parent = <&pxairq>;
> +
> + aliases {
> + serial0 = &ffuart;
> + serial1 = &btuart;
> + serial2 = &stuart;
> + serial3 = &hwuart;
> + i2c0 = &pwri2c;
> + i2c1 = &pxai2c1;
> + };
> +
> + cpus {
> + cpu at 0 {
> + compatible = "arm,xscale";
> + };
> + };
> +
> + pxabus {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + pxairq: interrupt-controller at 40d00000 {
> + #interrupt-cells = <1>;
> + compatible = "marvell,pxa-intc";
> + interrupt-controller;
> + interrupt-parent;
> + mrvl,intc-nr-irqs = <56>;
> + reg = <0x40d00000 0xd0>;
> + };
> +
> + gpio: gpio at 40e00000 {
> + compatible = "mrvl,pxa-gpio";
> + #address-cells = <0x1>;
> + #size-cells = <0x1>;
> + reg = <0x40e00000 0x10000>;
> + gpio-controller;
> + #gpio-cells = <0x2>;
> + interrupts = <10>;
> + interrupt-names = "gpio_mux";
> + interrupt-controller;
> + #interrupt-cells = <0x2>;
> + ranges;
> +
> + gcb0: gpio at 40e00000 {
> + reg = <0x40e00000 0x4>;
> + };
> +
> + gcb1: gpio at 40e00004 {
> + reg = <0x40e00004 0x4>;
> + };
> +
> + gcb2: gpio at 40e00008 {
> + reg = <0x40e00008 0x4>;
> + };
> + gcb3: gpio at 40e0000c {
> + reg = <0x40e0000c 0x4>;
> + };
> + };
> +
> + ffuart: uart at 40100000 {
> + compatible = "mrvl,pxa-uart";
> + reg = <0x40100000 0x30>;
> + interrupts = <22>;
> + status = "disabled";
> + };
> +
> + btuart: uart at 40200000 {
> + compatible = "mrvl,pxa-uart";
> + reg = <0x40200000 0x30>;
> + interrupts = <21>;
> + status = "disabled";
> + };
> +
> + stuart: uart at 40700000 {
> + compatible = "mrvl,pxa-uart";
> + reg = <0x40700000 0x30>;
> + interrupts = <20>;
> + status = "disabled";
> + };
> +
> + hwuart: uart at 41100000 {
> + compatible = "mrvl,pxa-uart";
> + reg = <0x41100000 0x30>;
> + interrupts = <7>;
> + status = "disabled";
> + };
> +
> + pxai2c1: i2c at 40301680 {
> + compatible = "mrvl,pxa-i2c";
> + reg = <0x40301680 0x30>;
> + interrupts = <18>;
> + #address-cells = <0x1>;
> + #size-cells = <0>;
> + status = "disabled";
> + };
> +
> + usb0: ohci at 4c000000 {
> + compatible = "mrvl,pxa-ohci";
> + reg = <0x4c000000 0x10000>;
> + interrupts = <3>;
> + status = "disabled";
> + };
> +
> + mmc0: mmc at 41100000 {
> + compatible = "mrvl,pxa-mmc";
> + reg = <0x41100000 0x1000>;
> + interrupts = <23>;
> + status = "disabled";
> + };
> +
> + rtc at 40900000 {
> + compatible = "marvell,pxa-rtc";
> + reg = <0x40900000 0x3c>;
> + interrupts = <30 31>;
> + };
> + };
> +};
> diff --git a/arch/arm/boot/dts/pxa3xx.dtsi
> b/arch/arm/boot/dts/pxa3xx.dtsi
> new file mode 100644
> index 0000000..41e0a42
> --- /dev/null
> +++ b/arch/arm/boot/dts/pxa3xx.dtsi
> @@ -0,0 +1,27 @@
> +/* The pxa3xx skeleton simply augments the 2xx version */
> +/include/ "pxa2xx.dtsi"
> +
> +/ {
> + model = "Marvell PXA3xx familiy SoC";
> + compatible = "marvell,pxa3xx";
> +
> + pxabus {
> + pwri2c: i2c at 40f500c0 {
> + compatible = "mrvl,pwri2c";
> + reg = <0x40f500c0 0x30>;
> + interrupts = <6>;
> + #address-cells = <0x1>;
> + #size-cells = <0>;
> + status = "disabled";
> + };
> +
> + nand0: nand at 43100000 {
> + compatible = "marvell,pxa3xx-nand";
> + reg = <0x43100000 90>;
> + interrupts = <45>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + status = "disabled";
> + };
> + };
> +};
> --
>
> I guess there are few more "mrvl" -> "marvell" renaming fixes still
> pending....
Yes, there are. But some drivers were already present, and my patch
series don't touch them. Only new bindings will be added with the name
"marvell".
There will be a big renaming patch soon that cleans up the rest in one go.
Daniel
next prev parent reply other threads:[~2012-07-29 0:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 10:07 [PATCH v3 0/9] Assorted PXA3xx DT patches Daniel Mack
2012-07-28 10:07 ` [PATCH v3 1/9] RTC: add DT bindings to pxa-rtc Daniel Mack
2012-07-28 10:07 ` [PATCH v3 2/9] MMC: pxa-mci: add DT bindings Daniel Mack
2012-08-03 23:52 ` Chris Ball
2012-08-04 1:30 ` Haojian Zhuang
2012-07-28 10:07 ` [PATCH v3 3/9] MTD: pxa3xx-nand: add devicetree bindings Daniel Mack
2012-07-28 10:07 ` [PATCH v3 4/9] GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip() Daniel Mack
2012-08-05 0:12 ` Linus Walleij
2012-08-05 2:56 ` Haojian Zhuang
2012-08-05 9:37 ` Linus Walleij
2012-08-06 8:09 ` Arnd Bergmann
2012-08-06 8:11 ` Daniel Mack
2012-07-28 10:07 ` [PATCH v3 5/9] GPIO: gpio-pxa: fix devicetree functions Daniel Mack
2012-08-04 23:40 ` Linus Walleij
2012-08-05 2:58 ` Haojian Zhuang
2012-07-28 10:07 ` [PATCH v3 6/9] ARM: pxa: add devicetree code for irq handling Daniel Mack
2012-07-28 10:07 ` [PATCH v3 7/9] ARM: pxa3xx: skip default device initialization when booting via DT Daniel Mack
2012-07-28 10:07 ` [PATCH v3 8/9] ARM: pxa3xx: add generic DT machine code Daniel Mack
2012-07-28 10:07 ` [PATCH v3 9/9] ARM: pxa: add .dtsi files Daniel Mack
2012-07-28 18:42 ` Amar Nath
2012-07-29 0:02 ` Daniel Mack [this message]
2012-07-29 19:05 ` Daniel Mack
2012-07-29 13:04 ` [PATCH v3 0/9] Assorted PXA3xx DT patches Arnd Bergmann
2012-07-30 14:01 ` Haojian Zhuang
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=50147D9C.1060002@gmail.com \
--to=zonque@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).