mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
mvebu DT fixes-non-critical (for v3.15-rc1)
- kirkwood - add some missing vendor prefixes to keep checkpatch happy - mvebu - add clock ref to mdio node on 370/XP/38x -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTRp87AAoJEP45WPkGe8ZnQMsP/i34LwsfOeNGtWeZnkPK4Jx1 jp0RJrlzs2vGJyPrWAhkR+rSAwBVS5BzPTlRmJmuU/r+g6nnYB114dPk4mcGFB3W oLATGzJ1To2p5oxODYC0pYTiWZGa2bPt1IOSyN3p77IX7iGjqx2uCuGHGK3eNez3 hqi8gHy2J6JCHMW60UhP2gBwUNgpOXHaekLdaRdj1zX66d14P4yLGVS2f8YjBTqd 5L/0/P7SFHsZVFl6F24mWLE6PLSoQHpRsXx0T+N5AJTuFUHBiBHrXL5XiOduWLb4 AdG//fu39zjbV9pnanktzrb7Y4qFTUXhl0YlvIedx4O3itVtfuvLGnvx9S79yapz lb22vjWU3Y1/IkgVSiAD1YdWvFbMJpbFVC1TxTR8mT/23E+bgSJhNOwkLznF7KA3 +MgZjx0MolRkhPo7eVOVlyc+c4r4+GrU2UjKPImt5imPFtcnAWQIGVScIigURiLF OcxJnwAV7qPlQvYHASHcv7Lfrb5kBaxwGNEvn8QzqWPuMjX0owgvXlkf9LotlbTV T9PQOGHfBH9Jpyo4aU75hDuhsMpm4zK2cIV3R0E7lLVXUaoth9GgSmUJcaA/GiZa likX0g9mNBJdEel4e3WhjHmt6kfbbxhPSB8RJOoEeCx5AY6gUyFQuR0RLaKu+C6A 1hs/KWDko00WsnWKiOxP =cOq9 -----END PGP SIGNATURE----- Merge tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu into fixes mvebu DT fixes-non-critical (for v3.15-rc1) - kirkwood - add some missing vendor prefixes to keep checkpatch happy - mvebu - add clock ref to mdio node on 370/XP/38x * tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu: ARM: mvebu: ensure the mdio node has a clock reference on Armada 38x ARM: mvebu: ensure the mdio node has a clock reference on Armada 370/XP ARM: Kirkwood: DT: Add missing vendor prefix ARM: Kirkwood: Fix Atmel vendor prefix Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
191bcd8120
12 changed files with 13 additions and 11 deletions
|
@ -230,6 +230,7 @@ mdio {
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
compatible = "marvell,orion-mdio";
|
compatible = "marvell,orion-mdio";
|
||||||
reg = <0x72004 0x4>;
|
reg = <0x72004 0x4>;
|
||||||
|
clocks = <&gateclk 4>;
|
||||||
};
|
};
|
||||||
|
|
||||||
eth1: ethernet@74000 {
|
eth1: ethernet@74000 {
|
||||||
|
|
|
@ -336,6 +336,7 @@ mdio {
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
compatible = "marvell,orion-mdio";
|
compatible = "marvell,orion-mdio";
|
||||||
reg = <0x72004 0x4>;
|
reg = <0x72004 0x4>;
|
||||||
|
clocks = <&gateclk 4>;
|
||||||
};
|
};
|
||||||
|
|
||||||
coredivclk: clock@e4250 {
|
coredivclk: clock@e4250 {
|
||||||
|
|
|
@ -75,7 +75,7 @@ spi@10600 {
|
||||||
m25p16@0 {
|
m25p16@0 {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
compatible = "m25p16";
|
compatible = "st,m25p16";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
spi-max-frequency = <40000000>;
|
spi-max-frequency = <40000000>;
|
||||||
mode = <0>;
|
mode = <0>;
|
||||||
|
|
|
@ -46,7 +46,7 @@ spi@10600 {
|
||||||
flash@0 {
|
flash@0 {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
compatible = "mx25l4005a";
|
compatible = "mxicy,mx25l4005a";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
spi-max-frequency = <20000000>;
|
spi-max-frequency = <20000000>;
|
||||||
mode = <0>;
|
mode = <0>;
|
||||||
|
|
|
@ -43,7 +43,7 @@ spi@10600 {
|
||||||
m25p40@0 {
|
m25p40@0 {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
compatible = "mx25l1606e";
|
compatible = "mxicy,mx25l1606e";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
spi-max-frequency = <50000000>;
|
spi-max-frequency = <50000000>;
|
||||||
mode = <0>;
|
mode = <0>;
|
||||||
|
|
|
@ -48,7 +48,7 @@ i2c@11000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
eeprom@50 {
|
eeprom@50 {
|
||||||
compatible = "at,24c04";
|
compatible = "atmel,24c04";
|
||||||
pagesize = <16>;
|
pagesize = <16>;
|
||||||
reg = <0x50>;
|
reg = <0x50>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -56,7 +56,7 @@ spi@10600 {
|
||||||
flash@0 {
|
flash@0 {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
compatible = "mx25l12805d";
|
compatible = "mxicy,mx25l12805d";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
spi-max-frequency = <50000000>;
|
spi-max-frequency = <50000000>;
|
||||||
mode = <0>;
|
mode = <0>;
|
||||||
|
|
|
@ -32,7 +32,7 @@ spi@10600 {
|
||||||
flash@0 {
|
flash@0 {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
compatible = "mx25l4005a";
|
compatible = "mxicy,mx25l4005a";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
spi-max-frequency = <20000000>;
|
spi-max-frequency = <20000000>;
|
||||||
mode = <0>;
|
mode = <0>;
|
||||||
|
@ -50,7 +50,7 @@ i2c@11000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
eeprom@50 {
|
eeprom@50 {
|
||||||
compatible = "at,24c04";
|
compatible = "atmel,24c04";
|
||||||
pagesize = <16>;
|
pagesize = <16>;
|
||||||
reg = <0x50>;
|
reg = <0x50>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -104,7 +104,7 @@ i2c@11000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
adt7476: adt7476a@2e {
|
adt7476: adt7476a@2e {
|
||||||
compatible = "adt7476";
|
compatible = "adi,adt7476";
|
||||||
reg = <0x2e>;
|
reg = <0x2e>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -94,7 +94,7 @@ i2c@11000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
lm85: lm85@2e {
|
lm85: lm85@2e {
|
||||||
compatible = "lm85";
|
compatible = "national,lm85";
|
||||||
reg = <0x2e>;
|
reg = <0x2e>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,7 +40,7 @@ i2c@11100 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
||||||
s35390a: s35390a@30 {
|
s35390a: s35390a@30 {
|
||||||
compatible = "s35390a";
|
compatible = "sii,s35390a";
|
||||||
reg = <0x30>;
|
reg = <0x30>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,7 +52,7 @@ i2c@11100 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
||||||
s24c02: s24c02@50 {
|
s24c02: s24c02@50 {
|
||||||
compatible = "24c02";
|
compatible = "atmel,24c02";
|
||||||
reg = <0x50>;
|
reg = <0x50>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue