AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-22 11:47:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

UniPhier ARM SoC DT updates for v4.12

Browse Source 
- Remove skeleton.dtsi inclusion
 - Fix W=* build warnings
 - Fix eMMC pin-mux node
 - Add pagesize properties to EEPROM nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY0bjZAAoJED2LAQed4NsGKyAP/3clkx8xiQDd4yTRbY23NCr8
 x3KdvyYXzt+St8QGAsyE7W2juuEzb0hDDctzmn2UPH6xGtFwKa0FzjW+H5W9z3og
 3YfS0S1hLxv+7dLxUTrpZYqpJOBaPQsm9Cr16qTemggpVudzAQYtncMhR1QJGnDq
 u/k1M+YP4hy3lT4fK1wCVJuogR9x2KktPjqaAQ9iXo5m/ko9V4hww4HneOnfe6gp
 A3IxgNtfBrzXS1aMHGywTu4JMmLpbnwYQ20USEU4D8DudWCyUQFlEDQG0kbRNSGN
 jFpfSaU40ENx60noIkg8VHpAfLHtPbQ03QRfUdkkP2jO7G716e5vAsL3fSE2udAu
 z3TzDVlOslAtDWjGSJGF/2Q/KvWXWMaPGeeOzHZv5pX2BXgweTZ5dq6eikSPxA3M
 j8jox/uqyEYhmFgJ7acJuTtItrU4WwoxH7EHIWo0nS7SMicGgu8vVSgO5Cn2N6rw
 4JxIhaMGLH0+pW/N9UDd+eGT7fBGpxFDIL1mw2uf85R2slGAxmsi0TykTFfiIvlZ
 PoCrHdsXBnGHKkCmnG1zaALDCUNTB20l+ZoRt50tqSwFDeXqHfzQMCNJS3URE254
 HNC4A+4lcHsYqpQ5fNQAj7u05TmEyNBbuYMnerCEwmF04tu/Y1Uo/4if11dtmTwL
 SfBIc94pDWXfS751WtBL
 =8/Z2
 -----END PGP SIGNATURE-----

Merge tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.12" from Masahiro Yamada:

- Remove skeleton.dtsi inclusion
- Fix W=* build warnings
- Fix eMMC pin-mux node
- Add pagesize properties to EEPROM nodes

* tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add pagesize property to EEPROM of proto boards
  ARM: dts: uniphier: add pagesize property to EEPROM of Support Card
  ARM: dts: uniphier: fix pin groups of eMMC pin-mux node
  ARM: dts: uniphier: move memory node below aliases node
  ARM: dts: uniphier: fix no unit name warnings
  ARM: dts: uniphier: remove skeleton.dtsi inclusion
This commit is contained in:
Arnd Bergmann 2017-03-31 11:58:50 +02:00
commit c83e93e64d
18 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/uniphier-ld4-ref.dts
View File

@ -52,11 +52,6 @@ / {
model = "UniPhier LD4 Reference Board";
compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -71,6 +66,11 @@ aliases {
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/boot/dts/uniphier-ld4.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-ld4";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/boot/dts/uniphier-ld6b-ref.dts
View File

@ -52,11 +52,6 @@ / {
model = "UniPhier LD6b Reference Board";
compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -73,6 +68,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&ethsc {

2
arch/arm/boot/dts/uniphier-pinctrl.dtsi
View File

@ -45,7 +45,7 @@
&pinctrl {
pinctrl_emmc: emmc_grp {
groups = "emmc";
groups = "emmc", "emmc_dat8";
function = "emmc";
};

11
arch/arm/boot/dts/uniphier-pro4-ace.dts
View File

@ -50,11 +50,6 @@ / {
model = "UniPhier Pro4 Ace Board";
compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -70,6 +65,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&serial0 {
@ -90,6 +90,7 @@ &i2c0 {
eeprom@54 {
compatible = "st,24c64";
reg = <0x54>;
pagesize = <32>;
};
};

10
arch/arm/boot/dts/uniphier-pro4-ref.dts
View File

@ -52,11 +52,6 @@ / {
model = "UniPhier Pro4 Reference Board";
compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -73,6 +68,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
&ethsc {

11
arch/arm/boot/dts/uniphier-pro4-sanji.dts
View File

@ -50,11 +50,6 @@ / {
model = "UniPhier Pro4 Sanji Board";
compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -69,6 +64,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial0 {
@ -85,6 +85,7 @@ &i2c0 {
eeprom@54 {
compatible = "st,24c64";
reg = <0x54>;
pagesize = <32>;
};
};

4
arch/arm/boot/dts/uniphier-pro4.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pro4";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

4
arch/arm/boot/dts/uniphier-pro5.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pro5";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

11
arch/arm/boot/dts/uniphier-pxs2-gentil.dts
View File

@ -51,11 +51,6 @@ / {
compatible = "socionext,uniphier-pxs2-gentil",
"socionext,uniphier-pxs2";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -70,6 +65,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {
@ -82,6 +82,7 @@ &i2c0 {
eeprom@54 {
compatible = "st,24c64";
reg = <0x54>;
pagesize = <32>;
};
};

10
arch/arm/boot/dts/uniphier-pxs2-vodka.dts
View File

@ -50,11 +50,6 @@ / {
model = "UniPhier PXs2 Vodka Board";
compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
memory {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -68,6 +63,11 @@ aliases {
i2c5 = &i2c5;
i2c6 = &i2c6;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
};
&serial2 {

4
arch/arm/boot/dts/uniphier-pxs2.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-pxs2";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

4
arch/arm/boot/dts/uniphier-ref-daughter.dtsi
View File

@ -1,7 +1,8 @@
/*
* Device Tree Source for UniPhier Reference Daughter Board
*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2015-2017 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
@ -46,5 +47,6 @@ &i2c0 {
eeprom@50 {
compatible = "microchip,24lc128";
reg = <0x50>;
pagesize = <64>;
};
};

12
arch/arm/boot/dts/uniphier-sld3-ref.dts
View File

@ -52,12 +52,6 @@ / {
model = "UniPhier sLD3 Reference Board";
compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -72,6 +66,12 @@ aliases {
i2c3 = &i2c3;
i2c4 = &i2c4;
};
memory@8000000 {
device_type = "memory";
reg = <0x80000000 0x20000000
0xc0000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/boot/dts/uniphier-sld3.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-sld3";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

10
arch/arm/boot/dts/uniphier-sld8-ref.dts
View File

@ -52,11 +52,6 @@ / {
model = "UniPhier sLD8 Reference Board";
compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -71,6 +66,11 @@ aliases {
i2c2 = &i2c2;
i2c3 = &i2c3;
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
&ethsc {

4
arch/arm/boot/dts/uniphier-sld8.dtsi
View File

@ -43,10 +43,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/include/ "skeleton.dtsi"
/ {
compatible = "socionext,uniphier-sld8";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;

5
arch/arm/boot/dts/uniphier-support-card.dtsi
View File

@ -1,7 +1,8 @@
/*
* Device Tree Source for UniPhier Support Card (Expansion Board)
*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2015-2017 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
@ -46,7 +47,7 @@ &system_bus {
status = "okay";
ranges = <1 0x00000000 0x42000000 0x02000000>;
support_card: support_card {
support_card: support_card@1,1f00000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;