Commit 144ed970 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux into next/dt

Merge "device-tree pxa update" from Robert Jarzmik:

 - clocks descriptions (pxa27x, pxa3xx)
 - timer descriptions (pxa27x, pxa3xx)
 - IPs which are embedded on the SoC
   - keypad
   - udc (USB client)
   - power I2C

These are amongst the building blocks for future pxa device-tree board
description.

* tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx
  ARM: dts: pxa: add pxa27x-keypad to pxa27x
  ARM: dts: pxa: add pxa27x-udc to pxa27x
  ARM: dts: pxa: add clocks
  ARM: dts: pxa: add pwri2c to pxa device-tree
parents 830f5a5a 8dd3075c
/* The pxa3xx skeleton simply augments the 2xx version */ /* The pxa3xx skeleton simply augments the 2xx version */
#include "pxa2xx.dtsi" #include "pxa2xx.dtsi"
#include "dt-bindings/clock/pxa2xx-clock.h" #include "dt-bindings/clock/pxa-clock.h"
/ { / {
model = "Marvell PXA27x familiy SoC"; model = "Marvell PXA27x familiy SoC";
...@@ -12,28 +12,61 @@ pxairq: interrupt-controller@40d00000 { ...@@ -12,28 +12,61 @@ pxairq: interrupt-controller@40d00000 {
marvell,intc-nr-irqs = <34>; marvell,intc-nr-irqs = <34>;
}; };
gpio: gpio@40e00000 {
compatible = "intel,pxa27x-gpio";
clocks = <&clks CLK_NONE>;
};
pwm0: pwm@40b00000 { pwm0: pwm@40b00000 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm"; compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40b00000 0x10>; reg = <0x40b00000 0x10>;
#pwm-cells = <1>; #pwm-cells = <1>;
clocks = <&clks CLK_PWM0>;
}; };
pwm1: pwm@40b00010 { pwm1: pwm@40b00010 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm"; compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40b00010 0x10>; reg = <0x40b00010 0x10>;
#pwm-cells = <1>; #pwm-cells = <1>;
clocks = <&clks CLK_PWM1>;
}; };
pwm2: pwm@40c00000 { pwm2: pwm@40c00000 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm"; compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40c00000 0x10>; reg = <0x40c00000 0x10>;
#pwm-cells = <1>; #pwm-cells = <1>;
clocks = <&clks CLK_PWM0>;
}; };
pwm3: pwm@40c00010 { pwm3: pwm@40c00010 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm"; compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40c00010 0x10>; reg = <0x40c00010 0x10>;
#pwm-cells = <1>; #pwm-cells = <1>;
clocks = <&clks CLK_PWM1>;
};
pwri2c: i2c@40f000180 {
compatible = "mrvl,pxa-i2c";
reg = <0x40f00180 0x24>;
interrupts = <6>;
clocks = <&clks CLK_PWRI2C>;
status = "disabled";
};
pxa27x_udc: udc@40600000 {
compatible = "marvell,pxa270-udc";
reg = <0x40600000 0x10000>;
interrupts = <11>;
clocks = <&clks CLK_USB>;
status = "disabled";
};
keypad: keypad@41500000 {
compatible = "marvell,pxa27x-keypad";
reg = <0x41500000 0x4c>;
interrupts = <4>;
clocks = <&clks CLK_KEYPAD>;
status = "disabled";
}; };
}; };
...@@ -46,11 +79,18 @@ clocks { ...@@ -46,11 +79,18 @@ clocks {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
pxa2xx_clks: pxa2xx_clks@41300004 { clks: pxa2xx_clks@41300004 {
compatible = "marvell,pxa-clocks"; compatible = "marvell,pxa270-clocks";
#clock-cells = <1>; #clock-cells = <1>;
status = "okay"; status = "okay";
}; };
}; };
timer@40a00000 {
compatible = "marvell,pxa-timer";
reg = <0x40a00000 0x20>;
interrupts = <26>;
clocks = <&clks CLK_OSTIMER>;
status = "okay";
};
}; };
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "skeleton.dtsi" #include "skeleton.dtsi"
#include "dt-bindings/clock/pxa-clock.h"
/ { / {
model = "Marvell PXA2xx family SoC"; model = "Marvell PXA2xx family SoC";
...@@ -79,6 +80,7 @@ ffuart: uart@40100000 { ...@@ -79,6 +80,7 @@ ffuart: uart@40100000 {
compatible = "mrvl,pxa-uart"; compatible = "mrvl,pxa-uart";
reg = <0x40100000 0x30>; reg = <0x40100000 0x30>;
interrupts = <22>; interrupts = <22>;
clocks = <&clks CLK_FFUART>;
status = "disabled"; status = "disabled";
}; };
...@@ -86,6 +88,7 @@ btuart: uart@40200000 { ...@@ -86,6 +88,7 @@ btuart: uart@40200000 {
compatible = "mrvl,pxa-uart"; compatible = "mrvl,pxa-uart";
reg = <0x40200000 0x30>; reg = <0x40200000 0x30>;
interrupts = <21>; interrupts = <21>;
clocks = <&clks CLK_BTUART>;
status = "disabled"; status = "disabled";
}; };
...@@ -93,6 +96,7 @@ stuart: uart@40700000 { ...@@ -93,6 +96,7 @@ stuart: uart@40700000 {
compatible = "mrvl,pxa-uart"; compatible = "mrvl,pxa-uart";
reg = <0x40700000 0x30>; reg = <0x40700000 0x30>;
interrupts = <20>; interrupts = <20>;
clocks = <&clks CLK_STUART>;
status = "disabled"; status = "disabled";
}; };
...@@ -107,6 +111,7 @@ pxai2c1: i2c@40301680 { ...@@ -107,6 +111,7 @@ pxai2c1: i2c@40301680 {
compatible = "mrvl,pxa-i2c"; compatible = "mrvl,pxa-i2c";
reg = <0x40301680 0x30>; reg = <0x40301680 0x30>;
interrupts = <18>; interrupts = <18>;
clocks = <&clks CLK_I2C>;
#address-cells = <0x1>; #address-cells = <0x1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
......
/* The pxa3xx skeleton simply augments the 2xx version */ /* The pxa3xx skeleton simply augments the 2xx version */
/include/ "pxa2xx.dtsi" #include "pxa2xx.dtsi"
/ { / {
model = "Marvell PXA3xx familiy SoC"; model = "Marvell PXA3xx familiy SoC";
...@@ -10,6 +10,7 @@ pwri2c: i2c@40f500c0 { ...@@ -10,6 +10,7 @@ pwri2c: i2c@40f500c0 {
compatible = "mrvl,pwri2c"; compatible = "mrvl,pwri2c";
reg = <0x40f500c0 0x30>; reg = <0x40f500c0 0x30>;
interrupts = <6>; interrupts = <6>;
clocks = <&clks CLK_PWRI2C>;
#address-cells = <0x1>; #address-cells = <0x1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -19,6 +20,7 @@ nand0: nand@43100000 { ...@@ -19,6 +20,7 @@ nand0: nand@43100000 {
compatible = "marvell,pxa3xx-nand"; compatible = "marvell,pxa3xx-nand";
reg = <0x43100000 90>; reg = <0x43100000 90>;
interrupts = <45>; interrupts = <45>;
clocks = <&clks CLK_NAND>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
status = "disabled"; status = "disabled";
...@@ -32,6 +34,7 @@ pxairq: interrupt-controller@40d00000 { ...@@ -32,6 +34,7 @@ pxairq: interrupt-controller@40d00000 {
gpio: gpio@40e00000 { gpio: gpio@40e00000 {
compatible = "intel,pxa3xx-gpio"; compatible = "intel,pxa3xx-gpio";
reg = <0x40e00000 0x10000>; reg = <0x40e00000 0x10000>;
clocks = <&clks CLK_GPIO>;
interrupt-names = "gpio0", "gpio1", "gpio_mux"; interrupt-names = "gpio0", "gpio1", "gpio_mux";
interrupts = <8 9 10>; interrupts = <8 9 10>;
gpio-controller; gpio-controller;
...@@ -40,4 +43,28 @@ gpio: gpio@40e00000 { ...@@ -40,4 +43,28 @@ gpio: gpio@40e00000 {
#interrupt-cells = <0x2>; #interrupt-cells = <0x2>;
}; };
}; };
clocks {
/*
* The muxing of external clocks/internal dividers for osc* clock
* sources has been hidden under the carpet by now.
*/
#address-cells = <1>;
#size-cells = <1>;
ranges;
clks: pxa3xx_clks@41300004 {
compatible = "marvell,pxa300-clocks";
#clock-cells = <1>;
status = "okay";
};
};
timer@40a00000 {
compatible = "marvell,pxa-timer";
reg = <0x40a00000 0x20>;
interrupts = <26>;
clocks = <&clks CLK_OSTIMER>;
status = "okay";
};
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment