redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

- dts: add pinctrl/GPIO/EINT to mt8135

Browse source 
- dts: fix uart address for mt8127
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVZdqhAAoJELQ5Ylss8dNDArgQAJmMgIDUIW4u1/j8T0xX6WWf
 dWkdYfrNcV7lU8Y1xUtqucx/hI7waJlw6fRXyGj/8ZNG+NnAnOhC3NdWPy+9lRpA
 idjYihlFVtb4+AtWSXaPxpt4ea4Eq/87lXhgY02CwXw17naa5rimtHG8zppuM/v8
 Cvu27A3ID8RuGYNOvaYBJ9ngKfJH4QdgtzwHVk1KmDc91ROQqk+Gfey3olN7rsJZ
 M0Yf4tCaoNBLusF5nNb0PGnKHbQFvexAjDD4X3B+mCSBW4pyeZDBIvtXBJogBqmr
 B1XBfgeWmwFlLgF++DHEoakjQAVparqyMoB6GX9OkNpxpC1OrVz7S6zBX+wsp/WA
 9fKvmzTtF3FJQURv4v45u8/6iVn/V2OOgMDFiqF53JAfbWtlq7PqE8NJNwryRG+p
 5rSCT212qieAt3cz1iGKXjqlqzo+tXODBdmg+mQOQjHUhHDZfNraPGMFMO/Lq9kv
 dMJ6uUno4Y4NDaWT/TGBwblPSBR08JT7BwQKhgbTsnZuk4xJxZtSLCDwTWWkjtYe
 MGkWyP0PFWVbyzXtx6EXrBZm6XxcEZ4ymTXk4JHl49/9rodZ6zj+rd9zEgxARw+z
 03lS8r7nRmvgVW9TJgOwQgIR6avG3KvxPX/VzGdvGysar3/YYhFGQ36bhLm7AMG8
 laHAeKzwDr7ogHN2LGRo
 =zN/l
 -----END PGP SIGNATURE-----

Merge tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt

Merge "ARM: mediatek: dts updates for v4.2" from Matthias Brugger:
- dts: add pinctrl/GPIO/EINT to mt8135
- dts: fix uart address for mt8127

* tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek:
  ARM: dts: mt8127: correct uart instance address
  ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135.
This commit is contained in:
Arnd Bergmann 2015-05-29 13:56:58 +02:00
parent 0258b15d39 7d58054538
commit db695b5ecf
3 changed files with 1335 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/boot/dts/mt8127.dtsi
View file

@ -107,7 +107,7 @@
<0 0x10216000 0 0x2000>;
};
uart0: serial@11006000 {
uart0: serial@11002000 {
compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";
reg = <0 0x11002000 0 0x400>;
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>;
@ -115,7 +115,7 @@
status = "disabled";
};
uart1: serial@11007000 {
uart1: serial@11003000 {
compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";
reg = <0 0x11003000 0 0x400>;
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_LOW>;
@ -123,7 +123,7 @@
status = "disabled";
};
uart2: serial@11008000 {
uart2: serial@11004000 {
compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";
reg = <0 0x11004000 0 0x400>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_LOW>;
@ -131,7 +131,7 @@
status = "disabled";
};
uart3: serial@11009000 {
uart3: serial@11005000 {
compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";
reg = <0 0x11005000 0 0x400>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_LOW>;

1302
arch/arm/boot/dts/mt8135-pinfunc.h Normal file
View file

File diff suppressed because it is too large Load diff

29
arch/arm/boot/dts/mt8135.dtsi
View file

@ -15,6 +15,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton64.dtsi"
#include "mt8135-pinfunc.h"
/ {
compatible = "mediatek,mt8135";
@ -101,6 +102,29 @@
compatible = "simple-bus";
ranges;
/*
* Pinctrl access register at 0x10005000 and 0x1020c000 through
* regmap. Register 0x1000b000 is used by EINT.
*/
pio: pinctrl@10005000 {
compatible = "mediatek,mt8135-pinctrl";
reg = <0 0x1000b000 0 0x1000>;
mediatek,pctl-regmap = <&syscfg_pctl_a &syscfg_pctl_b>;
pins-are-numbered;
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
};
syscfg_pctl_a: syscfg_pctl_a@10005000 {
compatible = "mediatek,mt8135-pctl-a-syscfg", "syscon";
reg = <0 0x10005000 0 0x1000>;
};
timer: timer@10008000 {
compatible = "mediatek,mt8135-timer",
"mediatek,mt6577-timer";
@ -119,6 +143,11 @@
reg = <0 0x10200030 0 0x1c>;
};
syscfg_pctl_b: syscfg_pctl_b@1020c000 {
compatible = "mediatek,mt8135-pctl-b-syscfg", "syscon";
reg = <0 0x1020c000 0 0x1000>;
};
gic: interrupt-controller@10211000 {
compatible = "arm,cortex-a15-gic";
interrupt-controller;