mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 15:13:55 +08:00
788296b2d1
Commit54397d8534("ARM: kirkwood: Relocate PCIe device tree nodes") moved the pcie-controller nodes for the Kirkwood SoCs to the mbus bus node. For some reason, two boards were not properly converted and have their pci-controller nodes still in the ocp bus node. As the corresponding SoC pcie-controller does not exist anymore, it is likely that pcie is broken on those boards since above commit. Fix it by moving the pcie related nodes to the correct location. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Fixes:54397d8534("ARM: kirkwood: Relocate PCIe device tree nodes") Cc: <stable@vger.kernel.org> # v3.12+ Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1398862602-29595-2-git-send-email-sebastian.hesselbarth@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
110 lines
1.8 KiB
Plaintext
110 lines
1.8 KiB
Plaintext
#include "kirkwood.dtsi"
|
|
#include "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
model = "ZyXEL NSA310";
|
|
|
|
mbus {
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
|
|
pmx_usb_power_off: pmx-usb-power-off {
|
|
marvell,pins = "mpp21";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_pwr_off: pmx-pwr-off {
|
|
marvell,pins = "mpp48";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
};
|
|
|
|
serial@12000 {
|
|
status = "ok";
|
|
};
|
|
|
|
sata@80000 {
|
|
status = "okay";
|
|
nr-ports = <2>;
|
|
};
|
|
};
|
|
|
|
gpio_poweroff {
|
|
compatible = "gpio-poweroff";
|
|
pinctrl-0 = <&pmx_pwr_off>;
|
|
pinctrl-names = "default";
|
|
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
regulators {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_usb_power_off>;
|
|
pinctrl-names = "default";
|
|
|
|
usb0_power_off: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
reg = <1>;
|
|
regulator-name = "USB Power Off";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&nand {
|
|
status = "okay";
|
|
chip-delay = <35>;
|
|
|
|
partition@0 {
|
|
label = "uboot";
|
|
reg = <0x0000000 0x0100000>;
|
|
read-only;
|
|
};
|
|
partition@100000 {
|
|
label = "uboot_env";
|
|
reg = <0x0100000 0x0080000>;
|
|
};
|
|
partition@180000 {
|
|
label = "key_store";
|
|
reg = <0x0180000 0x0080000>;
|
|
};
|
|
partition@200000 {
|
|
label = "info";
|
|
reg = <0x0200000 0x0080000>;
|
|
};
|
|
partition@280000 {
|
|
label = "etc";
|
|
reg = <0x0280000 0x0a00000>;
|
|
};
|
|
partition@c80000 {
|
|
label = "kernel_1";
|
|
reg = <0x0c80000 0x0a00000>;
|
|
};
|
|
partition@1680000 {
|
|
label = "rootfs1";
|
|
reg = <0x1680000 0x2fc0000>;
|
|
};
|
|
partition@4640000 {
|
|
label = "kernel_2";
|
|
reg = <0x4640000 0x0a00000>;
|
|
};
|
|
partition@5040000 {
|
|
label = "rootfs2";
|
|
reg = <0x5040000 0x2fc0000>;
|
|
};
|
|
};
|