Merge remote-tracking branch 'kumar/merge' into merge
This commit is contained in:
commit
407a362f94
|
@ -236,6 +236,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "pq3-esdhc-0.dtsi"
|
/include/ "pq3-esdhc-0.dtsi"
|
||||||
|
sdhc@2e000 {
|
||||||
|
compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";
|
||||||
|
};
|
||||||
|
|
||||||
/include/ "pq3-sec3.0-0.dtsi"
|
/include/ "pq3-sec3.0-0.dtsi"
|
||||||
/include/ "pq3-mpic.dtsi"
|
/include/ "pq3-mpic.dtsi"
|
||||||
/include/ "pq3-mpic-timer-B.dtsi"
|
/include/ "pq3-mpic-timer-B.dtsi"
|
||||||
|
|
|
@ -158,7 +158,8 @@
|
||||||
/include/ "pq3-usb2-dr-0.dtsi"
|
/include/ "pq3-usb2-dr-0.dtsi"
|
||||||
/include/ "pq3-esdhc-0.dtsi"
|
/include/ "pq3-esdhc-0.dtsi"
|
||||||
sdhc@2e000 {
|
sdhc@2e000 {
|
||||||
fsl,sdhci-auto-cmd12;
|
compatible = "fsl,p1010-esdhc", "fsl,esdhc";
|
||||||
|
sdhci,auto-cmd12;
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "pq3-sec4.4-0.dtsi"
|
/include/ "pq3-sec4.4-0.dtsi"
|
||||||
|
|
|
@ -145,6 +145,10 @@
|
||||||
/include/ "pq3-usb2-dr-1.dtsi"
|
/include/ "pq3-usb2-dr-1.dtsi"
|
||||||
|
|
||||||
/include/ "pq3-esdhc-0.dtsi"
|
/include/ "pq3-esdhc-0.dtsi"
|
||||||
|
sdhc@2e000 {
|
||||||
|
compatible = "fsl,p1020-esdhc", "fsl,esdhc";
|
||||||
|
sdhci,auto-cmd12;
|
||||||
|
};
|
||||||
/include/ "pq3-sec3.3-0.dtsi"
|
/include/ "pq3-sec3.3-0.dtsi"
|
||||||
|
|
||||||
/include/ "pq3-mpic.dtsi"
|
/include/ "pq3-mpic.dtsi"
|
||||||
|
|
|
@ -203,7 +203,8 @@
|
||||||
|
|
||||||
/include/ "pq3-esdhc-0.dtsi"
|
/include/ "pq3-esdhc-0.dtsi"
|
||||||
sdhc@2e000 {
|
sdhc@2e000 {
|
||||||
fsl,sdhci-auto-cmd12;
|
compatible = "fsl,p1022-esdhc", "fsl,esdhc";
|
||||||
|
sdhci,auto-cmd12;
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "pq3-sec3.3-0.dtsi"
|
/include/ "pq3-sec3.3-0.dtsi"
|
||||||
|
|
|
@ -182,6 +182,10 @@
|
||||||
/include/ "pq3-etsec1-1.dtsi"
|
/include/ "pq3-etsec1-1.dtsi"
|
||||||
/include/ "pq3-etsec1-2.dtsi"
|
/include/ "pq3-etsec1-2.dtsi"
|
||||||
/include/ "pq3-esdhc-0.dtsi"
|
/include/ "pq3-esdhc-0.dtsi"
|
||||||
|
sdhc@2e000 {
|
||||||
|
compatible = "fsl,p2020-esdhc", "fsl,esdhc";
|
||||||
|
};
|
||||||
|
|
||||||
/include/ "pq3-sec3.1-0.dtsi"
|
/include/ "pq3-sec3.1-0.dtsi"
|
||||||
/include/ "pq3-mpic.dtsi"
|
/include/ "pq3-mpic.dtsi"
|
||||||
/include/ "pq3-mpic-timer-B.dtsi"
|
/include/ "pq3-mpic-timer-B.dtsi"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* P1020 RDB Device Tree Source stub (no addresses or top-level ranges)
|
* P1020 RDB Device Tree Source stub (no addresses or top-level ranges)
|
||||||
*
|
*
|
||||||
* Copyright 2011 Freescale Semiconductor Inc.
|
* Copyright 2011-2012 Freescale Semiconductor Inc.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
@ -190,17 +190,16 @@
|
||||||
|
|
||||||
usb@22000 {
|
usb@22000 {
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
|
|
||||||
/* USB2 is shared with localbus, so it must be disabled
|
/* USB2 is shared with localbus. It is used
|
||||||
by default. We can't put 'status = "disabled";' here
|
only in case of SPI and SD boot after
|
||||||
since U-Boot doesn't clear the status property when
|
appropriate device-tree fixup done by uboot */
|
||||||
it enables USB2. OTOH, U-Boot does create a new node
|
|
||||||
when there isn't any. So, just comment it out.
|
|
||||||
usb@23000 {
|
usb@23000 {
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
*/
|
|
||||||
|
|
||||||
mdio@24000 {
|
mdio@24000 {
|
||||||
phy0: ethernet-phy@0 {
|
phy0: ethernet-phy@0 {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* P1021 MDS Device Tree Source
|
* P1021 MDS Device Tree Source
|
||||||
*
|
*
|
||||||
* Copyright 2010 Freescale Semiconductor Inc.
|
* Copyright 2010,2012 Freescale Semiconductor Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms of the GNU General Public License as published by the
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
@ -151,6 +151,7 @@
|
||||||
|
|
||||||
usb@22000 {
|
usb@22000 {
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
|
|
||||||
mdio@24000 {
|
mdio@24000 {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* P2020DS Device Tree Source stub (no addresses or top-level ranges)
|
* P2020DS Device Tree Source stub (no addresses or top-level ranges)
|
||||||
*
|
*
|
||||||
* Copyright 2011 Freescale Semiconductor Inc.
|
* Copyright 2011-2012 Freescale Semiconductor Inc.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
@ -134,6 +134,7 @@
|
||||||
&board_soc {
|
&board_soc {
|
||||||
usb@22000 {
|
usb@22000 {
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
|
|
||||||
mdio@24520 {
|
mdio@24520 {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* P2020 RDB Device Tree Source
|
* P2020 RDB Device Tree Source
|
||||||
*
|
*
|
||||||
* Copyright 2009-2011 Freescale Semiconductor Inc.
|
* Copyright 2009-2012 Freescale Semiconductor Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms of the GNU General Public License as published by the
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
@ -197,6 +197,7 @@
|
||||||
|
|
||||||
usb@22000 {
|
usb@22000 {
|
||||||
phy_type = "ulpi";
|
phy_type = "ulpi";
|
||||||
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
|
|
||||||
mdio@24520 {
|
mdio@24520 {
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include <sysdev/fsl_soc.h>
|
#include <sysdev/fsl_soc.h>
|
||||||
#include <sysdev/fsl_pci.h>
|
#include <sysdev/fsl_pci.h>
|
||||||
|
#include <asm/udbg.h>
|
||||||
#include <asm/fsl_guts.h>
|
#include <asm/fsl_guts.h>
|
||||||
#include "smp.h"
|
#include "smp.h"
|
||||||
|
|
||||||
|
|
|
@ -205,12 +205,12 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
|
||||||
|
|
||||||
if (paddr_hi == paddr_lo) {
|
if (paddr_hi == paddr_lo) {
|
||||||
pr_err("%s: No outbound window space\n", name);
|
pr_err("%s: No outbound window space\n", name);
|
||||||
return ;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (paddr_lo == 0) {
|
if (paddr_lo == 0) {
|
||||||
pr_err("%s: No space for inbound window\n", name);
|
pr_err("%s: No space for inbound window\n", name);
|
||||||
return ;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* setup PCSRBAR/PEXCSRBAR */
|
/* setup PCSRBAR/PEXCSRBAR */
|
||||||
|
@ -357,6 +357,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
|
||||||
(u64)hose->dma_window_size);
|
(u64)hose->dma_window_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
iounmap(pci);
|
iounmap(pci);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue