Pull Request #12 fixes for Issue #10.

CHANGELOG.rst

@@ -1,3 +1,10 @@
+0.2.1
+----
+* Pull request #12 fixes:
+ - Fixed indent in the i2c-1 dts
+ - Removed import dependencies in the SPI and PWM overlays
+ - Re-enabled building of the dtbo on setup.py install
+
 0.2.0
 ----
 * Added the ability to load DTB Overlays from within CHIP_IO

README.rst

@@ -2,10 +2,17 @@ CHIP_IO
 ============================
 A CHIP GPIO library
 
+NOTE: Now requires the custom DTC to install the library
+
 Manual::
 
     sudo apt-get update
-    sudo apt-get install git build-essential python-dev python-pip -y
+    sudo apt-get install git build-essential python-dev python-pip flex bison -y
+    git clone https://github.com/atenart/dtc
+    cd dtc
+    make
+    sudo  make install PREFIX=/usr
+    cd ..
     git clone git://github.com/xtacocorex/CHIP_IO.git
     cd CHIP_IO
     sudo python setup.py install

overlays/builder.py

@@ -4,8 +4,6 @@ import shutil
 import glob
 
 def compile():
-    # The compile needs the include for the spi2 stuff, not enabling that at the moment
-    # as I don't want to pull in the include section from CHIP-dt-overlays
     call(["dtc", "-O", "dtb", "-o", "overlays/chip-spi2.dtbo", "-b", "o", "-@", "overlays/chip-spi2.dts"])
     call(["dtc", "-O", "dtb", "-o", "overlays/chip-i2c1.dtbo", "-b", "o", "-@", "overlays/chip-i2c1.dts"])
     call(["dtc", "-O", "dtb", "-o", "overlays/chip-pwm0.dtbo", "-b", "o", "-@", "overlays/chip-pwm0.dts"])
@@ -15,7 +13,7 @@ def copy():
         os.makedirs("/lib/firmware/chip_io/")
     for fl in glob.glob("/lib/firmware/chip_io/chip-*-.dtbo"):
         os.remove(fl)
-    shutil.copy("overlays/chip-spi2.dtbo", "/lib/firmware/chip_io/chip-spi2.dtbo")
+    shutil.move("overlays/chip-spi2.dtbo", "/lib/firmware/chip_io/chip-spi2.dtbo")
-    shutil.copy("overlays/chip-i2c1.dtbo", "/lib/firmware/chip_io/chip-i2c1.dtbo")
+    shutil.move("overlays/chip-i2c1.dtbo", "/lib/firmware/chip_io/chip-i2c1.dtbo")
-    shutil.copy("overlays/chip-pwm0.dtbo", "/lib/firmware/chip_io/chip-pwm0.dtbo")
+    shutil.move("overlays/chip-pwm0.dtbo", "/lib/firmware/chip_io/chip-pwm0.dtbo")
 

overlays/chip-i2c1.dts

@@ -47,7 +47,7 @@
 /plugin/;
 
 / {
-	compatible = "nextthing,chip", "allwinner,sun5i-r8";
+    compatible = "nextthing,chip", "allwinner,sun5i-r8";
 
     fragment@0 {
         target-path = "/aliases";

overlays/chip-pwm0.dts

@@ -45,8 +45,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/pwm/pwm.h>
-
 / {
 	compatible = "nextthing,chip", "allwinner,sun5i-r8";
 

overlays/chip-spi2.dts

@@ -42,56 +42,52 @@
  */
 
 /dts-v1/;
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
-
 /plugin/;
 
 / {
-        compatible = "nextthing,chip", "allwinner,sun5i-r8";
+    compatible = "nextthing,chip", "allwinner,sun5i-r8";
 
-        /* activate the gpio for interrupt */
+    /* activate the gpio for interrupt */
-        fragment@0 {
+    fragment@0 {
-                target-path = <&pio>;
+        target-path = <&pio>;
 
-                __overlay__ {
+        __overlay__ {
-                        chip_spi2_pins: spi2@0 {
+            chip_spi2_pins: spi2@0 {
-                                allwinner,pins = "PE1", "PE2", "PE3";
+                allwinner,pins = "PE1", "PE2", "PE3";
-                                allwinner,function = "spi2";
+                allwinner,function = "spi2";
-                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                allwinner,drive = "0"; //<SUN4I_PINCTRL_10_MA>;
-                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                allwinner,pull = "0"; //<SUN4I_PINCTRL_NO_PULL>;
-                        };
+            };
 
-                        chip_spi2_cs0_pins: spi2_cs0@0 {
+            chip_spi2_cs0_pins: spi2_cs0@0 {
-                                allwinner,pins = "PE0";
+                allwinner,pins = "PE0";
-                                allwinner,function = "spi2";
+                allwinner,function = "spi2";
-                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                allwinner,drive = "0"; //<SUN4I_PINCTRL_10_MA>;
-                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                allwinner,pull = "0"; //<SUN4I_PINCTRL_NO_PULL>;
-                        };
+            };
-                };
         };
+    };
 
-        /*
+    /*
-         * Enable our SPI device, with an spidev device connected
+     * Enable our SPI device, with an spidev device connected
-         * to it
+     * to it
-         */
+    */
-        fragment@1 {
+    fragment@1 {
-                target = <&spi2>;
+        target = <&spi2>;
 
-                __overlay__ {
+        __overlay__ {
-                        #address-cells = <1>;
+            #address-cells = <1>;
-                        #size-cells = <0>;
+            #size-cells = <0>;
-                        pinctrl-names = "default";
+            pinctrl-names = "default";
-                        pinctrl-0 = <&chip_spi2_pins>, <&chip_spi2_cs0_pins>;
+            pinctrl-0 = <&chip_spi2_pins>, <&chip_spi2_cs0_pins>;
-                        status = "okay";
+            status = "okay";
 
-                        spi2@0 {
+            spi2@0 {
-                                //compatible = "spidev";
+                compatible = "rohm,dh2228fv";
-                                compatible = "rohm,dh2228fv";
+                reg = <0>;
-                                reg = <0>;
+                spi-max-frequency = <24000000>;
-                                spi-max-frequency = <24000000>;
+            };
-                        };
-                };
         };
+    };
 };
+

setup.py

@@ -1,6 +1,6 @@
 try:
     from overlays import builder
-    #builder.compile()
+    builder.compile()
     builder.copy()
 except:
     pass
@@ -20,7 +20,7 @@ classifiers = ['Development Status :: 3 - Alpha',
                'Topic :: System :: Hardware']
 
 setup(name             = 'CHIP_IO',
-      version          = '0.2.0',
+      version          = '0.2.1',
       author           = 'Robert Wolterman',
       author_email     = 'robert.wolterman@gmail.com',
       description      = 'A module to control CHIP IO channels',

source/constants.c

@@ -76,6 +76,6 @@ void define_constants(PyObject *module)
    both_edge = Py_BuildValue("i", BOTH_EDGE);
    PyModule_AddObject(module, "BOTH", both_edge);
 
-   version = Py_BuildValue("s", "0.2.0");
+   version = Py_BuildValue("s", "0.2.1");
    PyModule_AddObject(module, "VERSION", version);
 }