Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c56f466 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (34 commits)
  [POWERPC] 86xx: Cleaned up platform dts files
  [POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
  [POWERPC] 85xx: Cleaning up machine probing
  [POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
  [POWERPC] 85xx: Cleaned up platform dts files
  [POWERPC] 83xx: Renamed MPC8323 MDS dts and defconfig to match other boards
  [POWERPC] 83xx: Updated and renamed MPC8360PB to MPC836x MDS
  [POWERPC] 83xx: Use of_platform_bus_probe to setup QE devices
  [POWERPC] 83xx: use default value of loops_per_jiffy
  [POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
  [POWERPC] 83xx: Cleaning up machine probing and board initcalls
  [POWERPC] Dispose irq mapping when done in mpc52xx_serial.c
  [POWERPC] 86xx: Add missing of_node_put() in mpc86xx_hpcn_init_irq().
  [POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
  [POWERPC] pseries: Enabling auto poweron after power is restored.
  [POWERPC] use winbond libata instead of ide driver for pseries CD drives
  [POWERPC] powerpc: remove references to the obsolete linux,platform property
  [POWERPC] add of_get_mac_address and update fsl_soc.c to use it
  [POWERPC] 83xx: Cleaned up 83xx platform dts files
  [POWERPC] Fix bug with early ioremap and 64k pages
  ...
parents dd397a6d c2944612

Documentation/powerpc/booting-without-of.txt

+3 −11
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ looks like in practice. 
      |   |- device_type = "cpu"

      |   |- reg = <0>

      |   |- clock-frequency = <5f5e1000>

      |   |- linux,boot-cpu

      |   |- 64-bit

      |   |- linux,phandle = <2>

      |

      o memory@0
@@ -509,7 +509,6 @@ looks like in practice. 
      o chosen

        |- name = "chosen"

        |- bootargs = "root=/dev/sda2"

        |- linux,platform = <00000600>

        |- linux,phandle = <4>



This tree is almost a minimal tree. It pretty much contains the
@@ -519,7 +518,7 @@ physical memory layout. It also includes misc information passed 
through /chosen, like in this example, the platform type (mandatory)

and the kernel command line arguments (optional).



The /cpus/PowerPC,970@0/linux,boot-cpu property is an example of a

The /cpus/PowerPC,970@0/64-bit property is an example of a

property without a value. All other properties have a value. The

significance of the #address-cells and #size-cells properties will be

explained in chapter IV which defines precisely the required nodes and
@@ -733,8 +732,7 @@ address which can extend beyond that limit. 
      that typically get driven by the same platform code in the

      kernel, you would use a different "model" property but put a

      value in "compatible". The kernel doesn't directly use that

      value (see /chosen/linux,platform for how the kernel chooses a

      platform type) but it is generally useful.

      value but it is generally useful.



  The root node is also generally where you add additional properties

  specific to your board like the serial number if any, that sort of
@@ -778,7 +776,6 @@ address which can extend beyond that limit. 
      bytes

    - d-cache-size : one cell, size of L1 data cache in bytes

    - i-cache-size : one cell, size of L1 instruction cache in bytes

    - linux, boot-cpu : Should be defined if this cpu is the boot cpu.



  Recommended properties:
@@ -843,11 +840,6 @@ address which can extend beyond that limit. 
  the prom_init() trampoline when booting with an OF client interface,

  but that you have to provide yourself when using the flattened format.



  Required properties:



    - linux,platform : This is your platform number as assigned by the

      architecture maintainers



  Recommended properties:



    - bootargs : This zero-terminated string is passed as the kernel

arch/powerpc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -620,6 +620,15 @@ config RTAS_FLASH 
	tristate "Firmware flash interface"

	depends on PPC64 && RTAS_PROC



config PPC_PMI

	tristate "Support for PMI"

	depends PPC_IBM_CELL_BLADE

	help

	  PMI (Platform Management Interrupt) is a way to

	  communicate with the BMC (Baseboard Mangement Controller).

	  It is used in some IBM Cell blades.

	default m



config MMIO_NVRAM

	bool

	default n

arch/powerpc/boot/dts/kuroboxHD.dts

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 


		PowerPC,603e { /* Really 8241 */

			linux,phandle = <2100>;

			linux,boot-cpu;

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <bebc200>;	/* Fixed by bootwrapper */

arch/powerpc/boot/dts/kuroboxHG.dts

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 


		PowerPC,603e { /* Really 8241 */

			linux,phandle = <2100>;

			linux,boot-cpu;

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <fdad680>;	/* Fixed by bootwrapper */

arch/powerpc/boot/dts/mpc7448hpc2.dts

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
			bus-frequency = <0>;		// From U-Boot

			32-bit;

			linux,phandle = <201>;

			linux,boot-cpu;

		};

	};