KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge 2.6.30 patches

Browse source 
SVN-Revision: 16926
This commit is contained in:
Gabor Juhos 2009-07-20 07:10:00 +00:00
parent d522d7d6e3
commit 9e6605553a
7 changed files with 78 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
target/linux/ppc40x/patches-2.6.30/101-powerpc-add-EBC_BXCR_BW-defines.patch → target/linux/ppc40x/patches-2.6.30/003-powerpc-add-EBC_BXCR_BW-defines.patch
View file

42
target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
View file

@ -1,10 +1,11 @@
--- /dev/null --- /dev/null
+++ b/arch/powerpc/boot/cuboot-magicboxv2.c +++ b/arch/powerpc/boot/cuboot-magicboxv2.c
@@ -0,0 +1,41 @@ @@ -0,0 +1,70 @@
+/* +/*
+ * Old U-boot compatibility for Magicbox v2 + * Old U-boot compatibility for Magicbox v2
+ * + *
+ * Author: Imre Kaloz <kaloz@openwrt.org> + * Author: Imre Kaloz <kaloz@openwrt.org>
+ * Gabor Juhos <juhosg@openwrt.org>
+ * + *
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published + * under the terms of the GNU General Public License version 2 as published
@ -25,8 +26,36 @@
+ +
+static bd_t bd; +static bd_t bd;
+ +
+static void fixup_cf_card(void)
+{
+#define DCRN_CPC0_PCI_BASE 0xf9
+#define CF_CS0_BASE 0xff100000
+#define CF_CS1_BASE 0xff200000
+
+ /* Turn on PerWE instead of PCIsomething */
+ mtdcr(DCRN_CPC0_PCI_BASE,
+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
+
+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+#undef DCRN_CPC0_PCI_BASE
+#undef CF_CS0_BASE
+#undef CF_CS1_BASE
+}
+
+static void magicboxv2_fixups(void) +static void magicboxv2_fixups(void)
+{ +{
+ fixup_cf_card();
+ ibm405ep_fixup_clocks(25000000); + ibm405ep_fixup_clocks(25000000);
+ ibm4xx_sdram_fixup_memsize(); + ibm4xx_sdram_fixup_memsize();
+ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); + dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
@ -44,11 +73,12 @@
+ +
--- /dev/null --- /dev/null
+++ b/arch/powerpc/boot/dts/magicboxv2.dts +++ b/arch/powerpc/boot/dts/magicboxv2.dts
@@ -0,0 +1,250 @@ @@ -0,0 +1,259 @@
+/* +/*
+ * Device Tree Source for Magicbox v2 + * Device Tree Source for Magicbox v2
+ * + *
+ * Copyright 2008 Imre Kaloz <kaloz@openwrt.org> + * Copyright 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
+ * + *
+ * Based on walnut.dts + * Based on walnut.dts
+ * + *
@ -230,6 +260,14 @@
+ */ + */
+ clock-frequency = <0>; /* Filled in by zImage */ + clock-frequency = <0>; /* Filled in by zImage */
+ +
+ cf_card@ff100000 {
+ compatible = "magicbox-cf";
+ reg = <0x00000000 0xff100000 0x00001000
+ 0x00000000 0xff200000 0x00001000>;
+ interrupt-parent = <&UIC0>;
+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
+ };
+
+ nor_flash@ffc00000 { + nor_flash@ffc00000 {
+ compatible = "cfi-flash"; + compatible = "cfi-flash";
+ bank-width = <2>; + bank-width = <2>;

40
target/linux/ppc40x/patches-2.6.30/007-openrb-light.patch
View file

@ -48,7 +48,7 @@
static int __init ppc40x_probe(void) static int __init ppc40x_probe(void)
--- /dev/null --- /dev/null
+++ b/arch/powerpc/boot/cuboot-openrb-light.c +++ b/arch/powerpc/boot/cuboot-openrb-light.c
@@ -0,0 +1,41 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * Old U-boot compatibility for OpenRB Light board + * Old U-boot compatibility for OpenRB Light board
+ * + *
@ -73,8 +73,36 @@
+ +
+static bd_t bd; +static bd_t bd;
+ +
+static void fixup_cf_card(void)
+{
+#define DCRN_CPC0_PCI_BASE 0xf9
+#define CF_CS0_BASE 0xff100000
+#define CF_CS1_BASE 0xff200000
+
+ /* Turn on PerWE instead of PCIsomething */
+ mtdcr(DCRN_CPC0_PCI_BASE,
+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
+
+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+#undef DCRN_CPC0_PCI_BASE
+#undef CF_CS0_BASE
+#undef CF_CS1_BASE
+}
+
+static void openrb_light_fixups(void) +static void openrb_light_fixups(void)
+{ +{
+ fixup_cf_card();
+ ibm405ep_fixup_clocks(33333000); + ibm405ep_fixup_clocks(33333000);
+ ibm4xx_sdram_fixup_memsize(); + ibm4xx_sdram_fixup_memsize();
+ dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr); + dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
@ -92,7 +120,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/arch/powerpc/boot/dts/openrb-light.dts +++ b/arch/powerpc/boot/dts/openrb-light.dts
@@ -0,0 +1,244 @@ @@ -0,0 +1,252 @@
+/* +/*
+ * Device Tree Source for OpenRB Light board + * Device Tree Source for OpenRB Light board
+ * + *
@ -272,6 +300,14 @@
+ */ + */
+ clock-frequency = <0>; /* Filled in by zImage */ + clock-frequency = <0>; /* Filled in by zImage */
+ +
+ cf_card@ff100000 {
+ compatible = "magicbox-cf";
+ reg = <0x00000000 0xff100000 0x00001000
+ 0x00000000 0xff200000 0x00001000>;
+ interrupt-parent = <&UIC0>;
+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
+ };
+
+ nor_flash@ff800000 { + nor_flash@ff800000 {
+ compatible = "cfi-flash"; + compatible = "cfi-flash";
+ bank-width = <2>; + bank-width = <2>;

39
target/linux/ppc40x/patches-2.6.30/102-openrb-light-cf-card-fixup.patch
View file

@ -1,39 +0,0 @@
--- a/arch/powerpc/boot/cuboot-openrb-light.c
+++ b/arch/powerpc/boot/cuboot-openrb-light.c
@@ -22,8 +22,36 @@
static bd_t bd;
+static void fixup_cf_card(void)
+{
+#define DCRN_CPC0_PCI_BASE 0xf9
+#define CF_CS0_BASE 0xff100000
+#define CF_CS1_BASE 0xff200000
+
+ /* Turn on PerWE instead of PCIsomething */
+ mtdcr(DCRN_CPC0_PCI_BASE,
+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
+
+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+#undef DCRN_CPC0_PCI_BASE
+#undef CF_CS0_BASE
+#undef CF_CS1_BASE
+}
+
static void openrb_light_fixups(void)
{
+ fixup_cf_card();
ibm405ep_fixup_clocks(33333000);
ibm4xx_sdram_fixup_memsize();
dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);

17
target/linux/ppc40x/patches-2.6.30/103-openrb-light-add-cf-card-to-dts.patch
View file

@ -1,17 +0,0 @@
--- a/arch/powerpc/boot/dts/openrb-light.dts
+++ b/arch/powerpc/boot/dts/openrb-light.dts
@@ -177,6 +177,14 @@
*/
clock-frequency = <0>; /* Filled in by zImage */
+ cf_card@ff100000 {
+ compatible = "magicbox-cf";
+ reg = <0x00000000 0xff100000 0x00001000
+ 0x00000000 0xff200000 0x00001000>;
+ interrupt-parent = <&UIC0>;
+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
+ };
+
nor_flash@ff800000 {
compatible = "cfi-flash";
bank-width = <2>;

47
target/linux/ppc40x/patches-2.6.30/104-magicboxv2-cf-card-fixup.patch
View file

@ -1,47 +0,0 @@
--- a/arch/powerpc/boot/cuboot-magicboxv2.c
+++ b/arch/powerpc/boot/cuboot-magicboxv2.c
@@ -2,6 +2,7 @@
* Old U-boot compatibility for Magicbox v2
*
* Author: Imre Kaloz <kaloz@openwrt.org>
+ * Gabor Juhos <juhosg@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -22,8 +23,36 @@
static bd_t bd;
+static void fixup_cf_card(void)
+{
+#define DCRN_CPC0_PCI_BASE 0xf9
+#define CF_CS0_BASE 0xff100000
+#define CF_CS1_BASE 0xff200000
+
+ /* Turn on PerWE instead of PCIsomething */
+ mtdcr(DCRN_CPC0_PCI_BASE,
+ mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
+
+ /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS0_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B1AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+ /* PerCS2 (CF's CS1): base 0xff200000, 16-bit, rw */
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2CR);
+ mtdcr(DCRN_EBC0_CFGDATA, CF_CS1_BASE | EBC_BXCR_BU_RW | EBC_BXCR_BW_16);
+ mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
+ mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
+
+#undef DCRN_CPC0_PCI_BASE
+#undef CF_CS0_BASE
+#undef CF_CS1_BASE
+}
+
static void magicboxv2_fixups(void)
{
+ fixup_cf_card();
ibm405ep_fixup_clocks(25000000);
ibm4xx_sdram_fixup_memsize();
dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);

25
target/linux/ppc40x/patches-2.6.30/105-magicboxv2-add-cf-card-to-dts.patch
View file

@ -1,25 +0,0 @@
--- a/arch/powerpc/boot/dts/magicboxv2.dts
+++ b/arch/powerpc/boot/dts/magicboxv2.dts
@@ -2,6 +2,7 @@
* Device Tree Source for Magicbox v2
*
* Copyright 2008 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
*
* Based on walnut.dts
*
@@ -183,6 +184,14 @@
*/
clock-frequency = <0>; /* Filled in by zImage */
+ cf_card@ff100000 {
+ compatible = "magicbox-cf";
+ reg = <0x00000000 0xff100000 0x00001000
+ 0x00000000 0xff200000 0x00001000>;
+ interrupt-parent = <&UIC0>;
+ interrupts = <0x19 0x1 /* IRQ_TYPE_EDGE_RISING */ >;
+ };
+
nor_flash@ffc00000 {
compatible = "cfi-flash";
bank-width = <2>;