kernel: fix cryptodev with kernel >= 2.6.35

[openwrt.git] / target / linux / ppc40x / patches / 004-magicbox.patch

diff --git a/target/linux/ppc40x/patches/004-magicbox.patch b/target/linux/ppc40x/patches/004-magicbox.patch
index ff18b49..78653af 100644 (file)
--- a/target/linux/ppc40x/patches/004-magicbox.patch
+++ b/target/linux/ppc40x/patches/004-magicbox.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-magicbox.c
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-magicbox.c

-@@ -0,0 +1,90 @@
+@@ -0,0 +1,98 @@

 +/*
 + * Old U-boot compatibility for Magicbox boards
 + *
 +/*
 + * Old U-boot compatibility for Magicbox boards
 + *


@@ -26,29 +26,36 @@
 +
 +static bd_t bd;
 +
 +
 +static bd_t bd;
 +

-+static void fixup_cf_card(void)
++static void fixup_perwe(void)

 +{
 +#define DCRN_CPC0_PCI_BASE    0xf9
 +{
 +#define DCRN_CPC0_PCI_BASE    0xf9

-+#define CF_CS0_BASE   0xff100000
-+#define CF_CS1_BASE   0xff200000

 +
 +

-+      /* Turn on PerWE instead of PCIsomething */
++      /* Turn on PerWE instead of PCIINT */

 +      mtdcr(DCRN_CPC0_PCI_BASE,
 +            mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
 +
 +      mtdcr(DCRN_CPC0_PCI_BASE,
 +            mfdcr(DCRN_CPC0_PCI_BASE) | (0x80000000L >> 27));
 +

++#undef DCRN_CPC0_PCI_BASE
++}
++
++static void fixup_cf_card(void)
++{
++#define CF_CS0_BASE   0xff100000
++#define CF_CS1_BASE   0xff200000
++

 +      /* PerCS1 (CF's CS0): base 0xff100000, 16-bit, rw */
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B1CR);
 +      /* 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_CFGDATA, CF_CS0_BASE | EBC_BXCR_BS_1M |
++                               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_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_CFGDATA, CF_CS1_BASE | EBC_BXCR_BS_1M |
++                               EBC_BXCR_BU_RW | EBC_BXCR_BW_16);

 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +
 +      mtdcr(DCRN_EBC0_CFGADDR, EBC_B2AP);
 +      mtdcr(DCRN_EBC0_CFGDATA, 0x080bd800);
 +

-+#undef DCRN_CPC0_PCI_BASE

 +#undef CF_CS0_BASE
 +#undef CF_CS1_BASE
 +}
 +#undef CF_CS0_BASE
 +#undef CF_CS1_BASE
 +}


@@ -76,6 +83,7 @@
 +              devp = finddevice("/plb/ebc/cf_card@ff100000");
 +              del_node(devp);
 +      } else {
 +              devp = finddevice("/plb/ebc/cf_card@ff100000");
 +              del_node(devp);
 +      } else {

++              fixup_perwe();

 +              fixup_cf_card();
 +      }
 +
 +              fixup_cf_card();
 +      }
 +


@@ -93,7 +101,7 @@
 +}
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/magicbox.dts
 +}
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/magicbox.dts

-@@ -0,0 +1,281 @@
+@@ -0,0 +1,285 @@

 +/*
 + * Device Tree Source for Magicbox boards
 + *
 +/*
 + * Device Tree Source for Magicbox boards
 + *


@@ -316,19 +324,23 @@
 +                              reg = <0x00000000 0xffc00000 0x00400000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              reg = <0x00000000 0xffc00000 0x00400000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;

-+                              partition@0 {
++                              partition0@0 {

 +                                      label = "linux";
 +                                      reg = <0x0 0x140000>;
 +                              };
 +                                      label = "linux";
 +                                      reg = <0x0 0x140000>;
 +                              };

-+                              partition@120000 {
++                              partition1@120000 {

 +                                      label = "rootfs";
 +                                      label = "rootfs";

-+                                      reg = <0x140000 0x680000>;
++                                      reg = <0x140000 0x280000>;

 +                              };
 +                              };

-+                              partition@7c0000 {
++                              partition2@3c0000 {

 +                                      label = "u-boot";
 +                                      label = "u-boot";

-+                                      reg = <0x7c0000 0x30000>;
++                                      reg = <0x3c0000 0x30000>;

 +                                      read-only;
 +                              };
 +                                      read-only;
 +                              };

++                              partition3@0 {
++                                      label = "firmware";
++                                      reg = <0x0 0x3c0000>;
++                              };

 +                      };
 +              };
 +
 +                      };
 +              };
 +