Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits) [POWERPC] Cell IOMMU fixed mapping support [POWERPC] Split out the ioid fetching/checking logic [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup() [POWERPC] Split cell_iommu_setup_hardware() into two parts [POWERPC] Split out the logic that allocates struct iommus [POWERPC] Allocate the hash table under 1G on cell [POWERPC] Add set_dma_ops() to match get_dma_ops() [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format. [POWERPC] 85xx: Only invalidate TLB0 and TLB1 [POWERPC] 83xx: Fix typo in mpc837x compatible entries [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall [POWERPC] 83xx: rework platform Kconfig [POWERPC] 85xx: rework platform Kconfig [POWERPC] 86xx: Remove unused IRQ defines [POWERPC] QE: Explicitly set address-cells and size cells for muram [POWERPC] Convert StorCenter DTS file to /dts-v1/ format. [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format. [PPC] Remove 85xx from arch/ppc [PPC] Remove 83xx from arch/ppc ...
This commit is contained in:
Linus Torvalds
@@ -17,6 +17,7 @@
|
||||
*/
|
||||
#include <linux/types.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
||||
#include <asm/prom.h>
|
||||
|
||||
@@ -41,11 +42,20 @@ extern struct device_node *of_find_compatible_node(struct device_node *from,
|
||||
#define for_each_compatible_node(dn, type, compatible) \
|
||||
for (dn = of_find_compatible_node(NULL, type, compatible); dn; \
|
||||
dn = of_find_compatible_node(dn, type, compatible))
|
||||
extern struct device_node *of_find_matching_node(struct device_node *from,
|
||||
const struct of_device_id *matches);
|
||||
#define for_each_matching_node(dn, matches) \
|
||||
for (dn = of_find_matching_node(NULL, matches); dn; \
|
||||
dn = of_find_matching_node(dn, matches))
|
||||
extern struct device_node *of_find_node_by_path(const char *path);
|
||||
extern struct device_node *of_find_node_by_phandle(phandle handle);
|
||||
extern struct device_node *of_get_parent(const struct device_node *node);
|
||||
extern struct device_node *of_get_next_child(const struct device_node *node,
|
||||
struct device_node *prev);
|
||||
#define for_each_child_of_node(parent, child) \
|
||||
for (child = of_get_next_child(parent, NULL); child != NULL; \
|
||||
child = of_get_next_child(parent, child))
|
||||
|
||||
extern struct property *of_find_property(const struct device_node *np,
|
||||
const char *name,
|
||||
int *lenp);
|
||||
@@ -56,5 +66,7 @@ extern const void *of_get_property(const struct device_node *node,
|
||||
int *lenp);
|
||||
extern int of_n_addr_cells(struct device_node *np);
|
||||
extern int of_n_size_cells(struct device_node *np);
|
||||
extern const struct of_device_id *of_match_node(
|
||||
const struct of_device_id *matches, const struct device_node *node);
|
||||
|
||||
#endif /* _LINUX_OF_H */
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
|
||||
#define to_of_device(d) container_of(d, struct of_device, dev)
|
||||
|
||||
extern const struct of_device_id *of_match_node(
|
||||
const struct of_device_id *matches, const struct device_node *node);
|
||||
extern const struct of_device_id *of_match_device(
|
||||
const struct of_device_id *matches, const struct of_device *dev);
|
||||
|
||||
|
||||
@@ -15,4 +15,13 @@ struct pata_platform_info {
|
||||
unsigned int irq_flags;
|
||||
};
|
||||
|
||||
extern int __devinit __pata_platform_probe(struct device *dev,
|
||||
struct resource *io_res,
|
||||
struct resource *ctl_res,
|
||||
struct resource *irq_res,
|
||||
unsigned int ioport_shift,
|
||||
int __pio_mask);
|
||||
|
||||
extern int __devexit __pata_platform_remove(struct device *dev);
|
||||
|
||||
#endif /* __LINUX_PATA_PLATFORM_H */
|
||||
|
||||
+22
-29
@@ -1,38 +1,31 @@
|
||||
#ifndef __PHY_FIXED_H
|
||||
#define __PHY_FIXED_H
|
||||
|
||||
#define MII_REGS_NUM 29
|
||||
|
||||
/* max number of virtual phy stuff */
|
||||
#define MAX_PHY_AMNT 10
|
||||
/*
|
||||
The idea is to emulate normal phy behavior by responding with
|
||||
pre-defined values to mii BMCR read, so that read_status hook could
|
||||
take all the needed info.
|
||||
*/
|
||||
|
||||
struct fixed_phy_status {
|
||||
u8 link;
|
||||
u16 speed;
|
||||
u8 duplex;
|
||||
int link;
|
||||
int speed;
|
||||
int duplex;
|
||||
int pause;
|
||||
int asym_pause;
|
||||
};
|
||||
|
||||
/*-----------------------------------------------------------------------------
|
||||
* Private information hoder for mii_bus
|
||||
*-----------------------------------------------------------------------------*/
|
||||
struct fixed_info {
|
||||
u16 *regs;
|
||||
u8 regs_num;
|
||||
struct fixed_phy_status phy_status;
|
||||
struct phy_device *phydev; /* pointer to the container */
|
||||
/* link & speed cb */
|
||||
int (*link_update) (struct net_device *, struct fixed_phy_status *);
|
||||
#ifdef CONFIG_FIXED_PHY
|
||||
extern int fixed_phy_add(unsigned int irq, int phy_id,
|
||||
struct fixed_phy_status *status);
|
||||
#else
|
||||
static inline int fixed_phy_add(unsigned int irq, int phy_id,
|
||||
struct fixed_phy_status *status)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif /* CONFIG_FIXED_PHY */
|
||||
|
||||
};
|
||||
|
||||
|
||||
int fixed_mdio_set_link_update(struct phy_device *,
|
||||
int (*link_update) (struct net_device *, struct fixed_phy_status *));
|
||||
struct fixed_info *fixed_mdio_get_phydev (int phydev_ind);
|
||||
/*
|
||||
* This function issued only by fixed_phy-aware drivers, no need
|
||||
* protect it with #ifdef
|
||||
*/
|
||||
extern int fixed_phy_set_link_update(struct phy_device *phydev,
|
||||
int (*link_update)(struct net_device *,
|
||||
struct fixed_phy_status *));
|
||||
|
||||
#endif /* __PHY_FIXED_H */
|
||||
|
||||
+1
-35
@@ -159,41 +159,7 @@ extern void pmu_unlock(void);
|
||||
extern int pmu_present(void);
|
||||
extern int pmu_get_model(void);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
/*
|
||||
* Stuff for putting the powerbook to sleep and waking it again.
|
||||
*
|
||||
*/
|
||||
#include <linux/list.h>
|
||||
|
||||
struct pmu_sleep_notifier
|
||||
{
|
||||
void (*notifier_call)(struct pmu_sleep_notifier *self, int when);
|
||||
int priority;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
/* Code values for calling sleep/wakeup handlers
|
||||
*/
|
||||
#define PBOOK_SLEEP_REQUEST 1
|
||||
#define PBOOK_SLEEP_NOW 2
|
||||
#define PBOOK_WAKE 3
|
||||
|
||||
/* priority levels in notifiers */
|
||||
#define SLEEP_LEVEL_VIDEO 100 /* Video driver (first wake) */
|
||||
#define SLEEP_LEVEL_MEDIABAY 90 /* Media bay driver */
|
||||
#define SLEEP_LEVEL_BLOCK 80 /* IDE, SCSI */
|
||||
#define SLEEP_LEVEL_NET 70 /* bmac, gmac */
|
||||
#define SLEEP_LEVEL_MISC 60 /* Anything else */
|
||||
#define SLEEP_LEVEL_USERLAND 55 /* Reserved for apm_emu */
|
||||
#define SLEEP_LEVEL_ADB 50 /* ADB (async) */
|
||||
#define SLEEP_LEVEL_SOUND 40 /* Sound driver (blocking) */
|
||||
|
||||
/* special register notifier functions */
|
||||
int pmu_register_sleep_notifier(struct pmu_sleep_notifier* notifier);
|
||||
int pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* notifier);
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
extern void pmu_backlight_set_sleep(int sleep);
|
||||
|
||||
#define PMU_MAX_BATTERIES 2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user