Merge tag 'powerpc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc updates from Michael Ellerman: "Core: - Ground work for the new Power9 MMU from Aneesh Kumar K.V - Optimise FP/VMX/VSX context switching from Anton Blanchard Misc: - Various cleanups from Krzysztof Kozlowski, John Ogness, Rashmica Gupta, Russell Currey, Gavin Shan, Daniel Axtens, Michael Neuling, Andrew Donnellan - Allow wrapper to work on non-english system from Laurent Vivier - Add rN aliases to the pt_regs_offset table from Rashmica Gupta - Fix module autoload for rackmeter & axonram drivers from Luis de Bethencourt - Include KVM guest test in all interrupt vectors from Paul Mackerras - Fix DSCR inheritance over fork() from Anton Blanchard - Make value-returning atomics & {cmp}xchg* & their atomic_ versions fully ordered from Boqun Feng - Print MSR TM bits in oops messages from Michael Neuling - Add TM signal return & invalid stack selftests from Michael Neuling - Limit EPOW reset event warnings from Vipin K Parashar - Remove the Cell QPACE code from Rashmica Gupta - Append linux_banner to exception information in xmon from Rashmica Gupta - Add selftest to check if VSRs are corrupted from Rashmica Gupta - Remove broken GregorianDay() from Daniel Axtens - Import Anton's context_switch2 benchmark into selftests from Michael Ellerman - Add selftest script to test HMI functionality from Daniel Axtens - Remove obsolete OPAL v2 support from Stewart Smith - Make enter_rtas() private from Michael Ellerman - PPR exception cleanups from Michael Ellerman - Add page soft dirty tracking from Laurent Dufour - Add support for Nvlink NPUs from Alistair Popple - Add support for kexec on 476fpe from Alistair Popple - Enable kernel CPU dlpar from sysfs from Nathan Fontenot - Copy only required pieces of the mm_context_t to the paca from Michael Neuling - Add a kmsg_dumper that flushes OPAL console output on panic from Russell Currey - Implement save_stack_trace_regs() to enable kprobe stack tracing from Steven Rostedt - Add HWCAP bits for Power9 from Michael Ellerman - Fix _PAGE_PTE breaking swapoff from Aneesh Kumar K.V - Fix _PAGE_SWP_SOFT_DIRTY breaking swapoff from Hugh Dickins - scripts/recordmcount.pl: support data in text section on powerpc from Ulrich Weigand - Handle R_PPC64_ENTRY relocations in modules from Ulrich Weigand cxl: - cxl: Fix possible idr warning when contexts are released from Vaibhav Jain - cxl: use correct operator when writing pcie config space values from Andrew Donnellan - cxl: Fix DSI misses when the context owning task exits from Vaibhav Jain - cxl: fix build for GCC 4.6.x from Brian Norris - cxl: use -Werror only with CONFIG_PPC_WERROR from Brian Norris - cxl: Enable PCI device ID for future IBM CXL adapter from Uma Krishnan Freescale: - Freescale updates from Scott: Highlights include moving QE code out of arch/powerpc (to be shared with arm), device tree updates, and minor fixes" * tag 'powerpc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (149 commits) powerpc/module: Handle R_PPC64_ENTRY relocations scripts/recordmcount.pl: support data in text section on powerpc powerpc/powernv: Fix OPAL_CONSOLE_FLUSH prototype and usages powerpc/mm: fix _PAGE_SWP_SOFT_DIRTY breaking swapoff powerpc/mm: Fix _PAGE_PTE breaking swapoff cxl: Enable PCI device ID for future IBM CXL adapter cxl: use -Werror only with CONFIG_PPC_WERROR cxl: fix build for GCC 4.6.x powerpc: Add HWCAP bits for Power9 powerpc/powernv: Reserve PE#0 on NPU powerpc/powernv: Change NPU PE# assignment powerpc/powernv: Fix update of NVLink DMA mask powerpc/powernv: Remove misleading comment in pci.c powerpc: Implement save_stack_trace_regs() to enable kprobe stack tracing powerpc: Fix build break due to paca mm_context_t changes cxl: Fix DSI misses when the context owning task exits MAINTAINERS: Update Scott Wood's e-mail address powerpc/powernv: Fix minor off-by-one error in opal_mce_check_early_recovery() powerpc: Fix style of self-test config prompts powerpc/powernv: Only delay opal_rtc_read() retry when necessary ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2016-01-15 16:18:47 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2016-01-15 16:18:47 -0500
commit: f689b742f217b2ffe7925f8a6521b208ee995309 (patch)
tree: 40ed4482ce5808fd5498fe935205b06782bbbca4 /arch/powerpc/boot
parent: 37cea93b99d2d89bef3adcb4632d71e1f377c447 (diff)
parent: be6bfc29bc759670fb3a2519325c4ab2edf259c9 (diff)
23 files changed, 264 insertions, 15 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 99e4487248ff..61165101342c 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -113,7 +113,6 @@ src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
 src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
 src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
 src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
-src-plat-$(CONFIG_PPC_CELL_QPACE) += pseries-head.S
 src-wlib := $(sort $(src-wlib-y))
 src-plat := $(sort $(src-plat-y))
@@ -217,7 +216,6 @@ image-$(CONFIG_PPC_POWERNV)		+= zImage.pseries
 image-$(CONFIG_PPC_MAPLE)               += zImage.maple
 image-$(CONFIG_PPC_IBM_CELL_BLADE)      += zImage.pseries
 image-$(CONFIG_PPC_PS3)                 += dtbImage.ps3
-image-$(CONFIG_PPC_CELL_QPACE)          += zImage.pseries
 image-$(CONFIG_PPC_CHRP)                += zImage.chrp
 image-$(CONFIG_PPC_EFIKA)               += zImage.chrp
 image-$(CONFIG_PPC_PMAC)                += zImage.pmac
diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 74866ac52f39..1b33f5157c8a 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -474,6 +474,11 @@
        fman@400000 {
                interrupts = <96 2 0 0>, <16 2 1 30>;
+                muram@0 {
+                        compatible = "fsl,fman-muram";
+                        reg = <0x0 0x80000>;
+                };
                enet0: ethernet@e0000 {
                };
diff --git a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
index 70882ade606d..56e6f1337e96 100644
--- a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
+++ b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
@@ -29,6 +29,21 @@
        soc: soc@ff700000 {
                ranges = <0x0 0x0 0xff700000 0x100000>;
        };
+        pci0: pcie@ff70a000 {
+                reg = <0 0xff70a000 0 0x1000>;
+                ranges = <0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xc0010000 0x0 0x10000>;
+                pcie@0 {
+                        ranges = <0x2000000 0x0 0x90000000
+                                  0x2000000 0x0 0x90000000
+                                  0x0 0x20000000
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
 };
 /include/ "bsc9132qds.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
index c72307198140..b5f071574e83 100644
--- a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
@@ -40,6 +40,34 @@
        interrupts = <16 2 0 0 20 2 0 0>;
 };
+/* controller at 0xa000 */
+&pci0 {
+        compatible = "fsl,bsc9132-pcie", "fsl,qoriq-pcie-v2.2";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0 255>;
+        interrupts = <16 2 0 0>;
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <16 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x2 0x0 0x0
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x2 0x0 0x0
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x2 0x0 0x0
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x2 0x0 0x0
+                        >;
+        };
+};
 &soc {
        #address-cells = <1>;
        #size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
index 301a9dba5790..90f7949fe312 100644
--- a/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
@@ -45,6 +45,7 @@
                serial0 = &serial0;
                ethernet0 = &enet0;
                ethernet1 = &enet1;
+                pci0 = &pci0;
        };
        cpus {
diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
index 0f0ced69835a..14b629505038 100644
--- a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
@@ -215,3 +215,19 @@
                phy-connection-type = "sgmii";
        };
 };
+&pci0 {
+        pcie@0 {
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        /*
+                         *irq[4:5] are active-high
+                         *irq[6:7] are active-low
+                         */
+                        0000 0x0 0x0 0x1 &mpic 0x4 0x2 0x0 0x0
+                        0000 0x0 0x0 0x2 &mpic 0x5 0x2 0x0 0x0
+                        0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
+                        0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
+                        >;
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/t1023rdb.dts b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
index 2b2fff4a12a2..6bd842beb1dc 100644
--- a/arch/powerpc/boot/dts/fsl/t1023rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
@@ -159,4 +159,4 @@
        };
 };
-/include/ "t1023si-post.dtsi"
+#include "t1023si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
index 518ddaa8da2d..99e421df79d4 100644
--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -32,6 +32,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+#include <dt-bindings/thermal/thermal.h>
 &ifc {
        #address-cells = <2>;
        #size-cells = <1>;
@@ -275,6 +277,90 @@
                reg = <0xea000 0x4000>;
        };
+        tmu: tmu@f0000 {
+                compatible = "fsl,qoriq-tmu";
+                reg = <0xf0000 0x1000>;
+                interrupts = <18 2 0 0>;
+                fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x30061>;
+                fsl,tmu-calibration = <0x00000000 0x0000000f
+                                       0x00000001 0x00000017
+                                       0x00000002 0x0000001e
+                                       0x00000003 0x00000026
+                                       0x00000004 0x0000002e
+                                       0x00000005 0x00000035
+                                       0x00000006 0x0000003d
+                                       0x00000007 0x00000044
+                                       0x00000008 0x0000004c
+                                       0x00000009 0x00000053
+                                       0x0000000a 0x0000005b
+                                       0x0000000b 0x00000064
+                                       0x00010000 0x00000011
+                                       0x00010001 0x0000001c
+                                       0x00010002 0x00000024
+                                       0x00010003 0x0000002b
+                                       0x00010004 0x00000034
+                                       0x00010005 0x00000039
+                                       0x00010006 0x00000042
+                                       0x00010007 0x0000004c
+                                       0x00010008 0x00000051
+                                       0x00010009 0x0000005a
+                                       0x0001000a 0x00000063
+                                       0x00020000 0x00000013
+                                       0x00020001 0x00000019
+                                       0x00020002 0x00000024
+                                       0x00020003 0x0000002c
+                                       0x00020004 0x00000035
+                                       0x00020005 0x0000003d
+                                       0x00020006 0x00000046
+                                       0x00020007 0x00000050
+                                       0x00020008 0x00000059
+                                       0x00030000 0x00000002
+                                       0x00030001 0x0000000d
+                                       0x00030002 0x00000019
+                                       0x00030003 0x00000024>;
+                #thermal-sensor-cells = <0>;
+        };
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+                        thermal-sensors = <&tmu>;
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                                map1 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu1 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
        scfg: global-utilities@fc000 {
                compatible = "fsl,t1023-scfg";
                reg = <0xfc000 0x1000>;
diff --git a/arch/powerpc/boot/dts/fsl/t1024qds.dts b/arch/powerpc/boot/dts/fsl/t1024qds.dts
index 43cd5b50cd0a..6a3581b8e1f8 100644
--- a/arch/powerpc/boot/dts/fsl/t1024qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t1024qds.dts
@@ -248,4 +248,4 @@
        };
 };
-/include/ "t1024si-post.dtsi"
+#include "t1024si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1024rdb.dts b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
index 429d8c73650a..0ccc7d03335e 100644
--- a/arch/powerpc/boot/dts/fsl/t1024rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
@@ -188,4 +188,4 @@
        };
 };
-/include/ "t1024si-post.dtsi"
+#include "t1024si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi
index 95e3af8d768e..bb480346a58d 100644
--- a/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi
@@ -32,7 +32,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-/include/ "t1023si-post.dtsi"
+#include "t1023si-post.dtsi"
 / {
        aliases {
diff --git a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
index 3e1528abf3f4..9d08a363bab3 100644
--- a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
@@ -76,6 +76,7 @@
                        reg = <0>;
                        clocks = <&mux0>;
                        next-level-cache = <&L2_1>;
+                        #cooling-cells = <2>;
                        L2_1: l2-cache {
                                next-level-cache = <&cpc>;
                        };
@@ -85,6 +86,7 @@
                        reg = <1>;
                        clocks = <&mux1>;
                        next-level-cache = <&L2_2>;
+                        #cooling-cells = <2>;
                        L2_2: l2-cache {
                                next-level-cache = <&cpc>;
                        };
diff --git a/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts b/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
index 681746efd31d..fb6bc02ebb60 100644
--- a/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
@@ -43,4 +43,4 @@
        interrupt-parent = <&mpic>;
 };
-/include/ "t1040si-post.dtsi"
+#include "t1040si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1040qds.dts b/arch/powerpc/boot/dts/fsl/t1040qds.dts
index 4d298659468c..5f76edc7838c 100644
--- a/arch/powerpc/boot/dts/fsl/t1040qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040qds.dts
@@ -43,4 +43,4 @@
        interrupt-parent = <&mpic>;
 };
-/include/ "t1040si-post.dtsi"
+#include "t1040si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
index 8f9e65b47515..cf194154bbdc 100644
--- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -45,4 +45,4 @@
        };
 };
-/include/ "t1040si-post.dtsi"
+#include "t1040si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index d30b3de1cfc5..e0f4da554774 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -32,6 +32,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+#include <dt-bindings/thermal/thermal.h>
 &bman_fbpr {
        compatible = "fsl,bman-fbpr";
        alloc-ranges = <0 0 0x10000 0>;
@@ -484,6 +486,98 @@
                reg        = <0xea000 0x4000>;
        };
+        tmu: tmu@f0000 {
+                compatible = "fsl,qoriq-tmu";
+                reg = <0xf0000 0x1000>;
+                interrupts = <18 2 0 0>;
+                fsl,tmu-range = <0xa0000 0x90026 0x8004a 0x1006a>;
+                fsl,tmu-calibration = <0x00000000 0x00000025
+                                       0x00000001 0x00000028
+                                       0x00000002 0x0000002d
+                                       0x00000003 0x00000031
+                                       0x00000004 0x00000036
+                                       0x00000005 0x0000003a
+                                       0x00000006 0x00000040
+                                       0x00000007 0x00000044
+                                       0x00000008 0x0000004a
+                                       0x00000009 0x0000004f
+                                       0x0000000a 0x00000054
+                                       0x00010000 0x0000000d
+                                       0x00010001 0x00000013
+                                       0x00010002 0x00000019
+                                       0x00010003 0x0000001f
+                                       0x00010004 0x00000025
+                                       0x00010005 0x0000002d
+                                       0x00010006 0x00000033
+                                       0x00010007 0x00000043
+                                       0x00010008 0x0000004b
+                                       0x00010009 0x00000053
+                                       0x00020000 0x00000010
+                                       0x00020001 0x00000017
+                                       0x00020002 0x0000001f
+                                       0x00020003 0x00000029
+                                       0x00020004 0x00000031
+                                       0x00020005 0x0000003c
+                                       0x00020006 0x00000042
+                                       0x00020007 0x0000004d
+                                       0x00020008 0x00000056
+                                       0x00030000 0x00000012
+                                       0x00030001 0x0000001d>;
+                #thermal-sensor-cells = <0>;
+        };
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+                        thermal-sensors = <&tmu>;
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                                map1 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu1 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                                map2 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu2 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                                map3 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu3 THERMAL_NO_LIMIT
+                                                        THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
        scfg: global-utilities@fc000 {
                compatible = "fsl,t1040-scfg";
                reg = <0xfc000 0x1000>;
diff --git a/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts b/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
index b245b31b8279..2a5a90dd272e 100644
--- a/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
@@ -50,4 +50,4 @@
        };
 };
-/include/ "t1040si-post.dtsi"
+#include "t1042si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1042qds.dts b/arch/powerpc/boot/dts/fsl/t1042qds.dts
index 4ab9bbe7c5c5..90a4a73bb905 100644
--- a/arch/powerpc/boot/dts/fsl/t1042qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t1042qds.dts
@@ -43,4 +43,4 @@
        interrupt-parent = <&mpic>;
 };
-/include/ "t1042si-post.dtsi"
+#include "t1042si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1042rdb.dts b/arch/powerpc/boot/dts/fsl/t1042rdb.dts
index 67af56bc5ee9..8d908e795e4d 100644
--- a/arch/powerpc/boot/dts/fsl/t1042rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1042rdb.dts
@@ -45,4 +45,4 @@
        };
 };
-/include/ "t1042si-post.dtsi"
+#include "t1042si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts b/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
index 2f67677530a4..98c001019d6a 100644
--- a/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
+++ b/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
@@ -54,4 +54,4 @@
        };
 };
-/include/ "t1042si-post.dtsi"
+#include "t1042si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
index 319b74f29724..a5544f93689c 100644
--- a/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
@@ -32,6 +32,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-/include/ "t1040si-post.dtsi"
+#include "t1040si-post.dtsi"
 /* Place holder for ethernet related device tree nodes */
diff --git a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
index fcfa38ae5e02..6db0ee8b1384 100644
--- a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
@@ -76,6 +76,7 @@
                        reg = <0>;
                        clocks = <&mux0>;
                        next-level-cache = <&L2_1>;
+                        #cooling-cells = <2>;
                        L2_1: l2-cache {
                                next-level-cache = <&cpc>;
                        };
@@ -85,6 +86,7 @@
                        reg = <1>;
                        clocks = <&mux1>;
                        next-level-cache = <&L2_2>;
+                        #cooling-cells = <2>;
                        L2_2: l2-cache {
                                next-level-cache = <&cpc>;
                        };
@@ -94,6 +96,7 @@
                        reg = <2>;
                        clocks = <&mux2>;
                        next-level-cache = <&L2_3>;
+                        #cooling-cells = <2>;
                        L2_3: l2-cache {
                                next-level-cache = <&cpc>;
                        };
@@ -103,6 +106,7 @@
                        reg = <3>;
                        clocks = <&mux3>;
                        next-level-cache = <&L2_4>;
+                        #cooling-cells = <2>;
                        L2_4: l2-cache {
                                next-level-cache = <&cpc>;
                        };
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index ceaa75d5a684..6a19fcef5596 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -154,7 +154,7 @@ if [ -z "$kernel" ]; then
    kernel=vmlinux
 fi
-elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`"
+LANG=C elfformat="`${CROSS}objdump -p "$kernel" | grep 'file format' | awk '{print $4}'`"
 case "$elfformat" in
    elf64-powerpcle)    format=elf64lppc        ;;
    elf64-powerpc)      format=elf32ppc ;;
author	Linus Torvalds <torvalds@linux-foundation.org>	2016-01-15 16:18:47 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2016-01-15 16:18:47 -0500
commit	f689b742f217b2ffe7925f8a6521b208ee995309 (patch)
tree	40ed4482ce5808fd5498fe935205b06782bbbca4 /arch/powerpc/boot
parent	37cea93b99d2d89bef3adcb4632d71e1f377c447 (diff)
parent	be6bfc29bc759670fb3a2519325c4ab2edf259c9 (diff)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 99e4487248ff..61165101342c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile
@@ -113,7 +113,6 @@ src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
113	src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S	113	src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
114	src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S	114	src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
115	src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S	115	src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
116	src-plat-$(CONFIG_PPC_CELL_QPACE) += pseries-head.S
117		116
118	src-wlib := $(sort $(src-wlib-y))	117	src-wlib := $(sort $(src-wlib-y))
119	src-plat := $(sort $(src-plat-y))	118	src-plat := $(sort $(src-plat-y))
@@ -217,7 +216,6 @@ image-$(CONFIG_PPC_POWERNV) += zImage.pseries
217	image-$(CONFIG_PPC_MAPLE) += zImage.maple	216	image-$(CONFIG_PPC_MAPLE) += zImage.maple
218	image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries	217	image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
219	image-$(CONFIG_PPC_PS3) += dtbImage.ps3	218	image-$(CONFIG_PPC_PS3) += dtbImage.ps3
220	image-$(CONFIG_PPC_CELL_QPACE) += zImage.pseries
221	image-$(CONFIG_PPC_CHRP) += zImage.chrp	219	image-$(CONFIG_PPC_CHRP) += zImage.chrp
222	image-$(CONFIG_PPC_EFIKA) += zImage.chrp	220	image-$(CONFIG_PPC_EFIKA) += zImage.chrp
223	image-$(CONFIG_PPC_PMAC) += zImage.pmac	221	image-$(CONFIG_PPC_PMAC) += zImage.pmac


diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi index 74866ac52f39..1b33f5157c8a 100644 --- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -474,6 +474,11 @@
474	fman@400000 {	474	fman@400000 {
475	interrupts = <96 2 0 0>, <16 2 1 30>;	475	interrupts = <96 2 0 0>, <16 2 1 30>;
476		476
		477	muram@0 {
		478	compatible = "fsl,fman-muram";
		479	reg = <0x0 0x80000>;
		480	};
		481
477	enet0: ethernet@e0000 {	482	enet0: ethernet@e0000 {
478	};	483	};
479		484


diff --git a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts index 70882ade606d..56e6f1337e96 100644 --- a/arch/powerpc/boot/dts/fsl/bsc9132qds.dts +++ b/arch/powerpc/boot/dts/fsl/bsc9132qds.dts
@@ -29,6 +29,21 @@
29	soc: soc@ff700000 {	29	soc: soc@ff700000 {
30	ranges = <0x0 0x0 0xff700000 0x100000>;	30	ranges = <0x0 0x0 0xff700000 0x100000>;
31	};	31	};
		32
		33	pci0: pcie@ff70a000 {
		34	reg = <0 0xff70a000 0 0x1000>;
		35	ranges = <0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x20000000
		36	0x1000000 0x0 0x00000000 0 0xc0010000 0x0 0x10000>;
		37	pcie@0 {
		38	ranges = <0x2000000 0x0 0x90000000
		39	0x2000000 0x0 0x90000000
		40	0x0 0x20000000
		41
		42	0x1000000 0x0 0x0
		43	0x1000000 0x0 0x0
		44	0x0 0x100000>;
		45	};
		46	};
32	};	47	};
33		48
34	/include/ "bsc9132qds.dtsi"	49	/include/ "bsc9132qds.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi index c72307198140..b5f071574e83 100644 --- a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
@@ -40,6 +40,34 @@
40	interrupts = <16 2 0 0 20 2 0 0>;	40	interrupts = <16 2 0 0 20 2 0 0>;
41	};	41	};
42		42
		43	/* controller at 0xa000 */
		44	&pci0 {
		45	compatible = "fsl,bsc9132-pcie", "fsl,qoriq-pcie-v2.2";
		46	device_type = "pci";
		47	#size-cells = <2>;
		48	#address-cells = <3>;
		49	bus-range = <0 255>;
		50	interrupts = <16 2 0 0>;
		51
		52	pcie@0 {
		53	reg = <0 0 0 0 0>;
		54	#interrupt-cells = <1>;
		55	#size-cells = <2>;
		56	#address-cells = <3>;
		57	device_type = "pci";
		58	interrupts = <16 2 0 0>;
		59	interrupt-map-mask = <0xf800 0 0 7>;
		60
		61	interrupt-map = <
		62	/* IDSEL 0x0 */
		63	0000 0x0 0x0 0x1 &mpic 0x0 0x2 0x0 0x0
		64	0000 0x0 0x0 0x2 &mpic 0x1 0x2 0x0 0x0
		65	0000 0x0 0x0 0x3 &mpic 0x2 0x2 0x0 0x0
		66	0000 0x0 0x0 0x4 &mpic 0x3 0x2 0x0 0x0
		67	>;
		68	};
		69	};
		70
43	&soc {	71	&soc {
44	#address-cells = <1>;	72	#address-cells = <1>;
45	#size-cells = <1>;	73	#size-cells = <1>;


diff --git a/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi index 301a9dba5790..90f7949fe312 100644 --- a/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
@@ -45,6 +45,7 @@
45	serial0 = &serial0;	45	serial0 = &serial0;
46	ethernet0 = &enet0;	46	ethernet0 = &enet0;
47	ethernet1 = &enet1;	47	ethernet1 = &enet1;
		48	pci0 = &pci0;
48	};	49	};
49		50
50	cpus {	51	cpus {


diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi index 0f0ced69835a..14b629505038 100644 --- a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
@@ -215,3 +215,19 @@
215	phy-connection-type = "sgmii";	215	phy-connection-type = "sgmii";
216	};	216	};
217	};	217	};
		218
		219	&pci0 {
		220	pcie@0 {
		221	interrupt-map = <
		222	/* IDSEL 0x0 */
		223	/*
		224	*irq[4:5] are active-high
		225	*irq[6:7] are active-low
		226	*/
		227	0000 0x0 0x0 0x1 &mpic 0x4 0x2 0x0 0x0
		228	0000 0x0 0x0 0x2 &mpic 0x5 0x2 0x0 0x0
		229	0000 0x0 0x0 0x3 &mpic 0x6 0x1 0x0 0x0
		230	0000 0x0 0x0 0x4 &mpic 0x7 0x1 0x0 0x0
		231	>;
		232	};
		233	};


diff --git a/arch/powerpc/boot/dts/fsl/t1023rdb.dts b/arch/powerpc/boot/dts/fsl/t1023rdb.dts index 2b2fff4a12a2..6bd842beb1dc 100644 --- a/arch/powerpc/boot/dts/fsl/t1023rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
@@ -159,4 +159,4 @@
159	};	159	};
160	};	160	};
161		161
162	/include/ "t1023si-post.dtsi"	162	#include "t1023si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi index 518ddaa8da2d..99e421df79d4 100644 --- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -32,6 +32,8 @@
32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33	*/	33	*/
34		34
		35	#include <dt-bindings/thermal/thermal.h>
		36
35	&ifc {	37	&ifc {
36	#address-cells = <2>;	38	#address-cells = <2>;
37	#size-cells = <1>;	39	#size-cells = <1>;
@@ -275,6 +277,90 @@
275	reg = <0xea000 0x4000>;	277	reg = <0xea000 0x4000>;
276	};	278	};
277		279
		280	tmu: tmu@f0000 {
		281	compatible = "fsl,qoriq-tmu";
		282	reg = <0xf0000 0x1000>;
		283	interrupts = <18 2 0 0>;
		284	fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x30061>;
		285	fsl,tmu-calibration = <0x00000000 0x0000000f
		286	0x00000001 0x00000017
		287	0x00000002 0x0000001e
		288	0x00000003 0x00000026
		289	0x00000004 0x0000002e
		290	0x00000005 0x00000035
		291	0x00000006 0x0000003d
		292	0x00000007 0x00000044
		293	0x00000008 0x0000004c
		294	0x00000009 0x00000053
		295	0x0000000a 0x0000005b
		296	0x0000000b 0x00000064
		297
		298	0x00010000 0x00000011
		299	0x00010001 0x0000001c
		300	0x00010002 0x00000024
		301	0x00010003 0x0000002b
		302	0x00010004 0x00000034
		303	0x00010005 0x00000039
		304	0x00010006 0x00000042
		305	0x00010007 0x0000004c
		306	0x00010008 0x00000051
		307	0x00010009 0x0000005a
		308	0x0001000a 0x00000063
		309
		310	0x00020000 0x00000013
		311	0x00020001 0x00000019
		312	0x00020002 0x00000024
		313	0x00020003 0x0000002c
		314	0x00020004 0x00000035
		315	0x00020005 0x0000003d
		316	0x00020006 0x00000046
		317	0x00020007 0x00000050
		318	0x00020008 0x00000059
		319
		320	0x00030000 0x00000002
		321	0x00030001 0x0000000d
		322	0x00030002 0x00000019
		323	0x00030003 0x00000024>;
		324	#thermal-sensor-cells = <0>;
		325	};
		326
		327	thermal-zones {
		328	cpu_thermal: cpu-thermal {
		329	polling-delay-passive = <1000>;
		330	polling-delay = <5000>;
		331
		332	thermal-sensors = <&tmu>;
		333
		334	trips {
		335	cpu_alert: cpu-alert {
		336	temperature = <85000>;
		337	hysteresis = <2000>;
		338	type = "passive";
		339	};
		340	cpu_crit: cpu-crit {
		341	temperature = <95000>;
		342	hysteresis = <2000>;
		343	type = "critical";
		344	};
		345	};
		346
		347	cooling-maps {
		348	map0 {
		349	trip = <&cpu_alert>;
		350	cooling-device =
		351	<&cpu0 THERMAL_NO_LIMIT
		352	THERMAL_NO_LIMIT>;
		353	};
		354	map1 {
		355	trip = <&cpu_alert>;
		356	cooling-device =
		357	<&cpu1 THERMAL_NO_LIMIT
		358	THERMAL_NO_LIMIT>;
		359	};
		360	};
		361	};
		362	};
		363
278	scfg: global-utilities@fc000 {	364	scfg: global-utilities@fc000 {
279	compatible = "fsl,t1023-scfg";	365	compatible = "fsl,t1023-scfg";
280	reg = <0xfc000 0x1000>;	366	reg = <0xfc000 0x1000>;


diff --git a/arch/powerpc/boot/dts/fsl/t1024qds.dts b/arch/powerpc/boot/dts/fsl/t1024qds.dts index 43cd5b50cd0a..6a3581b8e1f8 100644 --- a/arch/powerpc/boot/dts/fsl/t1024qds.dts +++ b/arch/powerpc/boot/dts/fsl/t1024qds.dts
@@ -248,4 +248,4 @@
248	};	248	};
249	};	249	};
250		250
251	/include/ "t1024si-post.dtsi"	251	#include "t1024si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1024rdb.dts b/arch/powerpc/boot/dts/fsl/t1024rdb.dts index 429d8c73650a..0ccc7d03335e 100644 --- a/arch/powerpc/boot/dts/fsl/t1024rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
@@ -188,4 +188,4 @@
188	};	188	};
189	};	189	};
190		190
191	/include/ "t1024si-post.dtsi"	191	#include "t1024si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi index 95e3af8d768e..bb480346a58d 100644 --- a/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1024si-post.dtsi
@@ -32,7 +32,7 @@
32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33	*/	33	*/
34		34
35	/include/ "t1023si-post.dtsi"	35	#include "t1023si-post.dtsi"
36		36
37	/ {	37	/ {
38	aliases {	38	aliases {


diff --git a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi index 3e1528abf3f4..9d08a363bab3 100644 --- a/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
@@ -76,6 +76,7 @@
76	reg = <0>;	76	reg = <0>;
77	clocks = <&mux0>;	77	clocks = <&mux0>;
78	next-level-cache = <&L2_1>;	78	next-level-cache = <&L2_1>;
		79	#cooling-cells = <2>;
79	L2_1: l2-cache {	80	L2_1: l2-cache {
80	next-level-cache = <&cpc>;	81	next-level-cache = <&cpc>;
81	};	82	};
@@ -85,6 +86,7 @@
85	reg = <1>;	86	reg = <1>;
86	clocks = <&mux1>;	87	clocks = <&mux1>;
87	next-level-cache = <&L2_2>;	88	next-level-cache = <&L2_2>;
		89	#cooling-cells = <2>;
88	L2_2: l2-cache {	90	L2_2: l2-cache {
89	next-level-cache = <&cpc>;	91	next-level-cache = <&cpc>;
90	};	92	};


diff --git a/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts b/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts index 681746efd31d..fb6bc02ebb60 100644 --- a/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
@@ -43,4 +43,4 @@
43	interrupt-parent = <&mpic>;	43	interrupt-parent = <&mpic>;
44	};	44	};
45		45
46	/include/ "t1040si-post.dtsi"	46	#include "t1040si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1040qds.dts b/arch/powerpc/boot/dts/fsl/t1040qds.dts index 4d298659468c..5f76edc7838c 100644 --- a/arch/powerpc/boot/dts/fsl/t1040qds.dts +++ b/arch/powerpc/boot/dts/fsl/t1040qds.dts
@@ -43,4 +43,4 @@
43	interrupt-parent = <&mpic>;	43	interrupt-parent = <&mpic>;
44	};	44	};
45		45
46	/include/ "t1040si-post.dtsi"	46	#include "t1040si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts index 8f9e65b47515..cf194154bbdc 100644 --- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -45,4 +45,4 @@
45	};	45	};
46	};	46	};
47		47
48	/include/ "t1040si-post.dtsi"	48	#include "t1040si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi index d30b3de1cfc5..e0f4da554774 100644 --- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -32,6 +32,8 @@
32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33	*/	33	*/
34		34
		35	#include <dt-bindings/thermal/thermal.h>
		36
35	&bman_fbpr {	37	&bman_fbpr {
36	compatible = "fsl,bman-fbpr";	38	compatible = "fsl,bman-fbpr";
37	alloc-ranges = <0 0 0x10000 0>;	39	alloc-ranges = <0 0 0x10000 0>;
@@ -484,6 +486,98 @@
484	reg = <0xea000 0x4000>;	486	reg = <0xea000 0x4000>;
485	};	487	};
486		488
		489	tmu: tmu@f0000 {
		490	compatible = "fsl,qoriq-tmu";
		491	reg = <0xf0000 0x1000>;
		492	interrupts = <18 2 0 0>;
		493	fsl,tmu-range = <0xa0000 0x90026 0x8004a 0x1006a>;
		494	fsl,tmu-calibration = <0x00000000 0x00000025
		495	0x00000001 0x00000028
		496	0x00000002 0x0000002d
		497	0x00000003 0x00000031
		498	0x00000004 0x00000036
		499	0x00000005 0x0000003a
		500	0x00000006 0x00000040
		501	0x00000007 0x00000044
		502	0x00000008 0x0000004a
		503	0x00000009 0x0000004f
		504	0x0000000a 0x00000054
		505
		506	0x00010000 0x0000000d
		507	0x00010001 0x00000013
		508	0x00010002 0x00000019
		509	0x00010003 0x0000001f
		510	0x00010004 0x00000025
		511	0x00010005 0x0000002d
		512	0x00010006 0x00000033
		513	0x00010007 0x00000043
		514	0x00010008 0x0000004b
		515	0x00010009 0x00000053
		516
		517	0x00020000 0x00000010
		518	0x00020001 0x00000017
		519	0x00020002 0x0000001f
		520	0x00020003 0x00000029
		521	0x00020004 0x00000031
		522	0x00020005 0x0000003c
		523	0x00020006 0x00000042
		524	0x00020007 0x0000004d
		525	0x00020008 0x00000056
		526
		527	0x00030000 0x00000012
		528	0x00030001 0x0000001d>;
		529	#thermal-sensor-cells = <0>;
		530	};
		531
		532	thermal-zones {
		533	cpu_thermal: cpu-thermal {
		534	polling-delay-passive = <1000>;
		535	polling-delay = <5000>;
		536
		537	thermal-sensors = <&tmu>;
		538
		539	trips {
		540	cpu_alert: cpu-alert {
		541	temperature = <85000>;
		542	hysteresis = <2000>;
		543	type = "passive";
		544	};
		545	cpu_crit: cpu-crit {
		546	temperature = <95000>;
		547	hysteresis = <2000>;
		548	type = "critical";
		549	};
		550	};
		551
		552	cooling-maps {
		553	map0 {
		554	trip = <&cpu_alert>;
		555	cooling-device =
		556	<&cpu0 THERMAL_NO_LIMIT
		557	THERMAL_NO_LIMIT>;
		558	};
		559	map1 {
		560	trip = <&cpu_alert>;
		561	cooling-device =
		562	<&cpu1 THERMAL_NO_LIMIT
		563	THERMAL_NO_LIMIT>;
		564	};
		565	map2 {
		566	trip = <&cpu_alert>;
		567	cooling-device =
		568	<&cpu2 THERMAL_NO_LIMIT
		569	THERMAL_NO_LIMIT>;
		570	};
		571	map3 {
		572	trip = <&cpu_alert>;
		573	cooling-device =
		574	<&cpu3 THERMAL_NO_LIMIT
		575	THERMAL_NO_LIMIT>;
		576	};
		577	};
		578	};
		579	};
		580
487	scfg: global-utilities@fc000 {	581	scfg: global-utilities@fc000 {
488	compatible = "fsl,t1040-scfg";	582	compatible = "fsl,t1040-scfg";
489	reg = <0xfc000 0x1000>;	583	reg = <0xfc000 0x1000>;


diff --git a/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts b/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts index b245b31b8279..2a5a90dd272e 100644 --- a/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
@@ -50,4 +50,4 @@
50	};	50	};
51	};	51	};
52		52
53	/include/ "t1040si-post.dtsi"	53	#include "t1042si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1042qds.dts b/arch/powerpc/boot/dts/fsl/t1042qds.dts index 4ab9bbe7c5c5..90a4a73bb905 100644 --- a/arch/powerpc/boot/dts/fsl/t1042qds.dts +++ b/arch/powerpc/boot/dts/fsl/t1042qds.dts
@@ -43,4 +43,4 @@
43	interrupt-parent = <&mpic>;	43	interrupt-parent = <&mpic>;
44	};	44	};
45		45
46	/include/ "t1042si-post.dtsi"	46	#include "t1042si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1042rdb.dts b/arch/powerpc/boot/dts/fsl/t1042rdb.dts index 67af56bc5ee9..8d908e795e4d 100644 --- a/arch/powerpc/boot/dts/fsl/t1042rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1042rdb.dts
@@ -45,4 +45,4 @@
45	};	45	};
46	};	46	};
47		47
48	/include/ "t1042si-post.dtsi"	48	#include "t1042si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts b/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts index 2f67677530a4..98c001019d6a 100644 --- a/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts +++ b/arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
@@ -54,4 +54,4 @@
54	};	54	};
55	};	55	};
56		56
57	/include/ "t1042si-post.dtsi"	57	#include "t1042si-post.dtsi"


diff --git a/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi index 319b74f29724..a5544f93689c 100644 --- a/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
@@ -32,6 +32,6 @@
32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	32	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33	*/	33	*/
34		34
35	/include/ "t1040si-post.dtsi"	35	#include "t1040si-post.dtsi"
36		36
37	/* Place holder for ethernet related device tree nodes */	37	/* Place holder for ethernet related device tree nodes */


diff --git a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi index fcfa38ae5e02..6db0ee8b1384 100644 --- a/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
@@ -76,6 +76,7 @@
76	reg = <0>;	76	reg = <0>;
77	clocks = <&mux0>;	77	clocks = <&mux0>;
78	next-level-cache = <&L2_1>;	78	next-level-cache = <&L2_1>;
		79	#cooling-cells = <2>;
79	L2_1: l2-cache {	80	L2_1: l2-cache {
80	next-level-cache = <&cpc>;	81	next-level-cache = <&cpc>;
81	};	82	};
@@ -85,6 +86,7 @@
85	reg = <1>;	86	reg = <1>;
86	clocks = <&mux1>;	87	clocks = <&mux1>;
87	next-level-cache = <&L2_2>;	88	next-level-cache = <&L2_2>;
		89	#cooling-cells = <2>;
88	L2_2: l2-cache {	90	L2_2: l2-cache {
89	next-level-cache = <&cpc>;	91	next-level-cache = <&cpc>;
90	};	92	};
@@ -94,6 +96,7 @@
94	reg = <2>;	96	reg = <2>;
95	clocks = <&mux2>;	97	clocks = <&mux2>;
96	next-level-cache = <&L2_3>;	98	next-level-cache = <&L2_3>;
		99	#cooling-cells = <2>;
97	L2_3: l2-cache {	100	L2_3: l2-cache {
98	next-level-cache = <&cpc>;	101	next-level-cache = <&cpc>;
99	};	102	};
@@ -103,6 +106,7 @@
103	reg = <3>;	106	reg = <3>;
104	clocks = <&mux3>;	107	clocks = <&mux3>;
105	next-level-cache = <&L2_4>;	108	next-level-cache = <&L2_4>;
		109	#cooling-cells = <2>;
106	L2_4: l2-cache {	110	L2_4: l2-cache {
107	next-level-cache = <&cpc>;	111	next-level-cache = <&cpc>;
108	};	112	};


diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index ceaa75d5a684..6a19fcef5596 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper
@@ -154,7 +154,7 @@ if [ -z "$kernel" ]; then
154	kernel=vmlinux	154	kernel=vmlinux
155	fi	155	fi
156		156
157	elfformat="`${CROSS}objdump -p "$kernel" \| grep 'file format' \| awk '{print $4}'`"	157	LANG=C elfformat="`${CROSS}objdump -p "$kernel" \| grep 'file format' \| awk '{print $4}'`"
158	case "$elfformat" in	158	case "$elfformat" in
159	elf64-powerpcle) format=elf64lppc ;;	159	elf64-powerpcle) format=elf64lppc ;;
160	elf64-powerpc) format=elf32ppc ;;	160	elf64-powerpc) format=elf32ppc ;;