Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: fix lite5200 ethernet phy address powerpc/5200: Fix build error in sound code. powerpc/5200: fix oops during going to standby powerpc/5200: add lite5200 onboard I2C eeprom and flash maintainers: Add git trees for SPI and device tree of: Drop properties with "/" in their name
This commit is contained in:
commit
24eb90abdd
|
@ -4212,6 +4212,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
|
||||||
M: Grant Likely <grant.likely@secretlab.ca>
|
M: Grant Likely <grant.likely@secretlab.ca>
|
||||||
L: devicetree-discuss@lists.ozlabs.org
|
L: devicetree-discuss@lists.ozlabs.org
|
||||||
W: http://fdt.secretlab.ca
|
W: http://fdt.secretlab.ca
|
||||||
|
T: git git://git.secretlab.ca/git/linux-2.6.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/of
|
F: drivers/of
|
||||||
F: include/linux/of*.h
|
F: include/linux/of*.h
|
||||||
|
@ -5384,6 +5385,7 @@ M: David Brownell <dbrownell@users.sourceforge.net>
|
||||||
M: Grant Likely <grant.likely@secretlab.ca>
|
M: Grant Likely <grant.likely@secretlab.ca>
|
||||||
L: spi-devel-general@lists.sourceforge.net
|
L: spi-devel-general@lists.sourceforge.net
|
||||||
Q: http://patchwork.kernel.org/project/spi-devel-general/list/
|
Q: http://patchwork.kernel.org/project/spi-devel-general/list/
|
||||||
|
T: git git://git.secretlab.ca/git/linux-2.6.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/spi/
|
F: Documentation/spi/
|
||||||
F: drivers/spi/
|
F: drivers/spi/
|
||||||
|
|
|
@ -134,12 +134,16 @@
|
||||||
compatible = "fsl,mpc5200-gpio";
|
compatible = "fsl,mpc5200-gpio";
|
||||||
reg = <0xb00 0x40>;
|
reg = <0xb00 0x40>;
|
||||||
interrupts = <1 7 0>;
|
interrupts = <1 7 0>;
|
||||||
|
gpio-controller;
|
||||||
|
#gpio-cells = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio@c00 {
|
gpio@c00 {
|
||||||
compatible = "fsl,mpc5200-gpio-wkup";
|
compatible = "fsl,mpc5200-gpio-wkup";
|
||||||
reg = <0xc00 0x40>;
|
reg = <0xc00 0x40>;
|
||||||
interrupts = <1 8 0 0 3 0>;
|
interrupts = <1 8 0 0 3 0>;
|
||||||
|
gpio-controller;
|
||||||
|
#gpio-cells = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
spi@f00 {
|
spi@f00 {
|
||||||
|
@ -230,8 +234,8 @@
|
||||||
reg = <0x3000 0x400>; // fec range, since we need to setup fec interrupts
|
reg = <0x3000 0x400>; // fec range, since we need to setup fec interrupts
|
||||||
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
|
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
|
||||||
|
|
||||||
phy0: ethernet-phy@1 {
|
phy0: ethernet-phy@0 {
|
||||||
reg = <1>;
|
reg = <0>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -255,7 +259,13 @@
|
||||||
compatible = "fsl,mpc5200-i2c","fsl-i2c";
|
compatible = "fsl,mpc5200-i2c","fsl-i2c";
|
||||||
reg = <0x3d40 0x40>;
|
reg = <0x3d40 0x40>;
|
||||||
interrupts = <2 16 0>;
|
interrupts = <2 16 0>;
|
||||||
|
|
||||||
|
eeprom@50 {
|
||||||
|
compatible = "atmel,24c02";
|
||||||
|
reg = <0x50>;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
sram@8000 {
|
sram@8000 {
|
||||||
compatible = "fsl,mpc5200-sram";
|
compatible = "fsl,mpc5200-sram";
|
||||||
reg = <0x8000 0x4000>;
|
reg = <0x8000 0x4000>;
|
||||||
|
@ -281,4 +291,18 @@
|
||||||
0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
|
0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
|
||||||
0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
|
0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
localbus {
|
||||||
|
compatible = "fsl,mpc5200-lpb","simple-bus";
|
||||||
|
#address-cells = <2>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
ranges = <0 0 0xff000000 0x01000000>;
|
||||||
|
|
||||||
|
flash@0,0 {
|
||||||
|
compatible = "amd,am29lv652d", "cfi-flash";
|
||||||
|
reg = <0 0 0x01000000>;
|
||||||
|
bank-width = <1>;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -259,6 +259,11 @@
|
||||||
compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
|
compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
|
||||||
reg = <0x3d40 0x40>;
|
reg = <0x3d40 0x40>;
|
||||||
interrupts = <2 16 0>;
|
interrupts = <2 16 0>;
|
||||||
|
|
||||||
|
eeprom@50 {
|
||||||
|
compatible = "atmel,24c02";
|
||||||
|
reg = <0x50>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sram@8000 {
|
sram@8000 {
|
||||||
|
|
|
@ -64,10 +64,19 @@ int mpc52xx_pm_prepare(void)
|
||||||
{ .type = "builtin", .compatible = "mpc5200", }, /* efika */
|
{ .type = "builtin", .compatible = "mpc5200", }, /* efika */
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
struct resource res;
|
||||||
|
|
||||||
/* map the whole register space */
|
/* map the whole register space */
|
||||||
np = of_find_matching_node(NULL, immr_ids);
|
np = of_find_matching_node(NULL, immr_ids);
|
||||||
mbar = of_iomap(np, 0);
|
|
||||||
|
if (of_address_to_resource(np, 0, &res)) {
|
||||||
|
pr_err("mpc52xx_pm_prepare(): could not get IMMR address\n");
|
||||||
|
of_node_put(np);
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
|
||||||
|
mbar = ioremap(res.start, 0xc000); /* we should map whole region including SRAM */
|
||||||
|
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
if (!mbar) {
|
if (!mbar) {
|
||||||
pr_err("mpc52xx_pm_prepare(): could not map registers\n");
|
pr_err("mpc52xx_pm_prepare(): could not map registers\n");
|
||||||
|
|
|
@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np,
|
||||||
for (pp = np->properties; pp != NULL; pp = pp->next) {
|
for (pp = np->properties; pp != NULL; pp = pp->next) {
|
||||||
p = pp->name;
|
p = pp->name;
|
||||||
|
|
||||||
|
if (strchr(p, '/'))
|
||||||
|
continue;
|
||||||
|
|
||||||
if (duplicate_name(de, p))
|
if (duplicate_name(de, p))
|
||||||
p = fixup_name(np, de, p);
|
p = fixup_name(np, de, p);
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ struct psc_dma {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Utility for retrieving psc_dma_stream structure from a substream */
|
/* Utility for retrieving psc_dma_stream structure from a substream */
|
||||||
inline struct psc_dma_stream *
|
static inline struct psc_dma_stream *
|
||||||
to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
|
to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
|
||||||
{
|
{
|
||||||
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
|
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
|
||||||
|
|
Loading…
Reference in New Issue