git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-a23.dtsi
diff --git
a/arch/arm/boot/dts/sun8i-a23.dtsi
b/arch/arm/boot/dts/sun8i-a23.dtsi
index
86584fc
..
dd34527
100644
(file)
--- a/
arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/
arch/arm/boot/dts/sun8i-a23.dtsi
@@
-47,11
+47,29
@@
* OTHER DEALINGS IN THE SOFTWARE.
*/
* OTHER DEALINGS IN THE SOFTWARE.
*/
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
interrupt-parent = <&gic>;
/ {
interrupt-parent = <&gic>;
+ chosen {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ framebuffer@0 {
+ compatible = "allwinner,simple-framebuffer",
+ "simple-framebuffer";
+ allwinner,pipeline = "de_be0-lcd0";
+ clocks = <&pll6 0>;
+ status = "disabled";
+ };
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@
-233,7
+251,7
@@
dma: dma-controller@01c02000 {
compatible = "allwinner,sun8i-a23-dma";
reg = <0x01c02000 0x1000>;
dma: dma-controller@01c02000 {
compatible = "allwinner,sun8i-a23-dma";
reg = <0x01c02000 0x1000>;
- interrupts = <
0 50 4
>;
+ interrupts = <
GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&ahb1_gates 6>;
resets = <&ahb1_rst 6>;
#dma-cells = <1>;
clocks = <&ahb1_gates 6>;
resets = <&ahb1_rst 6>;
#dma-cells = <1>;
@@
-246,7
+264,7
@@
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 8>;
reset-names = "ahb";
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 8>;
reset-names = "ahb";
- interrupts = <
0 60 4
>;
+ interrupts = <
GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH
>;
status = "disabled";
};
status = "disabled";
};
@@
-257,7
+275,7
@@
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 9>;
reset-names = "ahb";
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 9>;
reset-names = "ahb";
- interrupts = <
0 61 4
>;
+ interrupts = <
GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH
>;
status = "disabled";
};
status = "disabled";
};
@@
-268,16
+286,16
@@
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 10>;
reset-names = "ahb";
clock-names = "ahb", "mmc";
resets = <&ahb1_rst 10>;
reset-names = "ahb";
- interrupts = <
0 62 4
>;
+ interrupts = <
GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH
>;
status = "disabled";
};
pio: pinctrl@01c20800 {
compatible = "allwinner,sun8i-a23-pinctrl";
reg = <0x01c20800 0x400>;
status = "disabled";
};
pio: pinctrl@01c20800 {
compatible = "allwinner,sun8i-a23-pinctrl";
reg = <0x01c20800 0x400>;
- interrupts = <
0 11 4
>,
- <
0 15 4
>,
- <
0 17 4
>;
+ interrupts = <
GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH
>,
+ <
GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH
>,
+ <
GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&apb1_gates 5>;
gpio-controller;
interrupt-controller;
clocks = <&apb1_gates 5>;
gpio-controller;
interrupt-controller;
@@
-288,43
+306,43
@@
uart0_pins_a: uart0@0 {
allwinner,pins = "PF2", "PF4";
allwinner,function = "uart0";
uart0_pins_a: uart0@0 {
allwinner,pins = "PF2", "PF4";
allwinner,function = "uart0";
- allwinner,drive = <
0
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_10_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
allwinner,function = "mmc0";
};
mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
allwinner,function = "mmc0";
- allwinner,drive = <
2
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_30_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
mmc1_pins_a: mmc1@0 {
allwinner,pins = "PG0","PG1","PG2","PG3","PG4","PG5";
allwinner,function = "mmc1";
};
mmc1_pins_a: mmc1@0 {
allwinner,pins = "PG0","PG1","PG2","PG3","PG4","PG5";
allwinner,function = "mmc1";
- allwinner,drive = <
2
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_30_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
i2c0_pins_a: i2c0@0 {
allwinner,pins = "PH2", "PH3";
allwinner,function = "i2c0";
};
i2c0_pins_a: i2c0@0 {
allwinner,pins = "PH2", "PH3";
allwinner,function = "i2c0";
- allwinner,drive = <
0
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_10_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
i2c1_pins_a: i2c1@0 {
allwinner,pins = "PH4", "PH5";
allwinner,function = "i2c1";
};
i2c1_pins_a: i2c1@0 {
allwinner,pins = "PH4", "PH5";
allwinner,function = "i2c1";
- allwinner,drive = <
0
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_10_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
i2c2_pins_a: i2c2@0 {
allwinner,pins = "PE12", "PE13";
allwinner,function = "i2c2";
};
i2c2_pins_a: i2c2@0 {
allwinner,pins = "PE12", "PE13";
allwinner,function = "i2c2";
- allwinner,drive = <
0
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_10_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
};
};
};
@@
-349,21
+367,28
@@
timer@01c20c00 {
compatible = "allwinner,sun4i-a10-timer";
reg = <0x01c20c00 0xa0>;
timer@01c20c00 {
compatible = "allwinner,sun4i-a10-timer";
reg = <0x01c20c00 0xa0>;
- interrupts = <
0 18 4
>,
- <
0 19 4
>;
+ interrupts = <
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH
>,
+ <
GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&osc24M>;
};
wdt0: watchdog@01c20ca0 {
compatible = "allwinner,sun6i-a31-wdt";
reg = <0x01c20ca0 0x20>;
clocks = <&osc24M>;
};
wdt0: watchdog@01c20ca0 {
compatible = "allwinner,sun6i-a31-wdt";
reg = <0x01c20ca0 0x20>;
- interrupts = <0 25 4>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ lradc: lradc@01c22800 {
+ compatible = "allwinner,sun4i-a10-lradc-keys";
+ reg = <0x01c22800 0x100>;
+ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
};
uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
};
uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
- interrupts = <
0 0 4
>;
+ interrupts = <
GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 16>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 16>;
@@
-376,7
+401,7
@@
uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
- interrupts = <
0 1 4
>;
+ interrupts = <
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 17>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 17>;
@@
-389,7
+414,7
@@
uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>;
uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>;
- interrupts = <
0 2 4
>;
+ interrupts = <
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 18>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 18>;
@@
-402,7
+427,7
@@
uart3: serial@01c28c00 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>;
uart3: serial@01c28c00 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>;
- interrupts = <
0 3 4
>;
+ interrupts = <
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 19>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 19>;
@@
-415,7
+440,7
@@
uart4: serial@01c29000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c29000 0x400>;
uart4: serial@01c29000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c29000 0x400>;
- interrupts = <
0 4 4
>;
+ interrupts = <
GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 20>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb2_gates 20>;
@@
-428,7
+453,7
@@
i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2ac00 0x400>;
i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2ac00 0x400>;
- interrupts = <
0 6 4
>;
+ interrupts = <
GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&apb2_gates 0>;
resets = <&apb2_rst 0>;
status = "disabled";
clocks = <&apb2_gates 0>;
resets = <&apb2_rst 0>;
status = "disabled";
@@
-439,7
+464,7
@@
i2c1: i2c@01c2b000 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>;
i2c1: i2c@01c2b000 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>;
- interrupts = <
0 7 4
>;
+ interrupts = <
GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&apb2_gates 1>;
resets = <&apb2_rst 1>;
status = "disabled";
clocks = <&apb2_gates 1>;
resets = <&apb2_rst 1>;
status = "disabled";
@@
-450,7
+475,7
@@
i2c2: i2c@01c2b400 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b400 0x400>;
i2c2: i2c@01c2b400 {
compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b400 0x400>;
- interrupts = <
0 8 4
>;
+ interrupts = <
GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&apb2_gates 2>;
resets = <&apb2_rst 2>;
status = "disabled";
clocks = <&apb2_gates 2>;
resets = <&apb2_rst 2>;
status = "disabled";
@@
-466,13
+491,14
@@
<0x01c86000 0x2000>;
interrupt-controller;
#interrupt-cells = <3>;
<0x01c86000 0x2000>;
interrupt-controller;
#interrupt-cells = <3>;
- interrupts = <
1 9 0xf04
>;
+ interrupts = <
GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)
>;
};
rtc: rtc@01f00000 {
compatible = "allwinner,sun6i-a31-rtc";
reg = <0x01f00000 0x54>;
};
rtc: rtc@01f00000 {
compatible = "allwinner,sun6i-a31-rtc";
reg = <0x01f00000 0x54>;
- interrupts = <0 40 4>, <0 41 4>;
+ interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
};
prcm@01f01400 {
};
prcm@01f01400 {
@@
-522,7
+548,7
@@
r_uart: serial@01f02800 {
compatible = "snps,dw-apb-uart";
reg = <0x01f02800 0x400>;
r_uart: serial@01f02800 {
compatible = "snps,dw-apb-uart";
reg = <0x01f02800 0x400>;
- interrupts = <
0 38 4
>;
+ interrupts = <
GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH
>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb0_gates 4>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&apb0_gates 4>;
@@
-533,7
+559,7
@@
r_pio: pinctrl@01f02c00 {
compatible = "allwinner,sun8i-a23-r-pinctrl";
reg = <0x01f02c00 0x400>;
r_pio: pinctrl@01f02c00 {
compatible = "allwinner,sun8i-a23-r-pinctrl";
reg = <0x01f02c00 0x400>;
- interrupts = <
0 45 4
>;
+ interrupts = <
GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH
>;
clocks = <&apb0_gates 0>;
resets = <&apb0_rst 0>;
gpio-controller;
clocks = <&apb0_gates 0>;
resets = <&apb0_rst 0>;
gpio-controller;
@@
-545,8
+571,8
@@
r_uart_pins_a: r_uart@0 {
allwinner,pins = "PL2", "PL3";
allwinner,function = "s_uart";
r_uart_pins_a: r_uart@0 {
allwinner,pins = "PL2", "PL3";
allwinner,function = "s_uart";
- allwinner,drive = <
0
>;
- allwinner,pull = <
0
>;
+ allwinner,drive = <
SUN4I_PINCTRL_10_MA
>;
+ allwinner,pull = <
SUN4I_PINCTRL_NO_PULL
>;
};
};
};
};
};
};