Skip to content

Commit e2205a1

Browse files
torvaldstorvalds
committed
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Remove include/linux/harrier_defs.h powerpc: Do not ignore arch/powerpc/include powerpc: Delete completed "ppc removal" task from feature removal file powerpc/mm: Fix attribute confusion with htab_bolt_mapping() powerpc/pci: Don't keep ISA memory hole resources in the tree powerpc: Zero fill the return values of rtas argument buffer powerpc/4xx: Update defconfig files for 2.6.27-rc1 powerpc/44x: Incorrect NOR offset in Warp DTS powerpc/44x: Warp DTS changes for board updates powerpc/4xx: Cleanup Warp for i2c driver changes. powerpc/44x: Adjust warp-nand resource end address
2 parents a7ef6a4 + 13fa00a commit e2205a1

26 files changed

+2598
-1174
lines changed

‎Documentation/feature-removal-schedule.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,6 @@ Who: Tejun Heo <htejun@gmail.com>
205205

206206
---------------------------
207207

208-
What: The arch/ppc and include/asm-ppc directories
209-
When: Jun 2008
210-
Why: The arch/powerpc tree is the merged architecture for ppc32 and ppc64
211-
platforms. Currently there are efforts underway to port the remaining
212-
arch/ppc platforms to the merged tree. New submissions to the arch/ppc
213-
tree have been frozen with the 2.6.22 kernel release and that tree will
214-
remain in bug-fix only mode until its scheduled removal. Platforms
215-
that are not ported by June 2008 will be removed due to the lack of an
216-
interested maintainer.
217-
Who: linuxppc-dev@ozlabs.org
218-
219-
---------------------------
220-
221208
What: i386/x86_64 bzImage symlinks
222209
When: April 2010
223210

‎arch/powerpc/boot/dts/warp.dts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@
139139
interrupt-parent = <&UIC0>;
140140
};
141141

142+
fpga@2,2000 {
143+
compatible = "pika,fpga-sgl";
144+
reg = <0x00000002 0x00002000 0x00000200>;
145+
};
146+
142147
fpga@2,4000 {
143148
compatible = "pika,fpga-sd";
144149
reg = <0x00000002 0x00004000 0x00000A00>;
@@ -152,7 +157,7 @@
152157
#size-cells = <1>;
153158
partition@300000 {
154159
label = "fpga";
155-
reg = <0x0030000 0x00040000>;
160+
reg = <0x0300000 0x00040000>;
156161
};
157162
partition@340000 {
158163
label = "env";
@@ -181,7 +186,6 @@
181186
reg = <0xef600700 0x00000014>;
182187
interrupt-parent = <&UIC0>;
183188
interrupts = <0x2 0x4>;
184-
index = <0x0>;
185189
#address-cells = <1>;
186190
#size-cells = <0>;
187191

@@ -191,6 +195,12 @@
191195
interrupts = <0x19 0x8>;
192196
interrupt-parent = <&UIC0>;
193197
};
198+
199+
/* This will create 52 and 53 */
200+
at24@52 {
201+
compatible = "at,24c04";
202+
reg = <0x52>;
203+
};
194204
};
195205

196206
GPIO0: gpio@ef600b00 {
@@ -209,7 +219,13 @@
209219
led@31 {
210220
compatible = "linux,gpio-led";
211221
linux,name = ":green:";
212-
gpios = <&GPIO1 0x30 0>;
222+
gpios = <&GPIO1 31 0>;
223+
};
224+
225+
led@30 {
226+
compatible = "linux,gpio-led";
227+
linux,name = ":red:";
228+
gpios = <&GPIO1 30 0>;
213229
};
214230
};
215231

0 commit comments

Comments
 (0)