leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nomadik DTS changes for v4.7:

Browse Source 
- Add accelerometer for NHK15
 - Add DMA engine definitions and UART channels
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXD/XjAAoJEEEQszewGV1zeeoP/1Q1B++0srhxF5iOR6v7bfg4
 JAsxKTQWWHekGQmxS8RLvf0zo4C3aUvbQvQgAohuO2tsy67nHkkOh75eJFgVrCqB
 hPI7IKhWR52jfmzsDHH75fujqLSJImCrprEN36XnnpIS0wnXjVIGz7ppIhUdWlZM
 ibyyofQ5HdZbb+fw8MfNk/x+YZdFvdA9eojZhXiVzp61YNlhfiEl/eiCpXm0LhFj
 p4K4USj1sTFK0nW9Uxlx8sRBTlgG8NoFZOeoPqaMofjtknuLdAQ4obzmmNSVgtUH
 hbz66FjzJfShzH4J7wVvbDD35CEY+tr2WX8+PcbAkCbk4x7z96lEl0lwU/b9eGu0
 NtNXnw+1n2y3aDGu4JrNKHpbE1JhjJK+ecPbdXD4v/qSKa9r76QElUdLhiu3EvZC
 EHgvzC07kaPYoXrVwNXvuReNhqnfi22+GjaN164kCrh/xX3LGOhG89Kzwrl4fQZL
 7tAc97sdDJvDfCsPeG+IkH7AGul+HXnsMuKBzl+ci0OC1UfnZ3otjTrhSCHmqZ1F
 87LOQInaKE8e76UOzHpDfCMd/J/XfKN5zsoYujIGp4YHQUqRFqkxQP3ixfhMQiPe
 IL/Tg3nKbK46BMCIDV3xo39+YwvVZG6TEwVplbJp9unOxGYk7QkW7Cce7GJDkiXm
 Vnf42Rv3LCVC0fCg+oyf
 =g5ZG
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Merge "Nomadik DTS changes for v4.7" from Linus Walleij:
- Add accelerometer for NHK15
- Add DMA engine definitions and UART channels

* tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: nomadik: add DMA engine and some channels
  ARM: dts: nomadik: add accelerometer IRQ and pin setting
This commit is contained in:
Arnd Bergmann 2016-04-24 23:23:53 +02:00
commit bb12fbd2cc
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/boot/dts/ste-nomadik-nhk15.dts
View File

@ -57,8 +57,15 @@
};
};
};
lis3lv02dl {
lis3lv02dl_nhk_mode: lis3lv02dl_nhk {
nhk_cfg1 {
pins = "GPIO82_C10"; // IRQ line
ste,input = <0>;
};
};
};
};
src@101e0000 {
/* These chrystal outputs are not used on this board */
disable-sxtalo;
@ -86,6 +93,10 @@
lis3lv02dl@1d {
/* Accelerometer */
compatible = "st,lis3lv02dl-accel";
interrupt-parent = <&gpio2>;
interrupts = <18 IRQ_TYPE_EDGE_RISING>; // GPIO 82
pinctrl-0 = <&lis3lv02dl_nhk_mode>;
pinctrl-names = "default";
reg = <0x1d>;
};
stmpe0: stmpe2401@43 {

38
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View File

@ -748,6 +748,9 @@
clocks = <&uart0clk>, <&pclkuart0>;
clock-names = "uartclk", "apb_pclk";
status = "disabled";
dmas = <&dmac0 14 1>,
<&dmac0 15 1>;
dma-names = "rx", "tx";
};
uart1: uart@101fb000 {
@ -759,6 +762,9 @@
clock-names = "uartclk", "apb_pclk";
pinctrl-names = "default";
pinctrl-0 = <&uart1_default_mux>;
dmas = <&dmac1 22 1>,
<&dmac1 23 1>;
dma-names = "rx", "tx";
};
uart2: uart@101f2000 {
@ -769,6 +775,9 @@
clocks = <&uart2clk>, <&pclkuart2>;
clock-names = "uartclk", "apb_pclk";
status = "disabled";
dmas = <&dmac1 30 1>,
<&dmac1 31 1>;
dma-names = "rx", "tx";
};
rng: rng@101b0000 {
@ -813,5 +822,34 @@
pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>;
vmmc-supply = <&vmmc_regulator>;
};
dmac0: dma-controller@10130000 {
compatible = "arm,pl080", "arm,primecell";
reg = <0x10130000 0x1000>;
interrupt-parent = <&vica>;
interrupts = <15>;
clocks = <&hclkdma0>;
clock-names = "apb_pclk";
lli-bus-interface-ahb1;
lli-bus-interface-ahb2;
mem-bus-interface-ahb2;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
#dma-cells = <2>;
};
dmac1: dma-controller@10150000 {
compatible = "arm,pl080", "arm,primecell";
reg = <0x10150000 0x1000>;
interrupt-parent = <&vica>;
interrupts = <13>;
clocks = <&hclkdma1>;
clock-names = "apb_pclk";
lli-bus-interface-ahb1;
lli-bus-interface-ahb2;
mem-bus-interface-ahb2;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
#dma-cells = <2>;
};
};
};