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

Commit cd06b2a5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-ab-4.8-dt3' of... 

Merge tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Merge "DT Changes for 4.8 #3" from Alexandre Belloni:
 - Lot of fixes for dtc warnings
 - Separate dtb compilation for ARMv4 and ARMv5

* tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: Don't build unnecessary dtbs
  ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
  ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
  ARM: dts: at91: move isi definition to at91sam9g25ek
  ARM: dts: at91: fix i2c-gpio node name
  ARM: dts: at91: vinco: fix regulator name
  ARM: dts: at91: ariag25 : fix onewire node
  ARM: dts: at91: sama5d4_ma5d4evk: fix regulator names
  ARM: dts: at91: sama5d4_ma5d4: fix regulator names
  ARM: dts: at91: sama5d4_xplained: fix regulator names
  ARM: dts: at91: sama5d3_xplained: fix regulator name
  ARM: dts: at91: sama5d4ek: remove useless lcd_bus
  ARM: dts: at91: Fix USB endpoint nodes
  Documentation: dt: usb: atmel-usb: add unit-address
  ARM: dts: at91: Fix ADC trigger nodes
  Documentation: dt: iio: at91_adc: fix trigger node names
parents cda1c2bd 7aff0f29

Documentation/devicetree/bindings/iio/adc/at91_adc.txt

+4 −8
Original line number Diff line number Diff line
@@ -59,28 +59,24 @@ adc0: adc@fffb0000 { 
	atmel,adc-res-names = "lowres", "highres";

	atmel,adc-use-res = "lowres";



	trigger@0 {

		reg = <0>;

	trigger0 {

		trigger-name = "external-rising";

		trigger-value = <0x1>;

		trigger-external;

	};

	trigger@1 {

		reg = <1>;

	trigger1 {

		trigger-name = "external-falling";

		trigger-value = <0x2>;

		trigger-external;

	};



	trigger@2 {

		reg = <2>;

	trigger2 {

		trigger-name = "external-any";

		trigger-value = <0x3>;

		trigger-external;

	};



	trigger@3 {

		reg = <3>;

	trigger3 {

		trigger-name = "continuous";

		trigger-value = <0x6>;

	};

Documentation/devicetree/bindings/usb/atmel-usb.txt

+7 −7
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ usb2: gadget@fff78000 { 
	clock-names = "hclk", "pclk";

	atmel,vbus-gpio = <&pioB 19 0>;



	ep0 {

	ep@0 {

		reg = <0>;

		atmel,fifo-size = <64>;

		atmel,nb-banks = <1>;

	};



	ep1 {

	ep@1 {

		reg = <1>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <2>;
@@ -127,7 +127,7 @@ usb2: gadget@fff78000 { 
		atmel,can-isoc;

	};



	ep2 {

	ep@2 {

		reg = <2>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <2>;
@@ -135,21 +135,21 @@ usb2: gadget@fff78000 { 
		atmel,can-isoc;

	};



	ep3 {

	ep@3 {

		reg = <3>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <3>;

		atmel,can-dma;

	};



	ep4 {

	ep@4 {

		reg = <4>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <3>;

		atmel,can-dma;

	};



	ep5 {

	ep@5 {

		reg = <5>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <3>;
@@ -157,7 +157,7 @@ usb2: gadget@fff78000 { 
		atmel,can-isoc;

	};



	ep6 {

	ep@6 {

		reg = <6>;

		atmel,fifo-size = <1024>;

		atmel,nb-banks = <3>;

arch/arm/boot/dts/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ dtb-$(CONFIG_MACH_ARTPEC6) += \ 
dtb-$(CONFIG_MACH_ASM9260) += \

	alphascale-asm9260-devkit.dtb

# Keep at91 dtb files sorted alphabetically for each SoC

dtb-$(CONFIG_SOC_SAM_V4_V5) += \

dtb-$(CONFIG_SOC_AT91RM9200) += \

	at91rm9200ek.dtb \

	mpa1600.dtb \

	mpa1600.dtb

dtb-$(CONFIG_SOC_AT91SAM9) += \

	animeo_ip.dtb \

	at91-qil_a9260.dtb \

	aks-cdu.dtb \

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

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


	};



	onewire@0 {

	onewire {

		compatible = "w1-gpio";

		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
		};

	};



	i2c@0 {

	i2c-gpio-0 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c0>;

		i2c-gpio,delay-us = <5>;	/* ~85 kHz */