redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[POWERPC] Whitespace cleanup in arch/powerpc 

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
hifive-unleashed-5.1
Scott Wood 2007-08-21 02:36:19 +10:00 committed by Paul Mackerras
parent 16a15a30f8
commit 4b218e9bb2
5 changed files with 222 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/boot/dts/mpc8272ads.dts
View File

@ -41,6 +41,7 @@
built-in; built-in;
device_type = "pci-pic"; device_type = "pci-pic";
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <00000000 4000000 f4500000 00000020>; reg = <00000000 4000000 f4500000 00000020>;
@ -66,6 +67,7 @@
reg = <0 0>; reg = <0 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
phy0:ethernet-phy@0 { phy0:ethernet-phy@0 {
interrupt-parent = <&Cpm_pic>; interrupt-parent = <&Cpm_pic>;
interrupts = <17 4>; interrupts = <17 4>;
@ -73,6 +75,7 @@
bitbang = [ 12 12 13 02 02 01 ]; bitbang = [ 12 12 13 02 02 01 ];
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
phy1:ethernet-phy@1 { phy1:ethernet-phy@1 {
interrupt-parent = <&Cpm_pic>; interrupt-parent = <&Cpm_pic>;
interrupts = <17 4>; interrupts = <17 4>;
@ -151,8 +154,8 @@
rx-clock = <4>; rx-clock = <4>;
tx-clock = <4>; tx-clock = <4>;
}; };
}; };
cpm_pic:interrupt-controller@10c00 { cpm_pic:interrupt-controller@10c00 {
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
@ -162,6 +165,7 @@
device_type = "cpm-pic"; device_type = "cpm-pic";
compatible = "CPM2"; compatible = "CPM2";
}; };
pci@0500 { pci@0500 {
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
@ -172,7 +176,6 @@
clock-frequency = <3f940aa>; clock-frequency = <3f940aa>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x16 */ /* IDSEL 0x16 */
b000 0 0 1 f8200000 40 8 b000 0 0 1 f8200000 40 8
b000 0 0 2 f8200000 41 8 b000 0 0 2 f8200000 41 8
@ -211,6 +214,5 @@
/* desc mask is for rev1.x, we need runtime fixup for >=2.x */ /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
descriptor-types-mask = <01010ebf>; descriptor-types-mask = <01010ebf>;
}; };
}; };
}; };

4
arch/powerpc/sysdev/commproc.c
View File

@ -181,7 +181,7 @@ unsigned int cpm_pic_init(void)
printk(KERN_ERR "CPM PIC init: can not find cpm node\n"); printk(KERN_ERR "CPM PIC init: can not find cpm node\n");
goto end; goto end;
} }
eirq= irq_of_parse_and_map(np, 0); eirq = irq_of_parse_and_map(np, 0);
if (eirq == NO_IRQ) if (eirq == NO_IRQ)
goto end; goto end;
@ -307,7 +307,7 @@ static rh_block_t cpm_boot_dpmem_rh_block[16];
static rh_info_t cpm_dpmem_info; static rh_info_t cpm_dpmem_info;
#define CPM_DPMEM_ALIGNMENT 8 #define CPM_DPMEM_ALIGNMENT 8
static u8* dpram_vbase; static u8 *dpram_vbase;
static uint dpram_pbase; static uint dpram_pbase;
void m8xx_cpm_dpinit(void) void m8xx_cpm_dpinit(void)

2
arch/powerpc/sysdev/cpm2_common.c
View File

@ -201,7 +201,7 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
} }
if (mode == CPM_CLK_RX) if (mode == CPM_CLK_RX)
shift +=3; shift += 3;
for (i=0; i<24; i++) { for (i=0; i<24; i++) {
if (clk_map[i][0] == target && clk_map[i][1] == clock) { if (clk_map[i][0] == target && clk_map[i][1] == clock) {