mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
mvebu dt changes for v3.11 (round 5)
- mvebu - set aliases for ethernet interfaces - PCIe range for armada-xp-db - rm unused properties on A370 - kirkwood - assign sheevaplug pinmuxs to correct devices - enable second PCIe port for ts219 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQEcBAABAgAGBQJRujTWAAoJEAi3KVZQDZAewwYH/iWl8JcRm0i0xyjYjj6v+XMk 2NauOq3A5yTWbI0H3oXi8QH0BBlUie30SuT85O675KS9no0tIbv8JlLx3PfhTjoB 3hrDKkhcD6jTqg7TgWL9w3Qdq2S0/XLgoZ4RDo35nrXsCodpkr5XaEPJP3ES1Zo+ n57cAgyw7edhohcIT/mKSv5WyOajbU4uWPxBr9i8sqZf9uTFOyOYQpWZMCvbJKc2 /MrQ0UfRhMgymcaYiO5oqihYn8C0HhxRBno1muXemR4Ovaxgdp040gPB0QnmGONo oibfWbOWnlx6KK8I/B231uCWuDEFm5q1sr/L/e17f1hi0S+R6fwREVgH/5Hf6MQ= =UXHW -----END PGP SIGNATURE----- Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux into next/dt From Jason Cooper: mvebu dt changes for v3.11 (round 5) - mvebu - set aliases for ethernet interfaces - PCIe range for armada-xp-db - rm unused properties on A370 - kirkwood - assign sheevaplug pinmuxs to correct devices - enable second PCIe port for ts219 * tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: ts219: Enable second PCIe port in DT. ARM: mvebu: Remove device tree unused properties on A370 arm: mvebu: armada-xp-db: ensure PCIe range is specified arm: kirkwood: sheevaplug: move pinmux configs to the right devices ARM: mvebu: set aliases for ethernet controllers Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
9214cbe50f
9 changed files with 49 additions and 37 deletions
|
@ -22,6 +22,11 @@ / {
|
||||||
model = "Marvell Armada 370 and XP SoC";
|
model = "Marvell Armada 370 and XP SoC";
|
||||||
compatible = "marvell,armada-370-xp";
|
compatible = "marvell,armada-370-xp";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
eth0 = ð0;
|
||||||
|
eth1 = ð1;
|
||||||
|
};
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
@ -98,7 +103,7 @@ mdio {
|
||||||
reg = <0x72004 0x4>;
|
reg = <0x72004 0x4>;
|
||||||
};
|
};
|
||||||
|
|
||||||
ethernet@70000 {
|
eth0: ethernet@70000 {
|
||||||
compatible = "marvell,armada-370-neta";
|
compatible = "marvell,armada-370-neta";
|
||||||
reg = <0x70000 0x2500>;
|
reg = <0x70000 0x2500>;
|
||||||
interrupts = <8>;
|
interrupts = <8>;
|
||||||
|
@ -106,7 +111,7 @@ ethernet@70000 {
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
ethernet@74000 {
|
eth1: ethernet@74000 {
|
||||||
compatible = "marvell,armada-370-neta";
|
compatible = "marvell,armada-370-neta";
|
||||||
reg = <0x74000 0x2500>;
|
reg = <0x74000 0x2500>;
|
||||||
interrupts = <10>;
|
interrupts = <10>;
|
||||||
|
|
|
@ -180,10 +180,6 @@ pcie-controller {
|
||||||
|
|
||||||
bus-range = <0x00 0xff>;
|
bus-range = <0x00 0xff>;
|
||||||
|
|
||||||
reg = <0x40000 0x2000>, <0x80000 0x2000>;
|
|
||||||
|
|
||||||
reg-names = "pcie0.0", "pcie1.0";
|
|
||||||
|
|
||||||
ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000 /* Port 0.0 registers */
|
ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000 /* Port 0.0 registers */
|
||||||
0x82000000 0 0x80000 0x80000 0 0x00002000 /* Port 1.0 registers */
|
0x82000000 0 0x80000 0x80000 0 0x00002000 /* Port 1.0 registers */
|
||||||
0x82000000 0 0xe0000000 0xe0000000 0 0x08000000 /* non-prefetchable memory */
|
0x82000000 0 0xe0000000 0xe0000000 0 0x08000000 /* non-prefetchable memory */
|
||||||
|
|
|
@ -31,6 +31,7 @@ memory {
|
||||||
|
|
||||||
soc {
|
soc {
|
||||||
ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */
|
ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */
|
||||||
|
0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
|
||||||
0xf0000000 0 0xf0000000 0x1000000>; /* Device Bus, NOR 16MiB */
|
0xf0000000 0 0xf0000000 0x1000000>; /* Device Bus, NOR 16MiB */
|
||||||
|
|
||||||
internal-regs {
|
internal-regs {
|
||||||
|
|
|
@ -23,6 +23,7 @@ aliases {
|
||||||
gpio0 = &gpio0;
|
gpio0 = &gpio0;
|
||||||
gpio1 = &gpio1;
|
gpio1 = &gpio1;
|
||||||
gpio2 = &gpio2;
|
gpio2 = &gpio2;
|
||||||
|
eth3 = ð3;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -105,7 +106,7 @@ gpio2: gpio@18180 {
|
||||||
interrupts = <91>;
|
interrupts = <91>;
|
||||||
};
|
};
|
||||||
|
|
||||||
ethernet@34000 {
|
eth3: ethernet@34000 {
|
||||||
compatible = "marvell,armada-370-neta";
|
compatible = "marvell,armada-370-neta";
|
||||||
reg = <0x34000 0x2500>;
|
reg = <0x34000 0x2500>;
|
||||||
interrupts = <14>;
|
interrupts = <14>;
|
||||||
|
|
|
@ -22,6 +22,10 @@ / {
|
||||||
model = "Marvell Armada XP family SoC";
|
model = "Marvell Armada XP family SoC";
|
||||||
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
|
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
eth2 = ð2;
|
||||||
|
};
|
||||||
|
|
||||||
soc {
|
soc {
|
||||||
internal-regs {
|
internal-regs {
|
||||||
L2: l2-cache {
|
L2: l2-cache {
|
||||||
|
@ -86,7 +90,7 @@ system-controller@18200 {
|
||||||
reg = <0x18200 0x500>;
|
reg = <0x18200 0x500>;
|
||||||
};
|
};
|
||||||
|
|
||||||
ethernet@30000 {
|
eth2: ethernet@30000 {
|
||||||
compatible = "marvell,armada-370-neta";
|
compatible = "marvell,armada-370-neta";
|
||||||
reg = <0x30000 0x2500>;
|
reg = <0x30000 0x2500>;
|
||||||
interrupts = <12>;
|
interrupts = <12>;
|
||||||
|
|
|
@ -44,10 +44,14 @@ pmx_sdio_wp: pmx-sdio-wp {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
serial@12000 {
|
serial@12000 {
|
||||||
|
pinctrl-0 = <&pmx_uart0>;
|
||||||
|
pinctrl-names = "default";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
nand@3000000 {
|
nand@3000000 {
|
||||||
|
pinctrl-0 = <&pmx_nand>;
|
||||||
|
pinctrl-names = "default";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
partition@0 {
|
partition@0 {
|
||||||
|
@ -71,6 +75,8 @@ regulators {
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
pinctrl-0 = <&pmx_usb_power_enable>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
|
||||||
usb_power: regulator@1 {
|
usb_power: regulator@1 {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
|
@ -84,14 +90,4 @@ usb_power: regulator@1 {
|
||||||
gpio = <&gpio0 29 0>;
|
gpio = <&gpio0 29 0>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio-leds {
|
|
||||||
compatible = "gpio-leds";
|
|
||||||
|
|
||||||
health {
|
|
||||||
label = "sheevaplug:blue:health";
|
|
||||||
gpios = <&gpio1 17 1>;
|
|
||||||
linux,default-trigger = "default-on";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,15 +15,6 @@ / {
|
||||||
compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||||
|
|
||||||
ocp@f1000000 {
|
ocp@f1000000 {
|
||||||
pinctrl: pinctrl@10000 {
|
|
||||||
|
|
||||||
pinctrl-0 = < &pmx_nand &pmx_uart0
|
|
||||||
&pmx_usb_power_enable
|
|
||||||
&pmx_led_blue>;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
sata@80000 {
|
sata@80000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
nr-ports = <2>;
|
nr-ports = <2>;
|
||||||
|
@ -37,4 +28,16 @@ mvsdio@90000 {
|
||||||
wp-gpios = <&gpio1 15 0>;
|
wp-gpios = <&gpio1 15 0>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gpio-leds {
|
||||||
|
compatible = "gpio-leds";
|
||||||
|
pinctrl-0 = <&pmx_led_blue>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
|
||||||
|
health {
|
||||||
|
label = "sheevaplug:blue:health";
|
||||||
|
gpios = <&gpio1 17 1>;
|
||||||
|
linux,default-trigger = "default-on";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,16 +15,6 @@ / {
|
||||||
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||||
|
|
||||||
ocp@f1000000 {
|
ocp@f1000000 {
|
||||||
pinctrl: pinctrl@10000 {
|
|
||||||
|
|
||||||
pinctrl-0 = < &pmx_nand &pmx_uart0
|
|
||||||
&pmx_usb_power_enable
|
|
||||||
&pmx_led_red
|
|
||||||
&pmx_led_blue>;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
mvsdio@90000 {
|
mvsdio@90000 {
|
||||||
pinctrl-0 = <&pmx_sdio>;
|
pinctrl-0 = <&pmx_sdio>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
@ -36,6 +26,14 @@ mvsdio@90000 {
|
||||||
|
|
||||||
gpio-leds {
|
gpio-leds {
|
||||||
compatible = "gpio-leds";
|
compatible = "gpio-leds";
|
||||||
|
pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
|
||||||
|
pinctrl-names = "default";
|
||||||
|
|
||||||
|
health {
|
||||||
|
label = "sheevaplug:blue:health";
|
||||||
|
gpios = <&gpio1 17 1>;
|
||||||
|
linux,default-trigger = "default-on";
|
||||||
|
};
|
||||||
|
|
||||||
misc {
|
misc {
|
||||||
label = "sheevaplug:red:misc";
|
label = "sheevaplug:red:misc";
|
||||||
|
|
|
@ -29,6 +29,14 @@ pmx_board_id: pmx-board-id {
|
||||||
marvell,function = "gpio";
|
marvell,function = "gpio";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
pcie-controller {
|
||||||
|
status = "okay";
|
||||||
|
|
||||||
|
pcie@2,0 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio_keys {
|
gpio_keys {
|
||||||
|
|
Loading…
Reference in a new issue