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

Commit 6624b35d authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch 'master' into 83xx

parents d71a1dc6 fc7900bb

Documentation/powerpc/booting-without-of.txt

+1 −8
Original line number Diff line number Diff line
@@ -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
@@ -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
@@ -842,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/configs/ppc64_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

CONFIG_BLK_DEV_SL82C105=y

# CONFIG_BLK_DEV_SL82C105 is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y 
# CONFIG_PATA_SIL680 is not set

# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_WINBOND=y



#

# Multi-device support (RAID and LVM)

arch/powerpc/configs/pseries_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

CONFIG_BLK_DEV_SL82C105=y

# CONFIG_BLK_DEV_SL82C105 is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -628,7 +628,7 @@ CONFIG_ATA=y 
# CONFIG_PATA_SIL680 is not set

# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_WINBOND=y



#

# Multi-device support (RAID and LVM)

arch/powerpc/kernel/prom_parse.c

+40 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/pci_regs.h>

#include <linux/module.h>

#include <linux/ioport.h>

#include <linux/etherdevice.h>

#include <asm/prom.h>

#include <asm/pci-bridge.h>
@@ -1003,3 +1004,42 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq 
	return res;

}

EXPORT_SYMBOL_GPL(of_irq_map_one);



/**

 * Search the device tree for the best MAC address to use.  'mac-address' is

 * checked first, because that is supposed to contain to "most recent" MAC

 * address. If that isn't set, then 'local-mac-address' is checked next,

 * because that is the default address.  If that isn't set, then the obsolete

 * 'address' is checked, just in case we're using an old device tree.

 *

 * Note that the 'address' property is supposed to contain a virtual address of

 * the register set, but some DTS files have redefined that property to be the

 * MAC address.

 *

 * All-zero MAC addresses are rejected, because those could be properties that

 * exist in the device tree, but were not set by U-Boot.  For example, the

 * DTS could define 'mac-address' and 'local-mac-address', with zero MAC

 * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In

 * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists

 * but is all zeros.

*/

const void *of_get_mac_address(struct device_node *np)

{

	struct property *pp;



	pp = of_find_property(np, "mac-address", NULL);

	if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))

		return pp->value;



	pp = of_find_property(np, "local-mac-address", NULL);

	if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))

		return pp->value;



	pp = of_find_property(np, "address", NULL);

	if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))

		return pp->value;



	return NULL;

}

EXPORT_SYMBOL(of_get_mac_address);

arch/powerpc/platforms/pseries/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ endif 


obj-y			:= pci.o lpar.o hvCall.o nvram.o reconfig.o \

			   setup.o iommu.o ras.o rtasd.o pci_dlpar.o \

			   firmware.o

			   firmware.o power.o

obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_XICS)	+= xics.o

obj-$(CONFIG_SCANLOG)	+= scanlog.o