Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d82b4013 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

Merge branch 'at91-3.15-fixes' into at91-3.16-dt3

parents 89ca3b88 35d35aae

Documentation/devicetree/bindings/clock/at91-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Required properties for PMC node: 
- interrupt-controller : tell that the PMC is an interrupt controller.

- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,

	and reflect the bit position in the PMC_ER/DR/SR registers.

	You can use the dt macros defined in dt-bindings/clk/at91.h.

	You can use the dt macros defined in dt-bindings/clock/at91.h.

	0 (AT91_PMC_MOSCS) -> main oscillator ready

	1 (AT91_PMC_LOCKA) -> PLL A ready

	2 (AT91_PMC_LOCKB) -> PLL B ready

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
			};



			spi0: spi@f0004000 {

				cs-gpios = <&pioD 13 0>;

				cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;

				status = "okay";

			};
@@ -79,7 +79,7 @@ 
			};



			spi1: spi@f8008000 {

				cs-gpios = <&pioC 25 0>, <0>, <0>, <&pioD 16 0>;

				cs-gpios = <&pioC 25 0>;

				status = "okay";

			};

arch/arm/boot/dts/at91sam9261.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clk/at91.h>

#include <dt-bindings/clock/at91.h>



/ {

	model = "Atmel AT91SAM9261 family SoC";

arch/arm/boot/dts/at91sam9rl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include "skeleton.dtsi"

#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/clk/at91.h>

#include <dt-bindings/clock/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>

arch/arm/boot/dts/sama5d3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <dt-bindings/pinctrl/at91.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clk/at91.h>

#include <dt-bindings/clock/at91.h>



/ {

	model = "Atmel SAMA5D3 family SoC";