From fdf2d146c388e203e46433f884922aec449268d7 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Thu, 26 Jan 2017 17:41:44 -0500 Subject: [PATCH 1/2] Add overlay for mcp3008 adc --- arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 9 + .../arm/boot/dts/overlays/mcp3008-overlay.dts | 205 ++++++++++++++++++ 3 files changed, 215 insertions(+) create mode 100755 arch/arm/boot/dts/overlays/mcp3008-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile index 72f2d90a03acc5..b13e34086ce557 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -57,6 +57,7 @@ dtbo-$(RPI_DT_OVERLAYS) += mcp23017.dtbo dtbo-$(RPI_DT_OVERLAYS) += mcp23s17.dtbo dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can0.dtbo dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can1.dtbo +dtbo-$(RPI_DT_OVERLAYS) += mcp3008.dtbo dtbo-$(RPI_DT_OVERLAYS) += mmc.dtbo dtbo-$(RPI_DT_OVERLAYS) += mz61581.dtbo dtbo-$(RPI_DT_OVERLAYS) += pi3-act-led.dtbo diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 7f4bd29c5e0811..72601f845912a2 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -736,6 +736,15 @@ Params: oscillator Clock frequency for the CAN controller (Hz) interrupt GPIO for interrupt signal +Name: mcp3008 +Info: Configures MCP3008 A/D converters + For devices on spi1 or spi2, the interfaces should be enabled + with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays. +Load: dtoverlay=mcp3008,[=] +Params: spi--present boolean, configure device at spi, cs + spi--speed integer, set the spi bus speed for this device + + Name: mmc Info: Selects the bcm2835-mmc SD/MMC driver, optionally with overclock Load: dtoverlay=mmc,= diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts new file mode 100755 index 00000000000000..709f8c5d02c49f --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -0,0 +1,205 @@ +/* + * Device tree overlay for Microchip mcp3008 10-Bit A/D Converters + */ + +/dts-v1/; +/plugin/; + +/ { + compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; + + fragment@0 { + target = <&spidev0>; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@1 { + target = <&spidev1>; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@2 { + target-path = "spi1/spidev@0"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@3 { + target-path = "spi1/spidev@1"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@4 { + target-path = "spi1/spidev@2"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@5 { + target-path = "spi2/spidev@0"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@6 { + target-path = "spi2/spidev@1"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@7 { + target-path = "spi2/spidev@2"; + __dormant__ { + status = "disabled"; + }; + }; + + fragment@8 { + target = <&spi0>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_00: mcp3008@0 { + compatible = "mcp3008"; + reg = <0>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@9 { + target = <&spi0>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_01: mcp3008@1 { + compatible = "mcp3008"; + reg = <1>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@10 { + target = <&spi1>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_10: mcp3008@0 { + compatible = "mcp3008"; + reg = <0>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@11 { + target = <&spi1>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_11: mcp3008@1 { + compatible = "mcp3008"; + reg = <1>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@12 { + target = <&spi1>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_12: mcp3008@2 { + compatible = "mcp3008"; + reg = <2>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@13 { + target = <&spi2>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_20: mcp3008@2 { + compatible = "mcp3008"; + reg = <0>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@14 { + target = <&spi2>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_21: mcp3008@2 { + compatible = "mcp3008"; + reg = <1>; + spi-max-frequency = <1600000>; + }; + }; + }; + + fragment@15 { + target = <&spi2>; + __dormant__ { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + mcp3008_22: mcp3008@2 { + compatible = "mcp3008"; + reg = <2>; + spi-max-frequency = <1600000>; + }; + }; + }; + + __overrides__ { + spi0-0-present = <0>, "+0+8"; + spi0-1-present = <0>, "+1+9"; + spi1-0-present = <0>, "+2+10"; + spi1-1-present = <0>, "+3+11"; + spi1-2-present = <0>, "+4+12"; + spi2-0-present = <0>, "+5+13"; + spi2-1-present = <0>, "+6+14"; + spi2-2-present = <0>, "+7+15"; + spi0-0-speed = <&mcp3008_00>, "spi-max-frequency:0"; + spi0-1-speed = <&mcp3008_01>, "spi-max-frequency:0"; + spi1-0-speed = <&mcp3008_10>, "spi-max-frequency:0"; + spi1-1-speed = <&mcp3008_11>, "spi-max-frequency:0"; + spi1-2-speed = <&mcp3008_12>, "spi-max-frequency:0"; + spi2-0-speed = <&mcp3008_20>, "spi-max-frequency:0"; + spi2-1-speed = <&mcp3008_21>, "spi-max-frequency:0"; + spi2-2-speed = <&mcp3008_22>, "spi-max-frequency:0"; + }; +}; From d3c23f603be9beeb0e5aec1d499c0288616c27b7 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Fri, 27 Jan 2017 06:17:22 -0500 Subject: [PATCH 2/2] Fix typos in mcp3008 overlay --- .../arm/boot/dts/overlays/mcp3008-overlay.dts | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts index 709f8c5d02c49f..06bf4264959c38 100755 --- a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -68,8 +68,8 @@ target = <&spi0>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_00: mcp3008@0 { compatible = "mcp3008"; @@ -83,8 +83,8 @@ target = <&spi0>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_01: mcp3008@1 { compatible = "mcp3008"; @@ -98,8 +98,8 @@ target = <&spi1>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_10: mcp3008@0 { compatible = "mcp3008"; @@ -113,8 +113,8 @@ target = <&spi1>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_11: mcp3008@1 { compatible = "mcp3008"; @@ -128,8 +128,8 @@ target = <&spi1>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_12: mcp3008@2 { compatible = "mcp3008"; @@ -143,10 +143,10 @@ target = <&spi2>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - mcp3008_20: mcp3008@2 { + mcp3008_20: mcp3008@0 { compatible = "mcp3008"; reg = <0>; spi-max-frequency = <1600000>; @@ -158,10 +158,10 @@ target = <&spi2>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - mcp3008_21: mcp3008@2 { + mcp3008_21: mcp3008@1 { compatible = "mcp3008"; reg = <1>; spi-max-frequency = <1600000>; @@ -173,8 +173,8 @@ target = <&spi2>; __dormant__ { status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; mcp3008_22: mcp3008@2 { compatible = "mcp3008";