tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

3.15 fixes for AT91
- one little DT fix
- the use of proper directory for clock in include/dt-bindings
it allows to remove the now empty include/dt-bindings/clk

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
dt-bindings: clock: Move at91.h to dt-bindigs/clock
ARM: at91: fix spi cs on sama5d3 Xplained board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 12e8e595 76e7745e

+9 -9
+1 -1
Documentation/devicetree/bindings/clock/at91-clock.txt
··· 62 62 - interrupt-controller : tell that the PMC is an interrupt controller. 63 63 - #interrupt-cells : must be set to 1. The first cell encodes the interrupt id, 64 64 and reflect the bit position in the PMC_ER/DR/SR registers. 65 - You can use the dt macros defined in dt-bindings/clk/at91.h. 65 + You can use the dt macros defined in dt-bindings/clock/at91.h. 66 66 0 (AT91_PMC_MOSCS) -> main oscillator ready 67 67 1 (AT91_PMC_LOCKA) -> PLL A ready 68 68 2 (AT91_PMC_LOCKB) -> PLL B ready
+2 -2
arch/arm/boot/dts/at91-sama5d3_xplained.dts
··· 34 34 }; 35 35 36 36 spi0: spi@f0004000 { 37 - cs-gpios = <&pioD 13 0>; 37 + cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; 38 38 status = "okay"; 39 39 }; 40 40 ··· 79 79 }; 80 80 81 81 spi1: spi@f8008000 { 82 - cs-gpios = <&pioC 25 0>, <0>, <0>, <&pioD 16 0>; 82 + cs-gpios = <&pioC 25 0>; 83 83 status = "okay"; 84 84 }; 85 85
+1 -1
arch/arm/boot/dts/at91sam9261.dtsi
··· 10 10 #include <dt-bindings/pinctrl/at91.h> 11 11 #include <dt-bindings/interrupt-controller/irq.h> 12 12 #include <dt-bindings/gpio/gpio.h> 13 - #include <dt-bindings/clk/at91.h> 13 + #include <dt-bindings/clock/at91.h> 14 14 15 15 / { 16 16 model = "Atmel AT91SAM9261 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9rl.dtsi
··· 8 8 9 9 #include "skeleton.dtsi" 10 10 #include <dt-bindings/pinctrl/at91.h> 11 - #include <dt-bindings/clk/at91.h> 11 + #include <dt-bindings/clock/at91.h> 12 12 #include <dt-bindings/interrupt-controller/irq.h> 13 13 #include <dt-bindings/gpio/gpio.h> 14 14
+1 -1
arch/arm/boot/dts/sama5d3.dtsi
··· 13 13 #include <dt-bindings/pinctrl/at91.h> 14 14 #include <dt-bindings/interrupt-controller/irq.h> 15 15 #include <dt-bindings/gpio/gpio.h> 16 - #include <dt-bindings/clk/at91.h> 16 + #include <dt-bindings/clock/at91.h> 17 17 18 18 / { 19 19 model = "Atmel SAMA5D3 family SoC";
+1 -1
arch/arm/boot/dts/sama5d3_mci2.dtsi
··· 9 9 10 10 #include <dt-bindings/pinctrl/at91.h> 11 11 #include <dt-bindings/interrupt-controller/irq.h> 12 - #include <dt-bindings/clk/at91.h> 12 + #include <dt-bindings/clock/at91.h> 13 13 14 14 / { 15 15 ahb {
+1 -1
arch/arm/boot/dts/sama5d3_tcb1.dtsi
··· 9 9 10 10 #include <dt-bindings/pinctrl/at91.h> 11 11 #include <dt-bindings/interrupt-controller/irq.h> 12 - #include <dt-bindings/clk/at91.h> 12 + #include <dt-bindings/clock/at91.h> 13 13 14 14 / { 15 15 aliases {
+1 -1
arch/arm/boot/dts/sama5d3_uart.dtsi
··· 9 9 10 10 #include <dt-bindings/pinctrl/at91.h> 11 11 #include <dt-bindings/interrupt-controller/irq.h> 12 - #include <dt-bindings/clk/at91.h> 12 + #include <dt-bindings/clock/at91.h> 13 13 14 14 / { 15 15 aliases {
include/dt-bindings/clk/at91.h include/dt-bindings/clock/at91.h