tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull "AT91 DT for 4.17" from Alexandre Belloni:

Not much this cycle, mainly changes on the Axentia boards from Peter and
a cleanup from Bartosz:

 - use 'atmel' as at24 manufacturer
 - device addition and fixes for axentia boards
 - fix sama5d4 pinctrl compatible

* tag 'at91-ab-4.17-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9263ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91-sama5d2_ptc_ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9g20ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for at91sam9260ek
  ARM: dts: at91: use 'atmel' as at24 manufacturer for sama5d34ek
  ARM: dts: at91: sama5d4: fix pinctrl compatible string
  ARM: dts: at91: tse850: make the sound dai cell count explicit
  ARM: dts: at91: nattis: add lvds-encoder
  ARM: dts: at91: nattis: use up-to-date mtd partitions
  ARM: dts: at91: tse850: use the correct compatible for the eeprom
  ARM: dts: at91: nattis: use the correct compatible for the eeprom
  ARM: dts: at91: sam9rl: Properly assign copyright
This commit is contained in:
Arnd Bergmann
2018-03-12 15:05:54 +01:00
parent 9f07438dd1 6fa65edf87
commit 189e542b93
10 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+45 -15
View File
@@ -109,7 +109,32 @@
port {
panel_input: endpoint {
remote-endpoint = <&hlcdc_panel_output>;
remote-endpoint = <&lvds_encoder_output>;
};
};
};
lvds-encoder {
compatible = "lvds-encoder";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
lvds_encoder_input: endpoint {
remote-endpoint = <&hlcdc_output>;
};
};
port@1 {
reg = <1>;
lvds_encoder_output: endpoint {
remote-endpoint = <&panel_input>;
};
};
};
};
@@ -146,7 +171,7 @@
};
eeprom@50 {
compatible = "nxp,24c02";
compatible = "nxp,se97b", "atmel,24c02";
reg = <0x50>;
pagesize = <16>;
};
@@ -176,8 +201,8 @@
&pinctrl_lcd_hipow0>;
port@0 {
hlcdc_panel_output: endpoint {
remote-endpoint = <&panel_input>;
hlcdc_output: endpoint {
remote-endpoint = <&lvds_encoder_input>;
};
};
};
@@ -216,29 +241,34 @@
reg = <0x0 0x40000>;
};
bootloader@40000 {
label = "bootloader";
reg = <0x40000 0x80000>;
barebox@40000 {
label = "barebox";
reg = <0x40000 0x60000>;
};
bootloaderenv@c0000 {
label = "bootloader env";
reg = <0xc0000 0xc0000>;
bareboxenv@c0000 {
label = "bareboxenv";
reg = <0xc0000 0x40000>;
};
dtb@180000 {
label = "device tree";
reg = <0x180000 0x80000>;
bareboxenv2@100000 {
label = "bareboxenv2";
reg = <0x100000 0x40000>;
};
oftree@180000 {
label = "oftree";
reg = <0x180000 0x20000>;
};
kernel@200000 {
label = "kernel";
reg = <0x200000 0x600000>;
reg = <0x200000 0x500000>;
};
rootfs@800000 {
label = "rootfs";
reg = <0x800000 0x0f800000>;
reg = <0x800000 0x1f800000>;
};
};
};
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+1 -1
View File
@@ -230,7 +230,7 @@
status = "okay";
at24@50 {
compatible = "24c02";
compatible = "atmel,24c02";
reg = <0x50>;
pagesize = <8>;
};
arch/arm/boot/dts/at91-tse850-3.dts
+2 -1
View File
@@ -234,6 +234,7 @@
compatible = "ti,pcm5142";
reg = <0x4c>;
#sound-dai-cells = <0>;
AVDD-supply = <&reg_3v3>;
DVDD-supply = <&reg_3v3>;
@@ -246,7 +247,7 @@
};
eeprom@50 {
compatible = "nxp,24c02", "atmel,24c02";
compatible = "nxp,se97b", "atmel,24c02";
reg = <0x50>;
pagesize = <16>;
};
arch/arm/boot/dts/at91sam9260ek.dts
+1 -1
View File
@@ -201,7 +201,7 @@
status = "okay";
24c512@50 {
compatible = "24c512";
compatible = "atmel,24c512";
reg = <0x50>;
};
};
arch/arm/boot/dts/at91sam9263ek.dts
+1 -1
View File
@@ -250,7 +250,7 @@
status = "okay";
24c512@50 {
compatible = "24c512";
compatible = "atmel,24c512";
reg = <0x50>;
pagesize = <128>;
};
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+1 -1
View File
@@ -211,7 +211,7 @@
status = "okay";
24c512@50 {
compatible = "24c512";
compatible = "atmel,24c512";
reg = <0x50>;
};
arch/arm/boot/dts/at91sam9rl.dtsi
+2 -1
View File
@@ -1,7 +1,8 @@
/*
* at91sam9rl.dtsi - Device Tree Include file for AT91SAM9RL family SoC
*
* Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com>
* Copyright (C) 2014 Microchip
* Alexandre Belloni <alexandre.belloni@free-electrons.com>
*
* Licensed under GPLv2 or later.
*/
arch/arm/boot/dts/at91sam9rlek.dts
+2 -1
View File
@@ -1,7 +1,8 @@
/*
* at91sam9rlek.dts - Device Tree file for Atmel at91sam9rl reference board
*
* Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com>
* Copyright (C) 2014 Microchip
* Alexandre Belloni <alexandre.belloni@free-electrons.com>
*
* Licensed under GPLv2 only
*/
arch/arm/boot/dts/sama5d34ek.dts
+1 -1
View File
@@ -38,7 +38,7 @@
status = "okay";
24c256@50 {
compatible = "24c256";
compatible = "atmel,24c256";
reg = <0x50>;
pagesize = <64>;
};
arch/arm/boot/dts/sama5d4.dtsi
+1 -1
View File
@@ -1379,7 +1379,7 @@
pinctrl@fc06a000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";
ranges = <0xfc068000 0xfc068000 0x100
0xfc06a000 0xfc06a000 0x4000>;
/* WARNING: revisit as pin spec has changed */