[ppc40x] fix magicboxv2.dts

[openwrt.git] / target / linux / ppc40x / patches / 006-magicboxv2.patch

diff --git a/target/linux/ppc40x/patches/006-magicboxv2.patch b/target/linux/ppc40x/patches/006-magicboxv2.patch
index 33831af..0d71464 100644 (file)
--- a/target/linux/ppc40x/patches/006-magicboxv2.patch
+++ b/target/linux/ppc40x/patches/006-magicboxv2.patch
@@ -1,10 +1,11 @@
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-magicboxv2.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,69 @@
 +/*
 + * 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
@@ -25,13 +26,41 @@
 +
 +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);
 +}
-+      
++
 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +              unsigned long r6, unsigned long r7)
 +{
@@ -43,11 +72,12 @@
 +}
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/magicboxv2.dts
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,281 @@
 +/*
 + * Device Tree Source for Magicbox v2
 + *
 + * Copyright 2008 Imre Kaloz <kaloz@openwrt.org>
++ * Copyright 2009 Gabor Juhos <juhosg@openwrt.org>
 + *
 + * Based on walnut.dts
 + *
@@ -164,14 +194,28 @@
 +
 +                      IIC: i2c@ef600500 {
 +                              compatible = "ibm,iic-405ep", "ibm,iic";
++                              #address-cells = <1>;
++                              #size-cells = <0>;
 +                              reg = <0xef600500 0x00000011>;
 +                              interrupt-parent = <&UIC0>;
 +                              interrupts = <0x2 0x4>;
++
++                              dtt@48 {
++                                      compatible = "national,lm75";
++                                      reg = <0x48>;
++                              };
++
++                              eeprom@50 {
++                                      compatible = "at24,24c16";
++                                      reg = <0x50>;
++                              };
 +                      };
 +
-+                      GPIO: gpio@ef600700 {
-+                              compatible = "ibm,gpio-405ep";
++                      GPIO0: gpio-controller@ef600700 {
++                              compatible = "ibm,ppc4xx-gpio";
 +                              reg = <0xef600700 0x00000020>;
++                              #gpio-cells = <2>;
++                              gpio-controller;
 +                      };
 +
 +                      EMAC0: ethernet@ef600800 {
@@ -194,6 +238,7 @@
 +                              phy-mode = "mii";
 +                              phy-map = <0x00000000>;
 +                      };
++
 +                      EMAC1: ethernet@ef600900 {
 +                              linux,network-index = <0x1>;
 +                              device_type = "network";
@@ -216,6 +261,13 @@
 +                              phy-map = <0x00000001>;
 +                      };
 +
++                      leds {
++                              compatible = "gpio-leds";
++                              user {
++                                      label = "magicbox:red:user";
++                                      gpios = <&GPIO0 2 1>;
++                              };
++                      };
 +              };
 +
 +              EBC0: ebc {
@@ -229,6 +281,14 @@
 +                       */
 +                      clock-frequency = <0>; /* Filled in by zImage */
 +
++                      cf_card@ff100000 {
++                              compatible = "magicbox-cf", "pata-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>;
@@ -237,11 +297,11 @@
 +                              #size-cells = <1>;
 +                              partition@0 {
 +                                      label = "linux";
-+                                      reg = <0x0 0x3c0000>;
++                                      reg = <0x0 0x120000>;
 +                              };
-+                              partition@100000 {
++                              partition@120000 {
 +                                      label = "rootfs";
-+                                      reg = <0x100000 0x2c0000>;
++                                      reg = <0x120000 0x2a0000>;
 +                              };
 +                              partition@3c0000 {
 +                                      label = "u-boot";