101-iconnect.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
  2. +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
  3. @@ -8,6 +8,13 @@
  4. model = "Iomega Iconnect";
  5. compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
  6. + aliases {
  7. + led-boot = &led_power_blue;
  8. + led-failsafe = &led_power_red;
  9. + led-running = &led_power_blue;
  10. + led-upgrade = &led_power_red;
  11. + };
  12. +
  13. memory {
  14. device_type = "memory";
  15. reg = <0x00000000 0x10000000>;
  16. @@ -16,8 +23,6 @@
  17. chosen {
  18. bootargs = "console=ttyS0,115200n8 earlyprintk";
  19. stdout-path = &uart0;
  20. - linux,initrd-start = <0x4500040>;
  21. - linux,initrd-end = <0x4800000>;
  22. };
  23. ocp@f1000000 {
  24. @@ -89,12 +94,12 @@
  25. gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
  26. default-state = "on";
  27. };
  28. - power-blue {
  29. + led_power_blue: power-blue {
  30. label = "power:blue";
  31. gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
  32. - default-state = "keep";
  33. + default-state = "on";
  34. };
  35. - power-red {
  36. + led_power_red: power-red {
  37. label = "power:red";
  38. gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
  39. };
  40. @@ -146,28 +151,23 @@
  41. status = "okay";
  42. partition@0 {
  43. - label = "uboot";
  44. - reg = <0x0000000 0xc0000>;
  45. + label = "u-boot";
  46. + reg = <0x0000000 0xe0000>;
  47. };
  48. - partition@a0000 {
  49. - label = "env";
  50. - reg = <0xa0000 0x20000>;
  51. + partition@e0000 {
  52. + label = "u-boot environment";
  53. + reg = <0xe0000 0x100000>;
  54. };
  55. partition@100000 {
  56. - label = "zImage";
  57. - reg = <0x100000 0x300000>;
  58. - };
  59. -
  60. - partition@540000 {
  61. - label = "initrd";
  62. - reg = <0x540000 0x300000>;
  63. + label = "second stage u-boot";
  64. + reg = <0x100000 0x200000>;
  65. };
  66. - partition@980000 {
  67. - label = "boot";
  68. - reg = <0x980000 0x1f400000>;
  69. + partition@200000 {
  70. + label = "ubi";
  71. + reg = <0x200000 0x1fe00000>;
  72. };
  73. };