Commit 0abf32a8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-4.21-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/dt 

AT91 DT for 4.21

 - Switch most platforms to the new clock binding
 - Small improvement for Axentia nattis

* tag 'at91-4.21-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: at91: nattis: initialize the BLON pin as output-low early
  ARM: dts: at91: at91sam9rl: switch to new clock bindings
  ARM: dts: at91: at91sam9x5: switch to new clock bindings
  ARM: dts: at91: at91sam9263: switch to new clock bindings
  ARM: dts: at91: at91sam9261: switch to new clock bindings
  ARM: dts: at91: at91sam9260: switch to new clock bindings
  ARM: dts: at91: sama5d2: switch to new clock binding
  ARM: dts: at91: sama5d4: switch to new clock bindings
  ARM: dts: at91: sama5d2: use the divided clock for SMC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ac3e0be6 d8007306

arch/arm/boot/dts/at91-nattis-2-natte-2.dts

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 


		power-supply = <&bl_reg>;

		enable-gpios = <&pioA 20 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_blon>;

	};



	panel: panel {
@@ -164,6 +166,12 @@ 
				      (AT91_PINCTRL_OUTPUT |

				       AT91_PINCTRL_OUTPUT_VAL(0))>;

		};



		pinctrl_blon: blon {

			atmel,pins = <AT91_PIOA 20 AT91_PERIPH_GPIO

				      (AT91_PINCTRL_OUTPUT |

				       AT91_PINCTRL_OUTPUT_VAL(0))>;

		};

	};

};

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

+6 −6
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
					dma-names = "tx", "rx";

					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&flx1_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_mikrobus_i2c>;

					atmel,fifo-size = <16>;
@@ -211,7 +211,7 @@ 
					compatible = "atmel,at91sam9260-usart";

					reg = <0x200 0x200>;

					interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;

					clocks = <&flx3_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;

					clock-names = "usart";

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx3_default>;
@@ -223,7 +223,7 @@ 
					compatible = "atmel,at91rm9200-spi";

					reg = <0x400 0x200>;

					interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;

					clocks = <&flx3_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;

					clock-names = "spi_clk";

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx3_default>;
@@ -240,7 +240,7 @@ 
					compatible = "atmel,at91sam9260-usart";

					reg = <0x200 0x200>;

					interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

					clocks = <&flx4_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

					clock-names = "usart";

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx4_default>;
@@ -252,7 +252,7 @@ 
					compatible = "atmel,at91rm9200-spi";

					reg = <0x400 0x200>;

					interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

					clocks = <&flx4_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

					clock-names = "spi_clk";

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
@@ -268,7 +268,7 @@ 
					dma-names = "tx", "rx";

					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&flx4_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx4_default>;

					atmel,fifo-size = <16>;

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

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
					dma-names = "tx", "rx";

					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&flx0_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx0_default>;

					atmel,fifo-size = <16>;

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

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ 
					compatible = "atmel,at91sam9260-usart";

					reg = <0x200 0x200>;

					interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;

					clocks = <&flx0_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;

					clock-names = "usart";

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx0_default>;
@@ -313,7 +313,7 @@ 
					dma-names = "tx", "rx";

					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&flx4_clk>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_flx4_default>;

					atmel,fifo-size = <16>;

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
				wm8904: codec@1a {

					compatible = "wlf,wm8904";

					reg = <0x1a>;

					clocks = <&pck2>;

					clocks = <&pmc PMC_TYPE_SYSTEM 10>;

					clock-names = "mclk";

				};

CRA Git | Maintained and supported by SUSTech CRA and CCSE