diff --git a/arch/arm/boot/dts/overlays/adau7118-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7118-simple-overlay.dts index 5542aa0f910277..94fb16095dd6d9 100644 --- a/arch/arm/boot/dts/overlays/adau7118-simple-overlay.dts +++ b/arch/arm/boot/dts/overlays/adau7118-simple-overlay.dts @@ -6,55 +6,48 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&i2s>; - __overlay__ { - status = "okay"; - }; + __overrides__ { + card-name = <&sound>, "simple-audio-card,name"; }; +}; + +&i2s { + status = "okay"; +}; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - adau7118_codec: adau7118-codec@14 { - reg = <0x14>; - #sound-dai-cells = <0>; - compatible = "adi,adau7118"; - status = "okay"; - }; - }; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + adau7118_codec: adau7118-codec@14 { + reg = <0x14>; + #sound-dai-cells = <0>; + compatible = "adi,adau7118"; + status = "okay"; }; +}; - fragment@2 { - target = <&sound>; - sound_overlay: __overlay__ { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "adau7118"; - simple-audio-card,bitclock-slave = <&dailink0_slave>; - simple-audio-card,frame-slave = <&dailink0_slave>; - simple-audio-card,widgets = - "Microphone", "Microphone Jack"; - simple-audio-card,routing = - "PDM_DAT0", "Microphone Jack"; - status = "okay"; - simple-audio-card,cpu { - /* so that bclk is 64x FS */ - dai-tdm-slot-num = <2>; - dai-tdm-slot-width = <32>; - sound-dai = <&i2s>; - }; - dailink0_slave: simple-audio-card,codec { - sound-dai = <&adau7118_codec>; - }; - }; +&sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "adau7118"; + simple-audio-card,bitclock-slave = <&dailink0_slave>; + simple-audio-card,frame-slave = <&dailink0_slave>; + simple-audio-card,widgets = + "Microphone", "Microphone Jack"; + simple-audio-card,routing = + "PDM_DAT0", "Microphone Jack"; + status = "okay"; + + simple-audio-card,cpu { + /* so that bclk is 64x FS */ + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + sound-dai = <&i2s>; }; - __overrides__ { - card-name = <&sound_overlay>,"simple-audio-card,name"; + dailink0_slave: simple-audio-card,codec { + sound-dai = <&adau7118_codec>; }; }; diff --git a/arch/arm/boot/dts/overlays/adis16475-overlay.dts b/arch/arm/boot/dts/overlays/adis16475-overlay.dts index 084c5c59f5c488..c18cef1562f322 100644 --- a/arch/arm/boot/dts/overlays/adis16475-overlay.dts +++ b/arch/arm/boot/dts/overlays/adis16475-overlay.dts @@ -8,70 +8,6 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&spi0>; - __overlay__ { - status = "okay"; - }; - }; - - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@3 { - target = <&gpio>; - __overlay__ { - adis16475_pins: adis16475_pins { - brcm,pins = <4 12>; // interrupt and reset - brcm,function = <0 1>; // in out - }; - }; - }; - - fragment@4 { - target-path = "/"; - __overlay__ { - clocks { - adis16475_ref_clk: clock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; - }; - }; - }; - }; - - fragment@5 { - target = <&spi0>; - __overlay__ { - /* needed to avoid dtc warning */ - #address-cells = <1>; - #size-cells = <0>; - - adis16475: adis16475@0 { - reg = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&adis16475_pins>; - spi-cpha; - spi-cpol; - reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - spi-max-frequency = <2000000>; - interrupts = <4 IRQ_TYPE_EDGE_RISING>; - interrupt-parent = <&gpio>; - }; - }; - }; - __overrides__ { /* * This gives an option to use the gpio25 as the data ready pin. This @@ -89,3 +25,49 @@ <&adis16475>,"clocks:0=",<&adis16475_ref_clk>; }; }; + +&spi0 { + status = "okay"; +}; + +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; +}; + +&gpio { + adis16475_pins: adis16475_pins { + brcm,pins = <4 12>; // interrupt and reset + brcm,function = <0 1>; // in out + }; +}; + +&{/} { + clocks { + adis16475_ref_clk: clock@0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + }; + }; +}; + +&spi0 { + /* needed to avoid dtc warning */ + #address-cells = <1>; + #size-cells = <0>; + + adis16475: adis16475@0 { + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&adis16475_pins>; + spi-cpha; + spi-cpol; + reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + spi-max-frequency = <2000000>; + interrupts = <4 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&gpio>; + }; +}; diff --git a/arch/arm/boot/dts/overlays/adis16480-overlay.dts b/arch/arm/boot/dts/overlays/adis16480-overlay.dts index 38c9bd9272c23e..dddb764e83ae2f 100644 --- a/arch/arm/boot/dts/overlays/adis16480-overlay.dts +++ b/arch/arm/boot/dts/overlays/adis16480-overlay.dts @@ -8,58 +8,6 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&spi0>; - __overlay__ { - status = "okay"; - }; - }; - - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@3 { - target = <&gpio>; - __overlay__ { - adis16480_pins: adis16480_pins { - brcm,pins = <6 12>; // interrupt and reset - brcm,function = <0 1>; // in out - }; - }; - }; - fragment@4 { - target = <&spi0>; - __overlay__ { - /* needed to avoid dtc warning */ - #address-cells = <1>; - #size-cells = <0>; - - adis16480: adis16480@0 { - reg = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&adis16480_pins>; - spi-cpha; - spi-cpol; - reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - spi-max-frequency = <15000000>; - /* use DIO1 as data ready by default */ - interrupts = <6 IRQ_TYPE_EDGE_RISING>; - interrupt-parent = <&gpio>; - }; - }; - }; - __overrides__ { device = <&adis16480>,"compatible"; drdy_dio2 = <&adis16480_pins>,"brcm,pins:0=25", @@ -73,3 +21,41 @@ <&adis16480>,"interrupt-names=DIO4"; }; }; + +&spi0 { + status = "okay"; +}; + +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; +}; + +&gpio { + adis16480_pins: adis16480_pins { + brcm,pins = <6 12>; // interrupt and reset + brcm,function = <0 1>; // in out + }; +}; + +&spi0 { + /* needed to avoid dtc warning */ + #address-cells = <1>; + #size-cells = <0>; + + adis16480: adis16480@0 { + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&adis16480_pins>; + spi-cpha; + spi-cpol; + reset-gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + spi-max-frequency = <15000000>; + /* use DIO1 as data ready by default */ + interrupts = <6 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&gpio>; + }; +}; diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts index 1b4c065356874d..a3cb1ca263a2c3 100644 --- a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts @@ -5,25 +5,22 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - clock-frequency = <400000>; - - mpu6050: mpu6050@68 { - compatible = "invensense,mpu6050"; - reg = <0x68>; - interrupt-parent = <&gpio>; - interrupts = <4 1>; - }; - }; - }; - __overrides__ { interrupt = <&mpu6050>,"interrupts:0"; addr = <&mpu6050>,"reg:0"; }; }; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + clock-frequency = <400000>; + + mpu6050: mpu6050@68 { + compatible = "invensense,mpu6050"; + reg = <0x68>; + interrupt-parent = <&gpio>; + interrupts = <4 1>; + }; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5592r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5592r-overlay.dts index 30a2384230a68a..9f9d6a53e05582 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5592r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5592r-overlay.dts @@ -7,69 +7,69 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&spidev0>; + __overrides__ { + cs_pin = <&ad5592r>,"reg:0"; + }; +}; + +&spidev0 { + status = "disabled"; +}; - __overlay__ { - status = "disabled"; +&spi0 { + #size-cells = <0>; + #address-cells = <1>; + status = "okay"; + + ad5592r: ad5592r@0 { + compatible = "adi,ad5592r"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + + channel@0 { + reg = <0>; + adi,mode = ; }; - }; - fragment@1 { - target = <&spi0>; - __overlay__ { - #size-cells = <0>; - #address-cells = <1>; - status = "okay"; + channel@1 { + reg = <1>; + adi,mode = ; + }; - ad5592r: ad5592r@0 { - compatible = "adi,ad5592r"; - reg = <0>; + channel@2 { + reg = <2>; + adi,mode = ; + }; - spi-max-frequency = <1000000>; - spi-cpol; + channel@3 { + reg = <3>; + adi,mode = ; + adi,off-state = ; + }; - channel@0 { - reg = <0>; - adi,mode = ; - }; - channel@1 { - reg = <1>; - adi,mode = ; - }; - channel@2 { - reg = <2>; - adi,mode = ; - }; - channel@3 { - reg = <3>; - adi,mode = ; - adi,off-state = ; - }; - channel@4 { - reg = <4>; - adi,mode = ; - adi,off-state = ; - }; - channel@5 { - reg = <5>; - adi,mode = ; - adi,off-state = ; - }; - channel@6 { - reg = <6>; - adi,mode = ; - adi,off-state = ; - }; - channel@7 { - reg = <7>; - adi,mode = ; - adi,off-state = ; - }; - }; + channel@4 { + reg = <4>; + adi,mode = ; + adi,off-state = ; + }; + + channel@5 { + reg = <5>; + adi,mode = ; + adi,off-state = ; + }; + + channel@6 { + reg = <6>; + adi,mode = ; + adi,off-state = ; + }; + + channel@7 { + reg = <7>; + adi,mode = ; + adi,off-state = ; }; - }; - __overrides__ { - cs_pin = <&ad5592r>,"reg:0"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5593r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5593r-overlay.dts index 4dee3ebf6ceb0d..7c12320cafd00f 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5593r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5593r-overlay.dts @@ -7,43 +7,43 @@ / { compatible = "brcm,bcm2835"; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #size-cells = <0>; - #address-cells = <1>; - status = "okay"; - - clock-frequency = <400000>; - - ad5593r: ad5593r@10 { - compatible = "adi,ad5593r"; - reg = <0x10>; - - channel@0 { - reg = <0>; - adi,mode = ; - adi,off-state = ; - }; - channel@1 { - reg = <1>; - adi,mode = ; - adi,off-state = ; - }; - channel@2 { - reg = <2>; - adi,mode = ; - adi,off-state = ; - }; - channel@6 { - reg = <6>; - adi,mode = ; - adi,off-state = ; - }; - }; - }; - }; __overrides__ { - addr = <&ad5593r>,"reg:0"; + addr = <&ad5593r>, "reg:0"; + }; +}; + +&i2c1 { + #size-cells = <0>; + #address-cells = <1>; + status = "okay"; + clock-frequency = <400000>; + + ad5593r: ad5593r@10 { + compatible = "adi,ad5593r"; + reg = <0x10>; + + channel@0 { + reg = <0>; + adi,mode = ; + adi,off-state = ; + }; + + channel@1 { + reg = <1>; + adi,mode = ; + adi,off-state = ; + }; + + channel@2 { + reg = <2>; + adi,mode = ; + adi,off-state = ; + }; + + channel@6 { + reg = <6>; + adi,mode = ; + adi,off-state = ; + }; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5677r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5677r-overlay.dts index 13977a2894b3b6..b804cef0154eda 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5677r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5677r-overlay.dts @@ -4,32 +4,26 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - adc_vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + adc_vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad5677r@0f{ - compatible = "adi,ad5677r"; - reg = <0x0f>; - vcc-supply = <&adc_vref>; - }; - }; + ad5677r@f { + compatible = "adi,ad5677r"; + reg = <0x0f>; + vcc-supply = <&adc_vref>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5679r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5679r-overlay.dts index ccd64cd8549ee0..db6fe6984b72d1 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5679r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5679r-overlay.dts @@ -7,65 +7,53 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; - fragment@0 { - target = <&gpio>; - __overlay__ { - pwm_pins: pwm_pins { - brcm,pins = <18>; - brcm,function = <2>; /* Alt5 */ - }; - }; + __overrides__ { + pin = <&pwm_pins>, "brcm,pins:0"; + func = <&pwm_pins>, "brcm,function:0"; + clock = <&pwm>, "assigned-clock-rates:0"; }; +}; - fragment@1 { - target = <&pwm>; - frag1: __overlay__ { - pinctrl-names = "default"; - pinctrl-0 = <&pwm_pins>; - assigned-clock-rates = <100000000>; - status = "okay"; - }; +&gpio { + pwm_pins: pwm_pins { + brcm,pins = <18>; + brcm,function = <2>; /* Alt5 */ }; +}; - __overrides__ { - pin = <&pwm_pins>,"brcm,pins:0"; - func = <&pwm_pins>,"brcm,function:0"; - clock = <&frag1>,"assigned-clock-rates:0"; - }; +&pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm_pins>; + assigned-clock-rates = <100000000>; + status = "okay"; +}; - fragment@2 { - target-path = "/"; - __overlay__ { - adc_vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + adc_vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@3 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad5679r@0{ - compatible = "adi,ad5679r"; - reg = <0>; - spi-max-frequency = <50000000>; - spi-cpha; - vcc-supply = <&adc_vref>; + ad5679r@0 { + compatible = "adi,ad5679r"; + reg = <0>; + spi-max-frequency = <50000000>; + spi-cpha; + vcc-supply = <&adc_vref>; - interrupts = <25 IRQ_TYPE_EDGE_RISING>; - interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&gpio>; - pwms = <&pwm 0 100>; - pwm-names = "pwm-trigger"; - }; - }; + pwms = <&pwm 0 100>; + pwm-names = "pwm-trigger"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5686-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5686-overlay.dts index cc56d167de59d5..ef0bdbc52dd442 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5686-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5686-overlay.dts @@ -4,34 +4,28 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - adc_vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + adc_vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad5686r@0{ - compatible = "adi,ad5686r"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpha; - vcc-supply = <&adc_vref>; - }; - }; + ad5686r@0 { + compatible = "adi,ad5686r"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpha; + vcc-supply = <&adc_vref>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5766-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5766-overlay.dts index 6c0d98a9de2a30..ef69a3c0eb6d48 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5766-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5766-overlay.dts @@ -4,34 +4,25 @@ / { compatible = "brcm,bcm2708", "brcm,bcm2837"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad5766@0{ - compatible = "adi,ad5766"; - reg = <0>; - spi-cpol; - spi-max-frequency = <1000000>; - }; - }; + ad5766@0{ + compatible = "adi,ad5766"; + reg = <0>; + spi-cpol; + spi-max-frequency = <1000000>; }; +}; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5770r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5770r-overlay.dts index a67e425c36e29d..1ba4a4629b7c5a 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5770r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5770r-overlay.dts @@ -4,64 +4,57 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad5770r@0 { - compatible = "ad5770r"; - reg = <0>; - spi-max-frequency = <1000000>; - vref-supply = <&vref>; - - reset-gpios = <&gpio 22 0>; - - channel@0 { - num = <0>; - adi,range-microamp = <(-60000) 300000>; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad5770r@0 { + compatible = "ad5770r"; + reg = <0>; + spi-max-frequency = <1000000>; + vref-supply = <&vref>; + reset-gpios = <&gpio 22 0>; + + channel@0 { + num = <0>; + adi,range-microamp = <(-60000) 300000>; + }; - channel@1 { - num = <1>; - adi,range-microamp = <0 140000>; - }; + channel@1 { + num = <1>; + adi,range-microamp = <0 140000>; + }; - channel@2 { - num = <2>; - adi,range-microamp = <0 55000>; - }; + channel@2 { + num = <2>; + adi,range-microamp = <0 55000>; + }; - channel@3 { - num = <3>; - adi,range-microamp = <0 45000>; - }; + channel@3 { + num = <3>; + adi,range-microamp = <0 45000>; + }; - channel@4 { - num = <4>; - adi,range-microamp = <0 45000>; - }; + channel@4 { + num = <4>; + adi,range-microamp = <0 45000>; + }; - channel@5 { - num = <5>; - adi,range-microamp = <0 45000>; - }; - }; + channel@5 { + num = <5>; + adi,range-microamp = <0 45000>; }; }; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1250000>; - }; - }; +&{/} { + vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad5791-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad5791-overlay.dts index 73c3203570e7ac..0d650dad7a88b9 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad5791-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad5791-overlay.dts @@ -4,62 +4,47 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - vdd: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + vdd: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - vss: fixedregulator@1 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + vss: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@2 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad5791@1 { - compatible = "adi,ad5791"; - reg = <1>; - spi-max-frequency = <5000000>; - spi-cpha; - vdd-supply = <&vdd>; - vss-supply = <&vss>; - }; - }; + ad5791@1 { + compatible = "adi,ad5791"; + reg = <1>; + spi-max-frequency = <5000000>; + spi-cpha; + vdd-supply = <&vdd>; + vss-supply = <&vss>; }; +}; - fragment@3 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@4 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad7124-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad7124-overlay.dts index 29714c99dbfbeb..678d95df1e9d40 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad7124-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad7124-overlay.dts @@ -4,115 +4,100 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - ad7124_mclk: clock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <614400>; - }; - }; +&{/} { + clocks { + ad7124_mclk: clock@0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <614400>; }; }; +}; - fragment@2 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad7124@0 { - compatible = "adi,ad7124-4"; - reg = <0>; - spi-max-frequency = <5000000>; - interrupts = <25 2>; - interrupt-parent = <&gpio>; - refin1-supply = <&vref>; - clocks = <&ad7124_mclk>; - clock-names = "mclk"; - - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - diff-channels = <0 19>; - adi,reference-select = <0>; - }; - - channel@1 { - reg = <1>; - diff-channels = <1 19>; - adi,reference-select = <0>; - }; - - channel@2 { - reg = <2>; - diff-channels = <2 19>; - adi,reference-select = <0>; - }; - - channel@3 { - reg = <3>; - diff-channels = <3 19>; - adi,reference-select = <0>; - }; - - channel@4 { - reg = <4>; - diff-channels = <4 19>; - adi,reference-select = <0>; - }; - - channel@5 { - reg = <5>; - diff-channels = <5 19>; - adi,reference-select = <0>; - }; - - channel@6 { - reg = <6>; - diff-channels = <6 19>; - adi,reference-select = <0>; - }; - - channel@7 { - reg = <7>; - diff-channels = <7 19>; - adi,reference-select = <0>; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad7124@0 { + compatible = "adi,ad7124-4"; + reg = <0>; + spi-max-frequency = <5000000>; + interrupts = <25 2>; + interrupt-parent = <&gpio>; + refin1-supply = <&vref>; + clocks = <&ad7124_mclk>; + clock-names = "mclk"; + + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + diff-channels = <0 19>; + adi,reference-select = <0>; }; - }; - fragment@3 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + channel@1 { + reg = <1>; + diff-channels = <1 19>; + adi,reference-select = <0>; + }; + + channel@2 { + reg = <2>; + diff-channels = <2 19>; + adi,reference-select = <0>; + }; + + channel@3 { + reg = <3>; + diff-channels = <3 19>; + adi,reference-select = <0>; }; - }; - fragment@4 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; + channel@4 { + reg = <4>; + diff-channels = <4 19>; + adi,reference-select = <0>; + }; + + channel@5 { + reg = <5>; + diff-channels = <5 19>; + adi,reference-select = <0>; + }; + + channel@6 { + reg = <6>; + diff-channels = <6 19>; + adi,reference-select = <0>; + }; + + channel@7 { + reg = <7>; + diff-channels = <7 19>; + adi,reference-select = <0>; }; }; }; + +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ad7190-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad7190-overlay.dts index 13a7279c2f7413..5bfb9f653746fe 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad7190-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad7190-overlay.dts @@ -4,62 +4,53 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - dvdd: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; - }; +&{/} { + dvdd: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; }; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - avdd: fixedregulator@1 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply2"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; - }; +&{/} { + avdd: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply2"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; }; +}; - fragment@3 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad7190@0 { - compatible = "adi,ad7190"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpol; - spi-cpha; - #interrupt-cells = <2>; - interrupts = <25 0x2>; - interrupt-parent = <&gpio>; - dvdd-supply = <&dvdd>; - avdd-supply = <&avdd>; + ad7190@0 { + compatible = "adi,ad7190"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + spi-cpha; + #interrupt-cells = <2>; + interrupts = <25 0x2>; + interrupt-parent = <&gpio>; + dvdd-supply = <&dvdd>; + avdd-supply = <&avdd>; - adi,reference-voltage-mv = /bits/ 16 <3300>; - adi,clock-source-select = [02]; - adi,refin2-pins-enable; - adi,rejection-60-Hz-enable; - adi,chop-enable; - adi,buffer-enable; - adi,burnout-currents-enable; - adi,sinc3-filter-enable; - adi,unipolar-enable; - }; - }; + adi,reference-voltage-mv = /bits/ 16 <3300>; + adi,clock-source-select = [02]; + adi,refin2-pins-enable; + adi,rejection-60-Hz-enable; + adi,chop-enable; + adi,buffer-enable; + adi,burnout-currents-enable; + adi,sinc3-filter-enable; + adi,unipolar-enable; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad7293-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad7293-overlay.dts index 36c5ac7bdf0fca..e2236b16a39f1c 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad7293-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad7293-overlay.dts @@ -4,50 +4,40 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; +&spidev0 { + status = "disabled"; +}; - __overlay__ { - status = "disabled"; - }; +&{/} { + avdd: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "avdd"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; }; - fragment@1 { - target-path = "/"; - __overlay__ { - avdd: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "avdd"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - }; - vdrive: fixedregulator@1 { - compatible = "regulator-fixed"; - regulator-name = "vdrive"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; - }; + vdrive: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "vdrive"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; }; +}; - fragment@2 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad7293@0{ - compatible = "adi,ad7293"; - reg = <0>; - spi-max-frequency = <1000000>; - avdd-supply = <&avdd>; - vdrive-supply = <&vdrive>; - }; - }; + ad7293@0 { + compatible = "adi,ad7293"; + reg = <0>; + spi-max-frequency = <1000000>; + avdd-supply = <&avdd>; + vdrive-supply = <&vdrive>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad738x-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad738x-overlay.dts index cdd97f86da1e82..7f2654b3df18af 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad738x-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad738x-overlay.dts @@ -4,36 +4,30 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - adc_vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + adc_vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad7380@0 { - compatible = "ad7380"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpol; - interrupts = <25 2>; - interrupt-parent = <&gpio>; - vref-supply = <&adc_vref>; - }; - }; + ad7380@0 { + compatible = "ad7380"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + interrupts = <25 2>; + interrupt-parent = <&gpio>; + vref-supply = <&adc_vref>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad74413r-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad74413r-overlay.dts index d9a330a375ac09..2bf3fd2ab118d9 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad74413r-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad74413r-overlay.dts @@ -8,93 +8,78 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - ad74413r_refin: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; - }; +&{/} { + ad74413r_refin: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; - cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - status = "okay"; + cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + status = "okay"; - ad74413r@0 { - compatible = "adi,ad74413r"; - reg = <0>; + ad74413r@0 { + compatible = "adi,ad74413r"; + reg = <0>; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - spi-max-frequency = <1000000>; - spi-cpol; + spi-max-frequency = <1000000>; + spi-cpol; - interrupt-parent = <&gpio>; - interrupts = <26 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpio>; + interrupts = <26 IRQ_TYPE_EDGE_FALLING>; - refin-supply = <&ad74413r_refin>; + refin-supply = <&ad74413r_refin>; - channel@0 { - reg = <0>; + channel@0 { + reg = <0>; - adi,ch-func = ; - }; + adi,ch-func = ; + }; - channel@1 { - reg = <1>; + channel@1 { + reg = <1>; - adi,ch-func = ; - }; + adi,ch-func = ; + }; - channel@2 { - reg = <2>; + channel@2 { + reg = <2>; - adi,ch-func = ; - }; + adi,ch-func = ; + }; - channel@3 { - reg = <3>; + channel@3 { + reg = <3>; - adi,ch-func = ; - }; - }; + adi,ch-func = ; }; }; +}; - fragment@2 { - target = <&gpio>; - __overlay__ { - ad74413r_eval_reset_gpio { - gpio-hog; - gpios = <27 GPIO_ACTIVE_LOW>; - output-low; - }; - }; +&gpio { + ad74413r_eval_reset_gpio { + gpio-hog; + gpios = <27 GPIO_ACTIVE_LOW>; + output-low; }; +}; - fragment@3 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@4 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad7746-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad7746-overlay.dts index 137184725143ee..c8b0d6f8a96704 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad7746-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad7746-overlay.dts @@ -5,23 +5,21 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad7746: ad7746@48 { - compatible = "adi,ad7746"; - clock-frequency = <400000>; - reg = <0x48>; - label = "my_ad7746"; - }; - }; - }; - __overrides__ { addr = <&ad7746>,"reg:0"; }; }; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad7746: ad7746@48 { + compatible = "adi,ad7746"; + clock-frequency = <400000>; + reg = <0x48>; + label = "my_ad7746"; + }; +}; + diff --git a/arch/arm/boot/dts/overlays/rpi-ad7768-1-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad7768-1-overlay.dts index bccaebb51f1968..a1b92c9c543f59 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad7768-1-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad7768-1-overlay.dts @@ -4,55 +4,46 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - adc_vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <4096000>; - regulator-max-microvolt = <4096000>; - regulator-boot-on; - }; - }; +&{/} { + adc_vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <4096000>; + regulator-max-microvolt = <4096000>; + regulator-boot-on; }; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - ad7768_mclk: clock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <16384000>; - }; - }; +&{/} { + clocks { + ad7768_mclk: clock@0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <16384000>; }; }; +}; - fragment@2 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad7768@0{ - compatible = "ad7768-1"; - reg = <0>; - spi-max-frequency = <16000000>; - spi-cpol; - spi-cpha; - #interrupt-cells = <2>; - interrupts = <25 0x2>; - interrupt-parent = <&gpio>; - vref-supply = <&adc_vref>; - adi,sync-in-gpios = <&gpio 22 1>; - reset-gpios = <&gpio 27 1>; - clocks = <&ad7768_mclk>; - clock-names = "mclk"; - }; - }; + ad7768@0 { + compatible = "ad7768-1"; + reg = <0>; + spi-max-frequency = <16000000>; + spi-cpol; + spi-cpha; + #interrupt-cells = <2>; + interrupts = <25 0x2>; + interrupt-parent = <&gpio>; + vref-supply = <&adc_vref>; + adi,sync-in-gpios = <&gpio 22 1>; + reset-gpios = <&gpio 27 1>; + clocks = <&ad7768_mclk>; + clock-names = "mclk"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ad9545-hmc7044-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad9545-hmc7044-overlay.dts index f00c86c0355379..209a54f12132b6 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad9545-hmc7044-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad9545-hmc7044-overlay.dts @@ -7,559 +7,533 @@ /dts-v1/; /plugin/; -/ { - #include - #include - #include +#include +#include +#include +/ { compatible = "brcm,bcm2835", "brcm,bcm2709", "brcm,bcm2711"; +}; - fragment@0 { +&{/} { + ref_clk2: ref_clk_2 { + compatible = "fixed-clock"; + #clock-cells = <1>; - target-path = "/"; - __overlay__ { + clock-frequency = <10000000>; + clock-output-names = "Ref-B"; + }; - ref_clk2: ref_clk_2 { - compatible = "fixed-clock"; - #clock-cells = <1>; + ref_clk3: ref_clk_3 { + compatible = "fixed-clock"; + #clock-cells = <1>; - clock-frequency = <10000000>; - clock-output-names = "Ref-B"; - }; + clock-frequency = <1>; + clock-output-names = "Ref-BB"; + }; - ref_clk3: ref_clk_3 { - compatible = "fixed-clock"; - #clock-cells = <1>; + ref_m1: ref_m1_clk { + compatible = "fixed-clock"; + #clock-cells = <1>; - clock-frequency = <1>; - clock-output-names = "Ref-BB"; - }; + clock-frequency = <50000000>; + clock-output-names = "Ref-M1"; + }; - ref_m1: ref_m1_clk { - compatible = "fixed-clock"; - #clock-cells = <1>; + hmc_ref_clk0: hmc_ref_clk_0 { + compatible = "fixed-clock"; + #clock-cells = <1>; - clock-frequency = <50000000>; - clock-output-names = "Ref-M1"; - }; + clock-frequency = <10000000>; + clock-output-names = "HMC-REF_CLKIN0"; + }; - hmc_ref_clk0: hmc_ref_clk_0 { - compatible = "fixed-clock"; - #clock-cells = <1>; + hmc_ref_clk1: hmc_ref_clk_1 { + compatible = "fixed-clock"; + #clock-cells = <1>; - clock-frequency = <10000000>; - clock-output-names = "HMC-REF_CLKIN0"; - }; + clock-frequency = <10000000>; + clock-output-names = "HMC-REF_CLKIN1"; + }; - hmc_ref_clk1: hmc_ref_clk_1 { - compatible = "fixed-clock"; - #clock-cells = <1>; + hmc_ref_clk3: hmc_ref_clk_3 { + compatible = "fixed-clock"; + #clock-cells = <1>; - clock-frequency = <10000000>; - clock-output-names = "HMC-REF_CLKIN1"; - }; + clock-frequency = <40000000>; + clock-output-names = "HMC-REF_CLKIN3"; + }; +}; - hmc_ref_clk3: hmc_ref_clk_3 { - compatible = "fixed-clock"; - #clock-cells = <1>; +&spidev0 { + status = "disabled"; +}; - clock-frequency = <40000000>; - clock-output-names = "HMC-REF_CLKIN3"; - }; +&spidev1 { + status = "disabled"; +}; + +&gpio { + gpio_overrides: gpio_overrides { + /* GPIO_4_HMC7044_CAR - 4 + * GPIO_1_HMC7044_CAR - 17 + * GPIO_2_HMC7044_CAR - 27 + * GPIO_3_HMC7044_CAR - 22 + * RESETB_AD9545_PI - 25 + * RESET_HMC7044_CAR_PI - 5 + * VCXO_SELECT_PI - 6 + * GPIO19_PI - 19 + * GPIO26_PI - 26 + * GPIO23_PI - 16 - SYNC Enable + */ + + pin-25-reset-high { + pins = "gpio25"; + function = "gpio_out"; + bias-pull-up; + output-high; + export; }; - }; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + pin-5-reset-low { + pins = "gpio5"; + function = "gpio_out"; + bias-pull-down; }; - }; - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; + pin-6-vcxo-select { + pins = "gpio6"; + function = "gpio_out"; + /* GPIO 6: + * 0 - For the 100 MHz VCXO to HMC7044: + * bias-pull-down; + * + * 1 - For the 122.88 MHz VCXO to HMC7044: + * bias-pull-up; + * output-high; + */ + + bias-pull-down; + + export; }; - }; - fragment@3 { - target = <&gpio>; - __overlay__ { - gpio_overrides: gpio_overrides { - /* GPIO_4_HMC7044_CAR - 4 - * GPIO_1_HMC7044_CAR - 17 - * GPIO_2_HMC7044_CAR - 27 - * GPIO_3_HMC7044_CAR - 22 - * RESETB_AD9545_PI - 25 - * RESET_HMC7044_CAR_PI - 5 - * VCXO_SELECT_PI - 6 - * GPIO19_PI - 19 - * GPIO26_PI - 26 - * GPIO23_PI - 16 - SYNC Enable - */ - - pin-25-reset-high { - pins = "gpio25"; - function = "gpio_out"; - bias-pull-up; - output-high; - export; - }; - - pin-5-reset-low { - pins = "gpio5"; - function = "gpio_out"; - bias-pull-down; - }; - - pin-6-vcxo-select { - pins = "gpio6"; - function = "gpio_out"; - /* GPIO 6: - * 0 - For the 100 MHz VCXO to HMC7044: - * bias-pull-down; - * - * 1 - For the 122.88 MHz VCXO to HMC7044: - * bias-pull-up; - * output-high; - */ - - bias-pull-down; - - export; - }; - - pin-32-red_led { - pins = "gpio12"; - function = "gpio_out"; - bias-pull-up; - output-high; - export; - }; - - pin-36-green_led { - pins = "gpio16"; - function = "gpio_out"; - bias-pull-up; - export; - }; - - pin-16-sync-en { - pins = "gpio23"; - function = "gpio_out"; - bias-pull-down; - export; - }; - }; + pin-32-red_led { + pins = "gpio12"; + function = "gpio_out"; + bias-pull-up; + output-high; + export; + }; + + pin-36-green_led { + pins = "gpio16"; + function = "gpio_out"; + bias-pull-up; + export; + }; + + pin-16-sync-en { + pins = "gpio23"; + function = "gpio_out"; + bias-pull-down; + export; }; }; +}; + +&spi0 { + compatible = "brcm,bcm2835-spi"; + + #address-cells = <0x1>; + #size-cells = <0>; + status = "okay"; + + ad9545_clock: ad9545@0 { + compatible = "adi,ad9545"; + reg = <0>; + + #address-cells = <1>; + #size-cells = <0>; + + /* + * Bind our pinctrl state to the first clock + * provider we probe so it's applied before them. + */ + pinctrl-0 = <&gpio_overrides>; + pinctrl-names = "default"; + + adi,ref-crystal; + adi,ref-frequency-hz = <49152000>; + spi-max-frequency = <1000000>; + + clock-names = "Ref-B", "Ref-BB", "Ref-M1"; + clocks = <&ref_clk2 2>, <&ref_clk3 3>, <&ref_m1 1>; + + #clock-cells = <2>; + assigned-clocks = <&ad9545_clock AD9545_CLK_NCO AD9545_NCO0>, + <&ad9545_clock AD9545_CLK_PLL AD9545_PLL0>, + <&ad9545_clock AD9545_CLK_PLL AD9545_PLL1>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q0A>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q0B>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q1A>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q1B>, + <&ad9545_clock AD9545_CLK_AUX_TDC AD9545_CLK_AUX_TDC0>; + assigned-clock-rates = <10000>, + <1400000000>, + <1800000000>, + <10000000>, + <10000000>, + <10000000>, + <10000000>, + <200000>; + assigned-clock-nshot = <0>, <0>, <0>, <0>, <0>, <0>, <1>, <0>; + + aux-tdc-clk@0 { + reg = <0>; + adi,pin-nr = <1>; + }; + + aux-dpll@0 { + reg = <0>; + adi,compensation-source = <4>; + adi,aux-dpll-bw-mhz = <50000>; + }; + + /* Ref B*/ + ref-input-clk@2 { + reg = <2>; + adi,single-ended-mode = ; + adi,r-divider-ratio = <50>; + adi,ref-dtol-pbb = <10000000>; + adi,ref-monitor-hysteresis-pbb = <87500>; + adi,ref-validation-timer-ms = <10>; + adi,freq-lock-threshold-ps = <2000>; + adi,phase-lock-threshold-ps = <2000>; + adi,freq-lock-fill-rate = <20>; + adi,freq-lock-drain-rate = <20>; + adi,phase-lock-fill-rate = <20>; + adi,phase-lock-drain-rate = <20>; + }; + + /* Ref BB*/ + ref-input-clk@3 { + reg = <3>; + adi,single-ended-mode = ; + adi,r-divider-ratio = <1>; + adi,ref-dtol-pbb = <100000>; + adi,ref-monitor-hysteresis-pbb = <12500>; + adi,ref-validation-timer-ms = <1000>; + adi,freq-lock-threshold-ps = <2000>; + adi,phase-lock-threshold-ps = <2000>; + adi,freq-lock-fill-rate = <100>; + adi,freq-lock-drain-rate = <10>; + adi,phase-lock-fill-rate = <100>; + adi,phase-lock-drain-rate = <10>; + }; - fragment@4 { - target = <&spi0>; - __overlay__ { - compatible = "brcm,bcm2835-spi"; + aux-nco-clk@AD9545_NCO0 { + reg = ; + adi,freq-lock-threshold-ps = <0xFFFFFF>; + adi,phase-lock-threshold-ps = <0xFFFFFF>; + }; + + ad9545_apll0: pll-clk@AD9545_PLL0 { + reg = ; - #address-cells = <0x1>; + #address-cells = <1>; #size-cells = <0>; - status = "okay"; - ad9545_clock: ad9545@0 { - compatible = "adi,ad9545"; + /* Uncoment below for Internal Zero-Delay operation: */ + /* + * adi,pll-internal-zero-delay-feedback = ; + * adi,pll-internal-zero-delay-feedback-hz = <10000000>; + * adi,pll-slew-rate-limit-ps = <4000000000>; + */ + profile@0 { reg = <0>; + adi,pll-source = <3>; + adi,profile-priority = <0>; + adi,pll-loop-bandwidth-uhz = <50000>; - #address-cells = <1>; - #size-cells = <0>; - - /* - * Bind our pinctrl state to the first clock - * provider we probe so it's applied before them. - */ - pinctrl-0 = <&gpio_overrides>; - pinctrl-names = "default"; - - adi,ref-crystal; - adi,ref-frequency-hz = <49152000>; - spi-max-frequency = <1000000>; - - clock-names = "Ref-B", "Ref-BB", "Ref-M1"; - clocks = <&ref_clk2 2>, <&ref_clk3 3>, <&ref_m1 1>; - - #clock-cells = <2>; - assigned-clocks = <&ad9545_clock AD9545_CLK_NCO AD9545_NCO0>, - <&ad9545_clock AD9545_CLK_PLL AD9545_PLL0>, - <&ad9545_clock AD9545_CLK_PLL AD9545_PLL1>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q0A>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q0B>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q1A>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q1B>, - <&ad9545_clock AD9545_CLK_AUX_TDC AD9545_CLK_AUX_TDC0>; - assigned-clock-rates = <10000>, - <1400000000>, - <1800000000>, - <10000000>, - <10000000>, - <10000000>, - <10000000>, - <200000>; - assigned-clock-nshot = <0>, <0>, <0>, <0>, <0>, <0>, <1>, <0>; - - aux-tdc-clk@0 { - reg = <0>; - adi,pin-nr = <1>; - }; - - aux-dpll@0 { - reg = <0>; - adi,compensation-source = <4>; - adi,aux-dpll-bw-mhz = <50000>; - }; - - /* Ref B*/ - ref-input-clk@2 { - reg = <2>; - adi,single-ended-mode = ; - adi,r-divider-ratio = <50>; - adi,ref-dtol-pbb = <10000000>; - adi,ref-monitor-hysteresis-pbb = <87500>; - adi,ref-validation-timer-ms = <10>; - adi,freq-lock-threshold-ps = <2000>; - adi,phase-lock-threshold-ps = <2000>; - adi,freq-lock-fill-rate = <20>; - adi,freq-lock-drain-rate = <20>; - adi,phase-lock-fill-rate = <20>; - adi,phase-lock-drain-rate = <20>; - }; - - /* Ref BB*/ - ref-input-clk@3 { - reg = <3>; - adi,single-ended-mode = ; - adi,r-divider-ratio = <1>; - adi,ref-dtol-pbb = <100000>; - adi,ref-monitor-hysteresis-pbb = <12500>; - adi,ref-validation-timer-ms = <1000>; - adi,freq-lock-threshold-ps = <2000>; - adi,phase-lock-threshold-ps = <2000>; - adi,freq-lock-fill-rate = <100>; - adi,freq-lock-drain-rate = <10>; - adi,phase-lock-fill-rate = <100>; - adi,phase-lock-drain-rate = <10>; - }; - - aux-nco-clk@AD9545_NCO0 { - reg = ; - adi,freq-lock-threshold-ps = <0xFFFFFF>; - adi,phase-lock-threshold-ps = <0xFFFFFF>; - }; - - ad9545_apll0: pll-clk@AD9545_PLL0 { - reg = ; - - #address-cells = <1>; - #size-cells = <0>; - - /* Uncoment below for Internal Zero-Delay operation: */ - /* - * adi,pll-internal-zero-delay-feedback = ; - * adi,pll-internal-zero-delay-feedback-hz = <10000000>; - * adi,pll-slew-rate-limit-ps = <4000000000>; - */ - profile@0 { - reg = <0>; - adi,pll-source = <3>; - adi,profile-priority = <0>; - adi,pll-loop-bandwidth-uhz = <50000>; - - adi,fast-acq-excess-bw = <8>; - adi,fast-acq-timeout-ms = <10000>; - adi,fast-acq-lock-settle-ms = <1000>; - }; - - profile@1 { - reg = <1>; - adi,pll-source = <2>; - adi,profile-priority = <10>; - adi,pll-loop-bandwidth-uhz = <200000000>; - }; - - }; - - ad9545_apll1: pll-clk@AD9545_PLL1 { - reg = ; - - #address-cells = <1>; - #size-cells = <0>; - - /* Uncoment below for internal zero-delay operation */ - /* - * adi,pll-internal-zero-delay-feedback = ; - * adi,pll-internal-zero-delay-feedback-hz = <10000000>; - * adi,pll-slew-rate-limit-ps = <4000000000>; - */ - profile@0 { - reg = <0>; - adi,pll-source = <3>; - adi,profile-priority = <0>; - adi,pll-loop-bandwidth-uhz = <50000>; - - adi,fast-acq-excess-bw = <8>; - adi,fast-acq-timeout-ms = <10000>; - adi,fast-acq-lock-settle-ms = <1000>; - }; - - profile@1 { - reg = <1>; - adi,pll-source = <2>; - adi,profile-priority = <10>; - adi,pll-loop-bandwidth-uhz = <200000000>; - }; - }; - - /* Output Q0A CML -> J27 J28 */ - output-clk@AD9545_Q0A { - reg = ; - adi,output-mode = ; - adi,current-source-microamp = <15000>; - }; - - output-clk@AD9545_Q0B { - reg = ; - adi,output-mode = ; - adi,current-source-microamp = <15000>; - }; - - /* Output Q1A -> CLK_IN 2 of HMC7044 */ - output-clk@AD9545_Q1A { - reg = ; - adi,output-mode = ; - adi,current-source-microamp = <15000>; - }; - - /* Output Q1B -> SYNC of HMC7044 */ - output-clk@AD9545_Q1B { - reg = ; - adi,output-mode = ; - adi,current-source-microamp = <15000>; - }; + adi,fast-acq-excess-bw = <8>; + adi,fast-acq-timeout-ms = <10000>; + adi,fast-acq-lock-settle-ms = <1000>; }; - hmc7044_fmc: hmc7044@1 { - reg = <0x1>; - - #address-cells = <1>; - #size-cells = <0>; - #clock-cells = <1>; - - compatible = "adi,hmc7044"; - spi-max-frequency = <1000000>; - - adi,pll1-clkin-frequencies = <10000000 10000000 10000000 40000000>; - - /* - * HMC7044 Input Clocking Priorities: - * CLKIN2 -> CLKIN0 -> CLKIN1 -> CLKIN3 - * Where: - * - CLKIN2 - AD9545 - * - CLKIN0 - J23/J24 - * - CLKIN1 - J25/J26 - * - CLKIN3 - 40 MHz or 38.4 MHz TCXO - */ - adi,pll1-ref-prio-ctrl = <0xD2>; - adi,pll1-ref-autorevert-enable; - - adi,pll1-loop-bandwidth-hz = <200>; - - /* All HMC7044 inputs are AC Coupled */ - adi,clkin0-buffer-mode = <0x07>; - adi,clkin1-buffer-mode = <0x07>; - adi,clkin2-buffer-mode = <0x07>; - adi,clkin3-buffer-mode = <0x07>; - - clocks = <&hmc_ref_clk0 0>, - <&hmc_ref_clk1 0>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q1A>, - <&hmc_ref_clk3 0>, - <&ad9545_clock AD9545_CLK_OUT AD9545_Q1B>; - clock-names = "clkin0", "clkin1", "clkin2", "clkin3", "sync_clk"; - - /* depends on VCXO_SELECT_PI */ - adi,vcxo-frequency = <100000000>; - adi,pll2-output-frequency = <2600000000>; - adi,sysref-timer-divider = <1024>; - adi,pulse-generator-mode = ; - - adi,oscin-buffer-mode = <0x15>; - adi,sync-pin-mode = ; - - adi,gpi-controls = <0x00 0x00 0x00 0x00>; - adi,gpo-controls = <0x1f 0x2b 0x00 0x00>; - - clock-output-names = "HMC7044_OUT0", "HMC7044_OUT1", - "HMC7044_OUT2", "HMC7044_OUT3", - "HMC7044_OUT4", "HMC7044_OUT5", - "HMC7044_OUT6", "HMC7044_OUT7", - "HMC7044_OUT8", "HMC7044_OUT9", - "HMC7044_OUT10", "HMC7044_OUT11", - "HMC7044_OUT12", "HMC7044_OUT13"; - - /* - * Channels in CMOS mode should configure - * adi,driver-impedance-mode to: - * 0 - no output - * 1 - N output - * 2 - P ourput - * 3 - both - * Depending on the desired output pin. - */ - channel@0 { - reg = <0>; - adi,extended-name = "HMC7044_OUT0"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@1 { - reg = <1>; - adi,extended-name = "HMC7044_OUT1"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@2 { - reg = <2>; - adi,extended-name = "HMC7044_OUT2"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@3 { - reg = <3>; - adi,extended-name = "HMC7044_OUT3"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@4 { - reg = <4>; - adi,extended-name = "HMC7044_OUT4"; - adi,divider = <260>; - adi,driver-mode = ; - adi,driver-impedance-mode = <3>; - }; - - channel@5 { - reg = <5>; - adi,extended-name = "HMC7044_OUT5"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@6 { - reg = <6>; - adi,extended-name = "HMC7044_OUT6"; - adi,divider = <260>; - adi,driver-mode = ; - adi,driver-impedance-mode = <3>; - }; - - channel@7 { - reg = <7>; - adi,extended-name = "HMC7044_OUT7"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@8 { - reg = <8>; - adi,extended-name = "HMC7044_OUT8"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@9 { - reg = <9>; - adi,extended-name = "HMC7044_OUT9"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@10 { - reg = <10>; - adi,extended-name = "HMC7044_OUT10"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@11 { - reg = <11>; - adi,extended-name = "HMC7044_OUT11"; - adi,divider = <260>; - adi,driver-mode = ; - adi,driver-impedance-mode = <3>; - }; - - channel@12 { - reg = <12>; - adi,extended-name = "HMC7044_OUT12"; - adi,divider = <260>; - adi,driver-mode = ; - }; - - channel@13 { - reg = <13>; - adi,extended-name = "HMC7044_OUT13"; - adi,divider = <260>; - adi,driver-mode = ; - adi,driver-impedance-mode = <3>; - }; + profile@1 { + reg = <1>; + adi,pll-source = <2>; + adi,profile-priority = <10>; + adi,pll-loop-bandwidth-uhz = <200000000>; }; + }; - }; - fragment@5 { - target-path = "/"; - __overlay__ { - power_ctrl: power_ctrl { - compatible = "gpio-poweroff"; - gpios = <&gpio 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - input; - force; + ad9545_apll1: pll-clk@AD9545_PLL1 { + reg = ; + + #address-cells = <1>; + #size-cells = <0>; + + /* Uncoment below for internal zero-delay operation */ + /* + * adi,pll-internal-zero-delay-feedback = ; + * adi,pll-internal-zero-delay-feedback-hz = <10000000>; + * adi,pll-slew-rate-limit-ps = <4000000000>; + */ + profile@0 { + reg = <0>; + adi,pll-source = <3>; + adi,profile-priority = <0>; + adi,pll-loop-bandwidth-uhz = <50000>; + + adi,fast-acq-excess-bw = <8>; + adi,fast-acq-timeout-ms = <10000>; + adi,fast-acq-lock-settle-ms = <1000>; }; + + profile@1 { + reg = <1>; + adi,pll-source = <2>; + adi,profile-priority = <10>; + adi,pll-loop-bandwidth-uhz = <200000000>; + }; + }; + + /* Output Q0A CML -> J27 J28 */ + output-clk@AD9545_Q0A { + reg = ; + adi,output-mode = ; + adi,current-source-microamp = <15000>; + }; + + output-clk@AD9545_Q0B { + reg = ; + adi,output-mode = ; + adi,current-source-microamp = <15000>; + }; + + /* Output Q1A -> CLK_IN 2 of HMC7044 */ + output-clk@AD9545_Q1A { + reg = ; + adi,output-mode = ; + adi,current-source-microamp = <15000>; + }; + + /* Output Q1B -> SYNC of HMC7044 */ + output-clk@AD9545_Q1B { + reg = ; + adi,output-mode = ; + adi,current-source-microamp = <15000>; }; }; - fragment@6 { - target-path = "/soc"; - __overlay__ { - shutdown_button: shutdown_button@3 { - compatible = "gpio-keys"; - status = "okay"; - - button: shutdown { - label = "shutdown"; - linux,code = <116>; /* KEY_POWER */ - gpios = <&gpio 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - debounce-interval = <100>; - }; - }; + hmc7044_fmc: hmc7044@1 { + reg = <0x1>; + + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + compatible = "adi,hmc7044"; + spi-max-frequency = <1000000>; + + adi,pll1-clkin-frequencies = <10000000 10000000 10000000 40000000>; + + /* + * HMC7044 Input Clocking Priorities: + * CLKIN2 -> CLKIN0 -> CLKIN1 -> CLKIN3 + * Where: + * - CLKIN2 - AD9545 + * - CLKIN0 - J23/J24 + * - CLKIN1 - J25/J26 + * - CLKIN3 - 40 MHz or 38.4 MHz TCXO + */ + adi,pll1-ref-prio-ctrl = <0xD2>; + adi,pll1-ref-autorevert-enable; + + adi,pll1-loop-bandwidth-hz = <200>; + + /* All HMC7044 inputs are AC Coupled */ + adi,clkin0-buffer-mode = <0x07>; + adi,clkin1-buffer-mode = <0x07>; + adi,clkin2-buffer-mode = <0x07>; + adi,clkin3-buffer-mode = <0x07>; + + clocks = <&hmc_ref_clk0 0>, + <&hmc_ref_clk1 0>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q1A>, + <&hmc_ref_clk3 0>, + <&ad9545_clock AD9545_CLK_OUT AD9545_Q1B>; + clock-names = "clkin0", "clkin1", "clkin2", "clkin3", "sync_clk"; + + /* depends on VCXO_SELECT_PI */ + adi,vcxo-frequency = <100000000>; + adi,pll2-output-frequency = <2600000000>; + adi,sysref-timer-divider = <1024>; + adi,pulse-generator-mode = ; + + adi,oscin-buffer-mode = <0x15>; + adi,sync-pin-mode = ; + + adi,gpi-controls = <0x00 0x00 0x00 0x00>; + adi,gpo-controls = <0x1f 0x2b 0x00 0x00>; + + clock-output-names = "HMC7044_OUT0", "HMC7044_OUT1", + "HMC7044_OUT2", "HMC7044_OUT3", + "HMC7044_OUT4", "HMC7044_OUT5", + "HMC7044_OUT6", "HMC7044_OUT7", + "HMC7044_OUT8", "HMC7044_OUT9", + "HMC7044_OUT10", "HMC7044_OUT11", + "HMC7044_OUT12", "HMC7044_OUT13"; + + /* + * Channels in CMOS mode should configure + * adi,driver-impedance-mode to: + * 0 - no output + * 1 - N output + * 2 - P ourput + * 3 - both + * Depending on the desired output pin. + */ + channel@0 { + reg = <0>; + adi,extended-name = "HMC7044_OUT0"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@1 { + reg = <1>; + adi,extended-name = "HMC7044_OUT1"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@2 { + reg = <2>; + adi,extended-name = "HMC7044_OUT2"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@3 { + reg = <3>; + adi,extended-name = "HMC7044_OUT3"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@4 { + reg = <4>; + adi,extended-name = "HMC7044_OUT4"; + adi,divider = <260>; + adi,driver-mode = ; + adi,driver-impedance-mode = <3>; + }; + + channel@5 { + reg = <5>; + adi,extended-name = "HMC7044_OUT5"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@6 { + reg = <6>; + adi,extended-name = "HMC7044_OUT6"; + adi,divider = <260>; + adi,driver-mode = ; + adi,driver-impedance-mode = <3>; + }; + + channel@7 { + reg = <7>; + adi,extended-name = "HMC7044_OUT7"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@8 { + reg = <8>; + adi,extended-name = "HMC7044_OUT8"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@9 { + reg = <9>; + adi,extended-name = "HMC7044_OUT9"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@10 { + reg = <10>; + adi,extended-name = "HMC7044_OUT10"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@11 { + reg = <11>; + adi,extended-name = "HMC7044_OUT11"; + adi,divider = <260>; + adi,driver-mode = ; + adi,driver-impedance-mode = <3>; + }; + + channel@12 { + reg = <12>; + adi,extended-name = "HMC7044_OUT12"; + adi,divider = <260>; + adi,driver-mode = ; + }; + + channel@13 { + reg = <13>; + adi,extended-name = "HMC7044_OUT13"; + adi,divider = <260>; + adi,driver-mode = ; + adi,driver-impedance-mode = <3>; }; }; +}; - fragment@7 { - target = <&i2c1>; - __overlay__ { - compatible = "brcm,bcm2711-i2c"; - status = "okay"; +&{/} { + power_ctrl: power_ctrl { + compatible = "gpio-poweroff"; + gpios = <&gpio 21 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + input; + force; + }; +}; - #address-cells = <1>; - #size-cells = <0>; +&{/soc} { + shutdown_button: shutdown_button@3 { + compatible = "gpio-keys"; + status = "okay"; - /* Temperature sensor that monitors HMC7044 */ - adt7422@48 { - compatible = "adi,adt7422"; - reg = <0x48>; - }; + button: shutdown { + label = "shutdown"; + linux,code = <116>; /* KEY_POWER */ + gpios = <&gpio 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + debounce-interval = <100>; }; }; }; + +&i2c1 { + compatible = "brcm,bcm2711-i2c"; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + + /* Temperature sensor that monitors HMC7044 */ + adt7422@48 { + compatible = "adi,adt7422"; + reg = <0x48>; + }; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ad9834-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ad9834-overlay.dts index 0696ebb5437250..d3dc2685fae841 100644 --- a/arch/arm/boot/dts/overlays/rpi-ad9834-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ad9834-overlay.dts @@ -4,43 +4,36 @@ / { compatible = "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - vcc: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; +&{/} { + vcc: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; + }; - osc: oscillator { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <25000000>; - }; - }; + osc: oscillator { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <25000000>; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ad9833@0{ - #clock-cells = <0>; - compatible = "ad9833"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpol; - clocks = <&osc>; - vcc-supply = <&vcc>; - }; - }; + ad9833@0 { + #clock-cells = <0>; + compatible = "ad9833"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + clocks = <&osc>; + vcc-supply = <&vcc>; }; }; - diff --git a/arch/arm/boot/dts/overlays/rpi-ada4250-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ada4250-overlay.dts index 2aa50aeae11113..81add3cf08514f 100644 --- a/arch/arm/boot/dts/overlays/rpi-ada4250-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ada4250-overlay.dts @@ -4,42 +4,31 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - avdd: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "avdd"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - }; - }; +&{/} { + avdd: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "avdd"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; }; +}; - fragment@2 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ada4250@0{ - compatible = "adi,ada4250"; - reg = <0>; - spi-max-frequency = <1000000>; - avdd-supply = <&avdd>; - }; - }; + ada4250@0 { + compatible = "adi,ada4250"; + reg = <0>; + spi-max-frequency = <1000000>; + avdd-supply = <&avdd>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adar1000-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adar1000-overlay.dts index e9b8c64aab8835..aa8c440e113c43 100644 --- a/arch/arm/boot/dts/overlays/rpi-adar1000-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adar1000-overlay.dts @@ -4,54 +4,45 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adar1000@0 { - compatible = "adi,adar1000"; - reg = <0>; - spi-max-frequency = <1000000>; + adar1000@0 { + compatible = "adi,adar1000"; + reg = <0>; + spi-max-frequency = <1000000>; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - adar1000_0@0 { - reg = <0>; - label = "BEAM0"; - adi,phasetable-name = "adar1000_std_phasetable"; - }; - adar1000_1@1 { - reg = <1>; - label = "BEAM1"; - }; - adar1000_2@2 { - reg = <2>; - label = "BEAM2"; - }; - adar1000_3@3 { - reg = <3>; - label = "BEAM3"; - }; - }; + adar1000_0@0 { + reg = <0>; + label = "BEAM0"; + adi,phasetable-name = "adar1000_std_phasetable"; }; - }; - - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + adar1000_1@1 { + reg = <1>; + label = "BEAM1"; }; - }; - - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; + adar1000_2@2 { + reg = <2>; + label = "BEAM2"; + }; + adar1000_3@3 { + reg = <3>; + label = "BEAM3"; }; }; }; + +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-adau1472-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adau1472-overlay.dts index 4c05a24dec1d56..79416e2db32a51 100644 --- a/arch/arm/boot/dts/overlays/rpi-adau1472-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adau1472-overlay.dts @@ -10,85 +10,76 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2711"; +}; + +&sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "ADAU1472"; + + status="okay"; + + capture_link: simple-audio-card,dai-link@0 { + format = "i2s"; + + bitclock-master = <&r_codec_dai>; + frame-master = <&r_codec_dai>; - fragment@0 { - target = <&sound>; - __overlay__ { - compatible = "simple-audio-card"; - simple-audio-card,name = "ADAU1472"; - - status="okay"; - - capture_link: simple-audio-card,dai-link@0 { - format = "i2s"; - - bitclock-master = <&r_codec_dai>; - frame-master = <&r_codec_dai>; - - r_cpu_dai: cpu { - sound-dai = <&i2s>; - /* - * TDM slot configuration - * BCLK ratio: 64 x Fs (2 x 32 bit) - */ - dai-tdm-slot-num = <2>; - dai-tdm-slot-width = <32>; - }; - - r_codec_dai: codec { - sound-dai = <&codec_in>; - }; - }; - - playback_link: simple-audio-card,dai-link@1 { - format = "i2s"; - - bitclock-master = <&p_codec_dai>; - frame-master = <&p_codec_dai>; - - p_cpu_dai: cpu { - sound-dai = <&i2s>; - /* - * TDM slot configuration - * BCLK ratio: 64 x Fs (2 x 32 bit) - */ - dai-tdm-slot-num = <2>; - dai-tdm-slot-width = <32>; - }; - - p_codec_dai: codec { - sound-dai = <&codec_out>; - }; - }; + r_cpu_dai: cpu { + sound-dai = <&i2s>; + /* + * TDM slot configuration + * BCLK ratio: 64 x Fs (2 x 32 bit) + */ + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; }; - }; - fragment@1 { - target-path = "/"; - __overlay__ { - codec_in: spdif_receiver { - #address-cells = <0>; - #size-cells = <0>; - #sound-dai-cells = <0>; - compatible = "linux,spdif-dir"; - status = "okay"; - }; - - codec_out: spdif-transmitter { - #address-cells = <0>; - #size-cells = <0>; - #sound-dai-cells = <0>; - compatible = "linux,spdif-dit"; - status = "okay"; - }; + r_codec_dai: codec { + sound-dai = <&codec_in>; }; }; - fragment@2 { - target = <&i2s>; - __overlay__ { - #sound-dai-cells = <0>; - status = "okay"; + playback_link: simple-audio-card,dai-link@1 { + format = "i2s"; + + bitclock-master = <&p_codec_dai>; + frame-master = <&p_codec_dai>; + + p_cpu_dai: cpu { + sound-dai = <&i2s>; + /* + * TDM slot configuration + * BCLK ratio: 64 x Fs (2 x 32 bit) + */ + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; }; + + p_codec_dai: codec { + sound-dai = <&codec_out>; + }; + }; +}; + +&{/} { + codec_in: spdif_receiver { + #address-cells = <0>; + #size-cells = <0>; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dir"; + status = "okay"; }; + + codec_out: spdif-transmitter { + #address-cells = <0>; + #size-cells = <0>; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + }; +}; + +&i2s { + #sound-dai-cells = <0>; + status = "okay"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adau1761-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adau1761-overlay.dts index b728ab697ead44..678e56c5ea10be 100644 --- a/arch/arm/boot/dts/overlays/rpi-adau1761-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adau1761-overlay.dts @@ -6,83 +6,71 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&clocks>; - __overlay__ { - adau1761_mclk: oscillator { - compatible = "fixed-clock"; - status = "okay"; - #clock-cells=<0>; - clock-frequency = <12288000>; - clock-output-names = "adau1761_mclk"; - }; - }; + __overrides__ { + card-name = <&sound>, "simple-audio-card,name"; }; +}; - fragment@1 { - target = <&i2s>; - __overlay__ { - status = "okay"; - }; +&clocks { + adau1761_mclk: oscillator { + compatible = "fixed-clock"; + status = "okay"; + #clock-cells=<0>; + clock-frequency = <12288000>; + clock-output-names = "adau1761_mclk"; }; +}; + +&i2s { + status = "okay"; +}; - fragment@2 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adau1761_codec: adau1761-codec@38 { - compatible = "adi,adau1761"; - status = "okay"; - reg = <0x38>; - #sound-dai-cells = <0>; - clock-names = "mclk"; - clocks = <&adau1761_mclk>; - }; - }; + adau1761_codec: adau1761-codec@38 { + compatible = "adi,adau1761"; + status = "okay"; + reg = <0x38>; + #sound-dai-cells = <0>; + clock-names = "mclk"; + clocks = <&adau1761_mclk>; }; +}; - fragment@3 { - target = <&sound>; - sound_overlay: __overlay__ { - compatible = "simple-audio-card"; - status = "okay"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "EVAL-ADAU1761Z"; - simple-audio-card,bitclock-master = <&dailink0_master>; - simple-audio-card,frame-master = <&dailink0_master>; - simple-audio-card,widgets = - "Microphone", "Mic In", - "Headphone", "Headphone Out", - "Line", "Line In", - "Line", "Line Out"; - simple-audio-card,routing = - "Line Out", "LOUT", - "Line Out", "ROUT", - "Headphone Out", "LHP", - "Headphone Out", "RHP", - "Mic In", "MICBIAS", - "LINN", "Mic In", - "RINN", "Mic In", - "LINP", "Mic In", - "RINP", "Mic In", - "LAUX", "Line In", - "RAUX", "Line In"; - simple-audio-card,cpu { - /* so that bclk is 64x FS */ - dai-tdm-slot-num = <2>; - dai-tdm-slot-width = <32>; - sound-dai = <&i2s>; - }; - dailink0_master: simple-audio-card,codec { - sound-dai = <&adau1761_codec>; - }; - }; +&sound { + compatible = "simple-audio-card"; + status = "okay"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "EVAL-ADAU1761Z"; + simple-audio-card,bitclock-master = <&dailink0_master>; + simple-audio-card,frame-master = <&dailink0_master>; + simple-audio-card,widgets = + "Microphone", "Mic In", + "Headphone", "Headphone Out", + "Line", "Line In", + "Line", "Line Out"; + simple-audio-card,routing = + "Line Out", "LOUT", + "Line Out", "ROUT", + "Headphone Out", "LHP", + "Headphone Out", "RHP", + "Mic In", "MICBIAS", + "LINN", "Mic In", + "RINN", "Mic In", + "LINP", "Mic In", + "RINP", "Mic In", + "LAUX", "Line In", + "RAUX", "Line In"; + simple-audio-card,cpu { + /* so that bclk is 64x FS */ + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + sound-dai = <&i2s>; }; - - __overrides__ { - card-name = <&sound_overlay>,"simple-audio-card,name"; + dailink0_master: simple-audio-card,codec { + sound-dai = <&adau1761_codec>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adf4159-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adf4159-overlay.dts index 5d17be6d9d0296..aecf5f042d1ebc 100644 --- a/arch/arm/boot/dts/overlays/rpi-adf4159-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adf4159-overlay.dts @@ -12,93 +12,81 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - clkin: clock@0 { - compatible = "fixed-clock"; - clock-frequency = <100000000>; - clock-output-names = "adf4159_ext_refclk"; - #clock-cells = <0>; - }; - }; +&{/} { + clkin: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <100000000>; + clock-output-names = "adf4159_ext_refclk"; + #clock-cells = <0>; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adf4159@0 { - compatible = "adi,adf4159"; - reg = <0x0>; - spi-max-frequency = <12500000>; - /* Clocks */ - clocks = <&clkin>; - clock-names = "clkin"; - clock-output-names = "rf_out"; - #clock-cells = <0>; - adi,power-up-frequency-hz = /bits/ 64 <6000000000>; - adi,charge-pump-current-microamp = <900>; - //adi,charge-pump-negative-bleed-enable; - adi,clk1-div = <100>; - adi,clk2-timer-div = <0>; - adi,clk2-timer-div-2 = <0>; - adi,clk-div-mode = <0>; - //adi,cycle-slip-reduction-enable; - //adi,delay-clk-sel-pfd-x-clk1-enable; - //adi,delay-start-enable; - adi,delay-start-word = <0>; - adi,deviation = <1000>; - adi,deviation-2 = <0>; - adi,deviation-offset = <1>; - //adi,dual-ramp-enable; - //adi,fast-ramp-enable; - //adi,fsk-modulation-enable; - //adi,fsk-ramp-enable; - adi,interrupt-mode-select = <0>; - //adi,le-sync-refin-enable; - //adi,lock-detect-precision-6ns-enable; - adi,muxout-select = ; - adi,negative-bleed-current-microamp = <0>; - //adi,parabolic-ramp-enable; - adi,phase = <0>; - //adi,phase-detector-polarity-positive-enable; - //adi,powerdown-enable; - //adi,psk-modulation-enable; - //adi,ramp-dealy-fl-enable; - //adi,ramp-delay-enable; - //adi,ramp-enable; - adi,ramp-mode-select = <0>; - adi,ramp-status-mode = ; - //adi,reference-div2-enable; - adi,reference-div-factor = <1>; - //adi,reference-doubler-enable; - //adi,single-full-triangle-enable; - adi,step-word = <0>; - adi,step-word-2 = <0>; - //adi,txdata-invert-enable; - //adi,txdata-ramp-clk-txdata-enable; - //adi,txdata-trigger-delay-enable; - //adi,txdata-trigger-enable; - }; - }; + adf4159@0 { + compatible = "adi,adf4159"; + reg = <0x0>; + spi-max-frequency = <12500000>; + /* Clocks */ + clocks = <&clkin>; + clock-names = "clkin"; + clock-output-names = "rf_out"; + #clock-cells = <0>; + adi,power-up-frequency-hz = /bits/ 64 <6000000000>; + adi,charge-pump-current-microamp = <900>; + //adi,charge-pump-negative-bleed-enable; + adi,clk1-div = <100>; + adi,clk2-timer-div = <0>; + adi,clk2-timer-div-2 = <0>; + adi,clk-div-mode = <0>; + //adi,cycle-slip-reduction-enable; + //adi,delay-clk-sel-pfd-x-clk1-enable; + //adi,delay-start-enable; + adi,delay-start-word = <0>; + adi,deviation = <1000>; + adi,deviation-2 = <0>; + adi,deviation-offset = <1>; + //adi,dual-ramp-enable; + //adi,fast-ramp-enable; + //adi,fsk-modulation-enable; + //adi,fsk-ramp-enable; + adi,interrupt-mode-select = <0>; + //adi,le-sync-refin-enable; + //adi,lock-detect-precision-6ns-enable; + adi,muxout-select = ; + adi,negative-bleed-current-microamp = <0>; + //adi,parabolic-ramp-enable; + adi,phase = <0>; + //adi,phase-detector-polarity-positive-enable; + //adi,powerdown-enable; + //adi,psk-modulation-enable; + //adi,ramp-dealy-fl-enable; + //adi,ramp-delay-enable; + //adi,ramp-enable; + adi,ramp-mode-select = <0>; + adi,ramp-status-mode = ; + //adi,reference-div2-enable; + adi,reference-div-factor = <1>; + //adi,reference-doubler-enable; + //adi,single-full-triangle-enable; + adi,step-word = <0>; + adi,step-word-2 = <0>; + //adi,txdata-invert-enable; + //adi,txdata-ramp-clk-txdata-enable; + //adi,txdata-trigger-delay-enable; + //adi,txdata-trigger-enable; }; +}; - fragment@2 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@3 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adf4371-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adf4371-overlay.dts index 1c74558a6760e9..002015dddaef3e 100644 --- a/arch/arm/boot/dts/overlays/rpi-adf4371-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adf4371-overlay.dts @@ -2,35 +2,26 @@ /dts-v1/; /plugin/; -/ { - - fragment@0 { - target-path = "/"; - __overlay__ { - clocks { - adf4371_clkin: clock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <100000000>; // 100MHz - }; - }; +&{/} { + clocks { + adf4371_clkin: clock@0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <100000000>; // 100MHz }; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adf4371@0 { - compatible = "adi,adf4371"; - reg = <0>; - spi-max-frequency = <1000000>; - clocks = <&adf4371_clkin>; - clock-names = "clkin"; - }; - }; + adf4371@0 { + compatible = "adi,adf4371"; + reg = <0>; + spi-max-frequency = <1000000>; + clocks = <&adf4371_clkin>; + clock-names = "clkin"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adgs1408-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adgs1408-overlay.dts index 329a46d3382883..fdf081c709f56c 100644 --- a/arch/arm/boot/dts/overlays/rpi-adgs1408-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adgs1408-overlay.dts @@ -6,42 +6,36 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - adc-mux@3 { - compatible = "io-channel-mux"; - io-channels = <&adc 1>; - io-channel-names = "parent"; - mux-controls = <&mux>; +&{/} { + adc-mux@3 { + compatible = "io-channel-mux"; + io-channels = <&adc 1>; + io-channel-names = "parent"; + mux-controls = <&mux>; - channels = "out_a0", "out_a1", "test0", "test1", - "out_b0", "out_b1", "testb0", "testb1"; - }; - }; + channels = "out_a0", "out_a1", "test0", "test1", + "out_b0", "out_b1", "testb0", "testb1"; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - mux: mux-controller@2 { - compatible = "adi,adgs1408"; - reg = <0>; - spi-max-frequency = <1000000>; - #mux-control-cells = <0>; - }; + mux: mux-controller@2 { + compatible = "adi,adgs1408"; + reg = <0>; + spi-max-frequency = <1000000>; + #mux-control-cells = <0>; + }; - adc: ad7298@3 { - compatible = "ad7298"; - #io-channel-cells = <1>; - spi-max-frequency = <1000000>; - reg = <1>; - }; - }; + adc: ad7298@3 { + compatible = "ad7298"; + #io-channel-cells = <1>; + spi-max-frequency = <1000000>; + reg = <1>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-admv1013-overlay.dts b/arch/arm/boot/dts/overlays/rpi-admv1013-overlay.dts index 8f896dba50d12a..94c127be8b6508 100644 --- a/arch/arm/boot/dts/overlays/rpi-admv1013-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-admv1013-overlay.dts @@ -4,62 +4,48 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - admv1013_lo: clock@0 { - compatible = "fixed-clock"; +&{/} { + clocks { + admv1013_lo: clock@0 { + compatible = "fixed-clock"; - clock-frequency = <100000000>; - clock-output-names = "lo_in"; - #clock-cells = <0>; - }; - }; + clock-frequency = <100000000>; + clock-output-names = "lo_in"; + #clock-cells = <0>; }; }; +}; - fragment@2 { - target-path = "/"; - __overlay__ { - vcm: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "vcm"; - regulator-min-microvolt = <0>; - regulator-max-microvolt = <0>; - regulator-boot-on; - }; - }; +&{/} { + vcm: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vcm"; + regulator-min-microvolt = <0>; + regulator-max-microvolt = <0>; + regulator-boot-on; }; +}; - fragment@3 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - admv1013@0{ - compatible = "adi,admv1013"; - reg = <0>; - spi-max-frequency = <1000000>; - clocks = <&admv1013_lo>; - clock-names = "lo_in"; - clock-scales = <1 5>; - vcm-supply = <&vcm>; - adi,quad-se-mode = <12>; - adi,parity-en; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + admv1013@0 { + compatible = "adi,admv1013"; + reg = <0>; + spi-max-frequency = <1000000>; + clocks = <&admv1013_lo>; + clock-names = "lo_in"; + clock-scales = <1 5>; + vcm-supply = <&vcm>; + adi,quad-se-mode = <12>; + adi,parity-en; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-admv1014-overlay.dts b/arch/arm/boot/dts/overlays/rpi-admv1014-overlay.dts index b1e1e166d0ee2d..3c3f9ee372fa38 100644 --- a/arch/arm/boot/dts/overlays/rpi-admv1014-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-admv1014-overlay.dts @@ -4,65 +4,51 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - admv1014_lo: clock@0 { - compatible = "fixed-clock"; +&{/} { + clocks { + admv1014_lo: clock@0 { + compatible = "fixed-clock"; - clock-frequency = <1000000000>; - clock-output-names = "lo_in"; - #clock-cells = <0>; - }; - }; + clock-frequency = <1000000000>; + clock-output-names = "lo_in"; + #clock-cells = <0>; }; }; +}; - fragment@2 { - target-path = "/"; - __overlay__ { - vcm: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "vcm"; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; - regulator-boot-on; - }; - }; +&{/} { + vcm: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vcm"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-boot-on; }; +}; - fragment@3 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - admv1014@0{ - compatible = "adi,admv1014"; - reg = <0>; - spi-max-frequency = <1000000>; - clocks = <&admv1014_lo>; - clock-names = "lo_in"; - clock-scales = <1 8>; - vcm-supply = <&vcm>; - adi,quad-se-mode = <0>; - adi,parity-en; - adi,p1db-comp = <3>; - adi,det-prog = <4>; - adi,bb-amp-gain-ctrl = <0>; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + admv1014@0 { + compatible = "adi,admv1014"; + reg = <0>; + spi-max-frequency = <1000000>; + clocks = <&admv1014_lo>; + clock-names = "lo_in"; + clock-scales = <1 8>; + vcm-supply = <&vcm>; + adi,quad-se-mode = <0>; + adi,parity-en; + adi,p1db-comp = <3>; + adi,det-prog = <4>; + adi,bb-amp-gain-ctrl = <0>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-admv8818-overlay.dts b/arch/arm/boot/dts/overlays/rpi-admv8818-overlay.dts index 13090d5a71f4cd..2bb798e1864a74 100644 --- a/arch/arm/boot/dts/overlays/rpi-admv8818-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-admv8818-overlay.dts @@ -4,47 +4,36 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - admv8818_rfin: clock@0 { - compatible = "fixed-clock"; +&{/} { + clocks { + admv8818_rfin: clock@0 { + compatible = "fixed-clock"; - clock-frequency = <100000000>; - clock-output-names = "rf_in"; - #clock-cells = <0>; - }; - }; + clock-frequency = <100000000>; + clock-output-names = "rf_in"; + #clock-cells = <0>; }; }; +}; - fragment@2 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - admv8818@0{ - compatible = "adi,admv8818"; - reg = <0>; - spi-max-frequency = <10000000>; - clocks = <&admv8818_rfin>; - clock-scales = <1 50>; - clock-names = "rf_in"; - adi,bw-hz = /bits/ 64 <600000000>; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + admv8818@0 { + compatible = "adi,admv8818"; + reg = <0>; + spi-max-frequency = <10000000>; + clocks = <&admv8818_rfin>; + clock-scales = <1 50>; + clock-names = "rf_in"; + adi,bw-hz = /bits/ 64 <600000000>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adrf6780-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adrf6780-overlay.dts index 733a0fb1efe205..14c642ea01c75d 100644 --- a/arch/arm/boot/dts/overlays/rpi-adrf6780-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adrf6780-overlay.dts @@ -4,45 +4,34 @@ / { compatible = "brcm,bcm2835"; +}; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@1 { - target-path = "/"; - __overlay__ { - clocks { - adrf6780_lo: clock@0 { - compatible = "fixed-clock"; +&{/} { + clocks { + adrf6780_lo: clock@0 { + compatible = "fixed-clock"; - clock-frequency = <100000000>; - clock-output-names = "lo_in"; - #clock-cells = <0>; - }; - }; + clock-frequency = <100000000>; + clock-output-names = "lo_in"; + #clock-cells = <0>; }; }; +}; - fragment@2 { - target = <&spi0>; - - __overlay__{ - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - adrf6780@0{ - compatible = "adi,adrf6780"; - reg = <0>; - spi-max-frequency = <1000000>; - clocks = <&adrf6780_lo>; - clock-names = "lo_in"; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + adrf6780@0 { + compatible = "adi,adrf6780"; + reg = <0>; + spi-max-frequency = <1000000>; + clocks = <&adrf6780_lo>; + clock-names = "lo_in"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adt7420-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adt7420-overlay.dts index b5a5cc34b18123..89592e86176e53 100644 --- a/arch/arm/boot/dts/overlays/rpi-adt7420-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adt7420-overlay.dts @@ -5,20 +5,18 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - adt7420: adt7420@48 { - compatible = "adt7420"; - reg = <0x48>; - }; - }; - }; __overrides__ { - i2c_address = <&adt7420>,"reg:0"; + i2c_address = <&adt7420>, "reg:0"; + }; +}; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + adt7420: adt7420@48 { + compatible = "adt7420"; + reg = <0x48>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adxl345-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxl345-overlay.dts index 42ce30753c5e08..7919ac2300febb 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxl345-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxl345-overlay.dts @@ -6,31 +6,24 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - adxl345@0 { - compatible = "adi,adxl345"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpha; - spi-cpol; - interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; - interrupt-parent = <&gpio>; - }; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; + adxl345@0 { + compatible = "adi,adxl345"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpha; + spi-cpol; + interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gpio>; }; }; +&spidev0 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-adxl355-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxl355-overlay.dts index 841f81b3e5b9ed..9b0456e392a199 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxl355-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxl355-overlay.dts @@ -6,49 +6,38 @@ #include / { - compatible = "brcm,bcm2835"; - fragment@0 { - target = <&spidev0>; - - __overlay__ { - status = "disabled"; - }; - }; - - fragment@1 { - target = <&gpio>; - __overlay__ { - adxl355_pins: adxl355_pins { - brcm,pins = <19>; // interrupt, Default to PMD-RPI-INTZ P1 - brcm,function = <0>; // in - }; - }; + __overrides__ { + cs_pin = <&adxl355>, "reg:0"; + irq_gpio = <&adxl355>, "interrupts:0", <&adxl355_pins>, "brcm,pins:0"; }; +}; - fragment@2 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - status = "okay"; - #size-cells = <0>; +&spidev0 { + status = "disabled"; +}; - adxl355: adxl355@0 { - compatible = "adi,adxl355"; - reg = <0>; //CS0 default - pinctrl-names = "default"; - pinctrl-0 = <&adxl355_pins>; - spi-max-frequency = <1000000>; - interrupt-parent = <&gpio>; - interrupts = <19 IRQ_TYPE_EDGE_RISING>; //Default to PMD-RPI-INTZ P1 - interrupt-names = "DRDY"; - }; - }; +&gpio { + adxl355_pins: adxl355_pins { + brcm,pins = <19>; // interrupt, Default to PMD-RPI-INTZ P1 + brcm,function = <0>; // in }; +}; - __overrides__ { - cs_pin = <&adxl355>,"reg:0"; - irq_gpio = <&adxl355>,"interrupts:0", <&adxl355_pins>,"brcm,pins:0"; +&spi0 { + #address-cells = <1>; + status = "okay"; + #size-cells = <0>; + + adxl355: adxl355@0 { + compatible = "adi,adxl355"; + reg = <0>; //CS0 default + pinctrl-names = "default"; + pinctrl-0 = <&adxl355_pins>; + spi-max-frequency = <1000000>; + interrupt-parent = <&gpio>; + interrupts = <19 IRQ_TYPE_EDGE_RISING>; //Default to PMD-RPI-INTZ P1 + interrupt-names = "DRDY"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adxl367-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxl367-overlay.dts index 7a45c95051f666..88330fbcfa41f2 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxl367-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxl367-overlay.dts @@ -8,38 +8,28 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; +}; - fragment@0 { - target = <&spi0>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; - cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - status = "okay"; + cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + status = "okay"; - adxl367@0 { - compatible = "adi,adxl367"; - reg = <0>; - spi-max-frequency = <1000000>; - interrupts = <26 IRQ_TYPE_EDGE_RISING>; - interrupt-parent = <&gpio>; - }; - }; + adxl367@0 { + compatible = "adi,adxl367"; + reg = <0>; + spi-max-frequency = <1000000>; + interrupts = <26 IRQ_TYPE_EDGE_RISING>; + interrupt-parent = <&gpio>; }; +}; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@2 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adxl372-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxl372-overlay.dts index bf53b096fcb182..72789787539cbb 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxl372-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxl372-overlay.dts @@ -4,21 +4,18 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adxl372@0 { - compatible = "adi,adxl372"; - reg = <0>; - spi-max-frequency = <1000000>; - interrupts = <25 2>; - interrupt-parent = <&gpio>; - }; - }; + adxl372@0 { + compatible = "adi,adxl372"; + reg = <0>; + spi-max-frequency = <1000000>; + interrupts = <25 2>; + interrupt-parent = <&gpio>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adxl375-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxl375-overlay.dts index cc7b496e7fae8b..7feed5187d810f 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxl375-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxl375-overlay.dts @@ -4,39 +4,33 @@ / { compatible = "brcm,bcm2708", "brcm,bcm2709"; +}; - fragment@0 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adxl375@053 { - compatible = "adi,adxl375"; - reg = <0x53>; - interrupt-parent = <&gpio>; - interrupts = <25 2>; - }; - }; + adxl375@53 { + compatible = "adi,adxl375"; + reg = <0x53>; + interrupt-parent = <&gpio>; + interrupts = <25 2>; }; +}; - fragment@1 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adxl375@0 { - compatible = "adi,adxl375"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpha; - spi-cpol; - interrupts = <25 2>; - interrupt-parent = <&gpio>; - }; - }; + adxl375@0 { + compatible = "adi,adxl375"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpha; + spi-cpol; + interrupts = <25 2>; + interrupt-parent = <&gpio>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-adxrs290-overlay.dts b/arch/arm/boot/dts/overlays/rpi-adxrs290-overlay.dts index efd668fa130eec..2e9059f7bdd68f 100644 --- a/arch/arm/boot/dts/overlays/rpi-adxrs290-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-adxrs290-overlay.dts @@ -4,30 +4,24 @@ / { compatible = "brcm,bcm2836", "brcm,bcm2835"; +}; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - adxrs290@0 { - compatible = "adi,adxrs290"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpha; - spi-cpol; - interrupts = <19 1>; - interrupt-parent = <&gpio>; - }; - }; + adxrs290@0 { + compatible = "adi,adxrs290"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpha; + spi-cpol; + interrupts = <19 1>; + interrupt-parent = <&gpio>; }; +}; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-cn0504-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cn0504-overlay.dts index 6247a90657c3e4..4a919ef3616ca6 100644 --- a/arch/arm/boot/dts/overlays/rpi-cn0504-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cn0504-overlay.dts @@ -4,84 +4,71 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709", "brcm,bcm2711"; +}; - fragment@0 { - target = <ðernet>; - __overlay__ { - #address-cells = <2>; - #size-cells = <0>; +ðernet { + #address-cells = <2>; + #size-cells = <0>; - /* this works on RPi3 */ - usb_eth_interface: usb_eth_interface@0 { - reg = <0 1>; - }; - }; + /* this works on RPi3 */ + usb_eth_interface: usb_eth_interface@0 { + reg = <0 1>; }; +}; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - ltc2945@6f{ - compatible = "adi,ltc2945"; - reg = <0x6f>; + ltc2945@6f { + compatible = "adi,ltc2945"; + reg = <0x6f>; - shunt-resistor-micro-ohms = <20000>; - }; - }; + shunt-resistor-micro-ohms = <20000>; }; +}; + +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - fragment@2 { - target = <&spi0>; - __overlay__ { + ksz9477@0 { + compatible = "microchip,ksz9477"; + reg = <0>; + spi-max-frequency = <500000>; + + ports { #address-cells = <1>; #size-cells = <0>; - status = "okay"; - - ksz9477@0 { - compatible = "microchip,ksz9477"; + /** + * LAN1 should be connected via an ethernet + * cable to the RPi's ethernet jack + */ + port@0 { reg = <0>; - spi-max-frequency = <500000>; + label = "lan1"; + ethernet = <&usb_eth_interface>; + }; - ports { - #address-cells = <1>; - #size-cells = <0>; - /** - * LAN1 should be connected via an ethernet - * cable to the RPi's ethernet jack - */ - port@0 { - reg = <0>; - label = "lan1"; - ethernet = <&usb_eth_interface>; - }; - port@1 { - reg = <1>; - label = "lan2"; - }; - port@2 { - reg = <2>; - label = "lan3"; - }; - }; + port@1 { + reg = <1>; + label = "lan2"; }; - }; - }; - fragment@3 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + port@2 { + reg = <2>; + label = "lan3"; + }; }; }; +}; - fragment@4 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; }; diff --git a/arch/arm/boot/dts/overlays/rpi-cn0508-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cn0508-overlay.dts index e2a70767547e70..e220f3fb34d7f5 100644 --- a/arch/arm/boot/dts/overlays/rpi-cn0508-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cn0508-overlay.dts @@ -5,244 +5,211 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; - fragment@0 { - target = <&spi0_cs_pins>; - frag0: __overlay__ { - brcm,pins = <22 27 8 7>; - brcm,function = <1>; /* output */ - }; + __overrides__ { + cs0_pin = <&spi0_cs_pins>, "brcm,pins:0", + <&spi0>, "cs-gpios:4"; + cs1_pin = <&spi0_cs_pins>, "brcm,pins:4", + <&spi0>, "cs-gpios:16"; + cs2_pin = <&spi0_cs_pins>, "brcm,pins:8", + <&spi0>, "cs-gpios:28"; + cs3_pin = <&spi0_cs_pins>, "brcm,pins:12", + <&spi0>, "cs-gpios:40"; + + speed = <&pitft>, "spi-max-frequency:0"; + rotate = <&pitft>, "rotate:0"; + fps = <&pitft>, "fps:0"; + debug = <&pitft>, "debug:0"; + }; +}; + +&spi0_cs_pins { + brcm,pins = <22 27 8 7>; + brcm,function = <1>; /* output */ +}; + +&spi0 { + cs-gpios = <&gpio 22 1>, <&gpio 27 1>, + <&gpio 8 1>, <&gpio 7 1>; + status = "okay"; +}; + +&{/} { + vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; }; +}; - fragment@1 { - target = <&spi0>; - frag1: __overlay__ { - cs-gpios = <&gpio 22 1>, <&gpio 27 1>, - <&gpio 8 1>, <&gpio 7 1>; - status = "okay"; +&{/} { + clocks { + ad7124_mclk: clock@0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <614400>; }; }; +}; - __overrides__ { - cs0_pin = <&frag0>,"brcm,pins:0", - <&frag1>,"cs-gpios:4"; - cs1_pin = <&frag0>,"brcm,pins:4", - <&frag1>,"cs-gpios:16"; - cs2_pin = <&frag0>,"brcm,pins:8", - <&frag1>,"cs-gpios:28"; - cs3_pin = <&frag0>,"brcm,pins:12", - <&frag1>,"cs-gpios:40"; - - speed = <&pitft>,"spi-max-frequency:0"; - rotate = <&pitft>,"rotate:0"; - fps = <&pitft>,"fps:0"; - debug = <&pitft>,"debug:0"; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad5686r@0 { + compatible = "adi,ad5683r"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpha; + vcc-supply = <&vref>; }; +}; - fragment@2 { - target-path = "/"; - __overlay__ { - vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-boot-on; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad7124@1 { + compatible = "adi,ad7124-4"; + reg = <1>; + spi-max-frequency = <5000000>; + interrupts = <23 2>; + interrupt-parent = <&gpio>; + refin1-supply = <&vref>; + clocks = <&ad7124_mclk>; + clock-names = "mclk"; + + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + diff-channels = <0 19>; + adi,reference-select = <0>; }; - }; - fragment@3 { - target-path = "/"; - __overlay__ { - clocks { - ad7124_mclk: clock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <614400>; - }; - }; + channel@1 { + reg = <1>; + diff-channels = <1 19>; + adi,reference-select = <0>; }; - }; - fragment@4 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad5686r@0{ - compatible = "adi,ad5683r"; - reg = <0>; - spi-max-frequency = <1000000>; - spi-cpha; - vcc-supply = <&vref>; - }; + channel@2 { + reg = <2>; + diff-channels = <2 19>; + adi,reference-select = <0>; }; - }; - fragment@5 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad7124@1 { - compatible = "adi,ad7124-4"; - reg = <1>; - spi-max-frequency = <5000000>; - interrupts = <23 2>; - interrupt-parent = <&gpio>; - refin1-supply = <&vref>; - clocks = <&ad7124_mclk>; - clock-names = "mclk"; - - #address-cells = <1>; - #size-cells = <0>; - - channel@0 { - reg = <0>; - diff-channels = <0 19>; - adi,reference-select = <0>; - }; - - channel@1 { - reg = <1>; - diff-channels = <1 19>; - adi,reference-select = <0>; - }; - - channel@2 { - reg = <2>; - diff-channels = <2 19>; - adi,reference-select = <0>; - }; - - channel@3 { - reg = <3>; - diff-channels = <3 19>; - adi,reference-select = <0>; - }; - - channel@4 { - reg = <4>; - diff-channels = <4 19>; - adi,reference-select = <0>; - }; - - channel@5 { - reg = <5>; - diff-channels = <5 19>; - adi,reference-select = <0>; - }; - - channel@6 { - reg = <6>; - diff-channels = <6 19>; - adi,reference-select = <0>; - }; - - channel@7 { - reg = <7>; - diff-channels = <7 19>; - adi,reference-select = <0>; - }; - }; + channel@3 { + reg = <3>; + diff-channels = <3 19>; + adi,reference-select = <0>; }; - }; - fragment@6 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + channel@4 { + reg = <4>; + diff-channels = <4 19>; + adi,reference-select = <0>; }; - }; - fragment@7 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; + channel@5 { + reg = <5>; + diff-channels = <5 19>; + adi,reference-select = <0>; }; - }; - fragment@8 { - target = <&gpio>; - __overlay__ { - pitft_pins: pitft_pins { - brcm,pins = <24 25>; - brcm,function = <0 1>; /* in out */ - brcm,pull = <2 0>; /* pullup none */ - }; + channel@6 { + reg = <6>; + diff-channels = <6 19>; + adi,reference-select = <0>; }; - }; - fragment@9 { - target = <&spi0>; - __overlay__ { - /* needed to avoid dtc warning */ - #address-cells = <1>; - #size-cells = <0>; - - pitft: pitft@2{ - compatible = "ilitek,ili9340"; - reg = <2>; - pinctrl-names = "default"; - pinctrl-0 = <&pitft_pins>; - - spi-max-frequency = <32000000>; - rotate = <90>; - fps = <25>; - bgr; - buswidth = <8>; - dc-gpios = <&gpio 25 0>; - debug = <0>; - }; - - pitft_ts@3 { - compatible = "st,stmpe610"; - reg = <3>; - - spi-max-frequency = <500000>; - irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */ - interrupts = <24 2>; /* high-to-low edge triggered */ - interrupt-parent = <&gpio>; - interrupt-controller; - - stmpe_touchscreen { - compatible = "st,stmpe-ts"; - st,sample-time = <4>; - st,mod-12b = <1>; - st,ref-sel = <0>; - st,adc-freq = <2>; - st,ave-ctrl = <3>; - st,touch-det-delay = <4>; - st,settling = <2>; - st,fraction-z = <7>; - st,i-drive = <0>; - }; - - stmpe_gpio: stmpe_gpio { - #gpio-cells = <2>; - compatible = "st,stmpe-gpio"; - /* - * only GPIO2 is wired/available - * and it is wired to the backlight - */ - st,norequest-mask = <0x7b>; - }; - }; + channel@7 { + reg = <7>; + diff-channels = <7 19>; + adi,reference-select = <0>; }; }; +}; + +&spidev0 { + status = "disabled"; +}; - fragment@10 { - target-path = "/soc"; - __overlay__ { - backlight { - compatible = "gpio-backlight"; - gpios = <&stmpe_gpio 2 0>; - default-on; - }; +&spidev1 { + status = "disabled"; +}; + +&gpio { + pitft_pins: pitft_pins { + brcm,pins = <24 25>; + brcm,function = <0 1>; /* in out */ + brcm,pull = <2 0>; /* pullup none */ + }; +}; + +&spi0 { + /* needed to avoid dtc warning */ + #address-cells = <1>; + #size-cells = <0>; + + pitft: pitft@2 { + compatible = "ilitek,ili9340"; + reg = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pitft_pins>; + + spi-max-frequency = <32000000>; + rotate = <90>; + fps = <25>; + bgr; + buswidth = <8>; + dc-gpios = <&gpio 25 0>; + debug = <0>; + }; + + pitft_ts@3 { + compatible = "st,stmpe610"; + reg = <3>; + + spi-max-frequency = <500000>; + irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */ + interrupts = <24 2>; /* high-to-low edge triggered */ + interrupt-parent = <&gpio>; + interrupt-controller; + + stmpe_touchscreen { + compatible = "st,stmpe-ts"; + st,sample-time = <4>; + st,mod-12b = <1>; + st,ref-sel = <0>; + st,adc-freq = <2>; + st,ave-ctrl = <3>; + st,touch-det-delay = <4>; + st,settling = <2>; + st,fraction-z = <7>; + st,i-drive = <0>; + }; + + stmpe_gpio: stmpe_gpio { + #gpio-cells = <2>; + compatible = "st,stmpe-gpio"; + /* + * only GPIO2 is wired/available + * and it is wired to the backlight + */ + st,norequest-mask = <0x7b>; }; }; }; + +&{/soc} { + backlight { + compatible = "gpio-backlight"; + gpios = <&stmpe_gpio 2 0>; + default-on; + }; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-cn0511-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cn0511-overlay.dts index b83ccc70ec2281..c3aaa5409d6429 100644 --- a/arch/arm/boot/dts/overlays/rpi-cn0511-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cn0511-overlay.dts @@ -4,123 +4,102 @@ / { compatible = "brcm,bcm2836", "brcm,bcm2835"; +}; - fragment@0 { - target-path = "/clocks"; - __overlay__ { - adf4372_clkin: clock@0 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <122880000>; - clock-output-names = "clkin"; - }; - }; +&{/clocks} { + adf4372_clkin: clock@0 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <122880000>; + clock-output-names = "clkin"; }; +}; - fragment@1 { - target = <&spi0_cs_pins>; - frag0: __overlay__ { - brcm,pins = <8 7 25>; - brcm,function = <1>; //output - }; - }; +&spi0_cs_pins { + brcm,pins = <8 7 25>; + brcm,function = <1>; //output +}; - fragment@2 { - target = <&spi0>; - frag1: __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - - cs-gpios = <&gpio 8 1>, <&gpio 7 1>, <&gpio 25 1>; - status = "okay"; - - dac0_ad9166: ad9166@0 { - compatible = "adi,ad9166"; - reg = <0>; - spi-max-frequency = <1000000>; - clocks = <&adf4372_clk 0>; - clock-names = "dac_clk"; - spi-cpha; - spi-cpol; - adi,standalone-probe; - adi,dc-test-en; - dac_clk-clock-scales = <1 10>; - }; - - adf4372_clk: adf4372@1 { - compatible = "adi,adf4372"; - reg = <1>; - - #address-cells = <1>; - #clock-cells = <1>; - #size-cells = <0>; - - spi-max-frequency = <1000000>; - spi-3wire; - clocks = <&adf4372_clkin>; - clock-names = "clkin"; - clock-output-names = "clk-rf8", "clk-rfaux8", - "clk-rf16"; - - adi,muxout-select = <1>; - - channel@0 { - reg = <0>; - adi,power-up-frequency = /bits/ 64 - <6000000000>; - }; - }; - - ad9166_amp: ad9166-amp@2 { - compatible = "adi,ad9166-amp"; - reg = <2>; // CE2 - gpio25 - spi-cpha; - spi-cpol; - spi-max-frequency = <1000000>; - }; - }; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + + cs-gpios = <&gpio 8 1>, <&gpio 7 1>, <&gpio 25 1>; + status = "okay"; + + dac0_ad9166: ad9166@0 { + compatible = "adi,ad9166"; + reg = <0>; + spi-max-frequency = <1000000>; + clocks = <&adf4372_clk 0>; + clock-names = "dac_clk"; + spi-cpha; + spi-cpol; + adi,standalone-probe; + adi,dc-test-en; + dac_clk-clock-scales = <1 10>; }; - fragment@3 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + adf4372_clk: adf4372@1 { + compatible = "adi,adf4372"; + reg = <1>; + + #address-cells = <1>; + #clock-cells = <1>; + #size-cells = <0>; + + spi-max-frequency = <1000000>; + spi-3wire; + clocks = <&adf4372_clkin>; + clock-names = "clkin"; + clock-output-names = "clk-rf8", "clk-rfaux8", + "clk-rf16"; + + adi,muxout-select = <1>; + + channel@0 { + reg = <0>; + adi,power-up-frequency = /bits/ 64 + <6000000000>; }; }; - fragment@4 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; + ad9166_amp: ad9166-amp@2 { + compatible = "adi,ad9166-amp"; + reg = <2>; // CE2 - gpio25 + spi-cpha; + spi-cpol; + spi-max-frequency = <1000000>; }; +}; - fragment@5 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - ad5696r@4c { - compatible = "adi,ad5693r"; - clock-frequency = <400000>; - reg = <0x4c>; - }; - - eeprom@51 { - compatible = "atmel,24c32"; - reg = <0x51>; - }; - }; +&spidev0 { + status = "disabled"; +}; + +&spidev1 { + status = "disabled"; +}; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad5696r@4c { + compatible = "adi,ad5693r"; + clock-frequency = <400000>; + reg = <0x4c>; }; - fragment@6 { - target = <&i2c0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - }; + eeprom@51 { + compatible = "atmel,24c32"; + reg = <0x51>; }; }; + +&i2c0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-cn0552-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cn0552-overlay.dts index b8ac35bec386bb..8dcc504ef83ef7 100644 --- a/arch/arm/boot/dts/overlays/rpi-cn0552-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cn0552-overlay.dts @@ -5,19 +5,16 @@ / { compatible = "brcm,bcm2708"; +}; - fragment@0 { - target = <&i2c_arm>; - __overlay__ { - status = "okay"; +&i2c_arm { + status = "okay"; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - adc: ad7746@48 { - compatible = "adi,ad7746"; - reg = <0x48>; - }; - }; + adc: ad7746@48 { + compatible = "adi,ad7746"; + reg = <0x48>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-cn0566-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cn0566-overlay.dts index 4ce64eba4c0a9d..99baba98211dc4 100644 --- a/arch/arm/boot/dts/overlays/rpi-cn0566-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-cn0566-overlay.dts @@ -4,179 +4,176 @@ / { compatible = "brcm,bcm2836", "brcm,bcm2835", "brcm,bcm2709"; +}; - fragment@0 { - target-path = "/"; - __overlay__ { - clkin: clock@0 { - compatible = "fixed-clock"; - clock-frequency = <100000000>; - clock-output-names = "adf4159_ext_refclk"; - #clock-cells = <0>; - }; - }; +&{/} { + clkin: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <100000000>; + clock-output-names = "adf4159_ext_refclk"; + #clock-cells = <0>; }; +}; + +/* We have 2 spidev */ +&spi0_cs_pins { + brcm,pins = <8 7 27>; + brcm,function = <1>; //output +}; - /* We have 2 spidev */ - fragment@1 { - target = <&spi0_cs_pins>; - frag0: __overlay__ { - brcm,pins = <8 7 27>; - brcm,function = <1>; //output +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + cs-gpios = <&gpio 8 1>, <&gpio 7 1>, <&gpio 27 1>; + status = "okay"; + + adar1000@0 { + compatible = "adi,adar1000"; + reg = <0>; + spi-max-frequency = <3600000>; + + #address-cells = <1>; + #size-cells = <0>; + + adar1000_0@0 { + reg = <0>; + label = "BEAM0"; + adi,phasetable-name = "adar1000_std_phasetable"; }; + }; - fragment@2 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - cs-gpios = <&gpio 8 1>, <&gpio 7 1>, <&gpio 27 1>; - status = "okay"; - - adar1000@0 { - compatible = "adi,adar1000"; - reg = <0>; - spi-max-frequency = <3600000>; - - #address-cells = <1>; - #size-cells = <0>; - - adar1000_0@0 { - reg = <0>; - label = "BEAM0"; - adi,phasetable-name = "adar1000_std_phasetable"; - }; - - }; - - adar1000@1 { - compatible = "adi,adar1000"; - reg = <1>; - spi-max-frequency = <3600000>; - - #address-cells = <1>; - #size-cells = <0>; - - adar1000_1@0 { - reg = <0>; - label = "BEAM1"; - adi,phasetable-name = "adar1000_std_phasetable"; - }; - }; - - adf4159@2 { - compatible = "adi,adf4159"; - reg = <2>; - label = "pll0"; - spi-max-frequency = <3600000>; - /* Clocks */ - clocks = <&clkin>; - clock-names = "clkin"; - clock-output-names = "rf_out"; - #clock-cells = <0>; - adi,power-up-frequency-hz = /bits/ 64 <3000000000>; - adi,charge-pump-current-microamp = <900>; - adi,clk1-div = <100>; - adi,clk2-timer-div = <0>; - adi,clk2-timer-div-2 = <0>; - adi,clk-div-mode = <0>; - adi,delay-start-word = <0>; - adi,deviation = <1000>; - adi,deviation-2 = <0>; - adi,deviation-offset = <1>; - adi,interrupt-mode-select = <0>; - adi,muxout-select = <15>; - adi,negative-bleed-current-microamp = <0>; - adi,phase = <0>; - adi,ramp-mode-select = <0>; - adi,ramp-status-mode = <3>; - adi,reference-div-factor = <1>; - adi,step-word = <0>; - adi,step-word-2 = <0>; - }; + adar1000@1 { + compatible = "adi,adar1000"; + reg = <1>; + spi-max-frequency = <3600000>; + + #address-cells = <1>; + #size-cells = <0>; + + adar1000_1@0 { + reg = <0>; + label = "BEAM1"; + adi,phasetable-name = "adar1000_std_phasetable"; }; }; - fragment@3 { - target-path = "/"; - __overlay__ { - one-bit-adc-dac@0 { - compatible = "adi,one-bit-adc-dac"; - label = "gpios"; - #address-cells = <1>; - #size-cells = <0>; - in-gpios = <&gpio 25 0>; - out-gpios = <&gpio 4 0>, <&gpio 17 0>, <&gpio 22 0>, <&gpio 5 0>, - <&gpio 6 0>, <&gpio 13 0>, <&gpio 18 0>, <&gpio 24 0>, - <&gpio 12 0>, <&gpio 23 0>; - status = "okay"; - channel@0 { - reg = <0>; - label = "MUXOUT"; - }; - channel@1 { - reg = <1>; - label = "DIV_S0"; - }; - channel@2 { - reg = <2>; - label = "RX_LOAD"; - }; - channel@3 { - reg = <3>; - label = "TR"; - }; - channel@4 { - reg = <4>; - label = "DIV_S1"; - }; - channel@5 { - reg = <5>; - label = "DIV_S2"; - }; - channel@6 { - reg = <6>; - label = "DIV_MR"; - }; - channel@7 { - reg = <7>; - label = "VCTRL_1"; - }; - channel@8 { - reg = <8>; - label = "VCTRL_2"; - }; - channel@9 { - reg = <9>; - label = "TX_SW"; - }; - channel@10 { - reg = <10>; - label = "BURST"; - }; - }; - }; + adf4159@2 { + compatible = "adi,adf4159"; + reg = <2>; + label = "pll0"; + spi-max-frequency = <3600000>; + /* Clocks */ + clocks = <&clkin>; + clock-names = "clkin"; + clock-output-names = "rf_out"; + #clock-cells = <0>; + adi,power-up-frequency-hz = /bits/ 64 <3000000000>; + adi,charge-pump-current-microamp = <900>; + adi,clk1-div = <100>; + adi,clk2-timer-div = <0>; + adi,clk2-timer-div-2 = <0>; + adi,clk-div-mode = <0>; + adi,delay-start-word = <0>; + adi,deviation = <1000>; + adi,deviation-2 = <0>; + adi,deviation-offset = <1>; + adi,interrupt-mode-select = <0>; + adi,muxout-select = <15>; + adi,negative-bleed-current-microamp = <0>; + adi,phase = <0>; + adi,ramp-mode-select = <0>; + adi,ramp-status-mode = <3>; + adi,reference-div-factor = <1>; + adi,step-word = <0>; + adi,step-word-2 = <0>; }; +}; + +&{/} { + one-bit-adc-dac@0 { + compatible = "adi,one-bit-adc-dac"; + label = "gpios"; + #address-cells = <1>; + #size-cells = <0>; + in-gpios = <&gpio 25 0>; + out-gpios = <&gpio 4 0>, <&gpio 17 0>, <&gpio 22 0>, <&gpio 5 0>, + <&gpio 6 0>, <&gpio 13 0>, <&gpio 18 0>, <&gpio 24 0>, + <&gpio 12 0>, <&gpio 23 0>; + status = "okay"; + + channel@0 { + reg = <0>; + label = "MUXOUT"; + }; + + channel@1 { + reg = <1>; + label = "DIV_S0"; + }; + + channel@2 { + reg = <2>; + label = "RX_LOAD"; + }; - fragment@4 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - ad7291@2f { - compatible = "adi,ad7291"; - label = "housekeeping_adc"; - clock-frequency = <400000>; - reg = <0x2a>; - }; - - eeprom@50 { - compatible = "at24,24c32"; - clock-frequency = <400000>; - reg = <0x57>; - }; + channel@3 { + reg = <3>; + label = "TR"; }; + + channel@4 { + reg = <4>; + label = "DIV_S1"; + }; + + channel@5 { + reg = <5>; + label = "DIV_S2"; + }; + + channel@6 { + reg = <6>; + label = "DIV_MR"; + }; + + channel@7 { + reg = <7>; + label = "VCTRL_1"; + }; + + channel@8 { + reg = <8>; + label = "VCTRL_2"; + }; + + channel@9 { + reg = <9>; + label = "TX_SW"; + }; + + channel@10 { + reg = <10>; + label = "BURST"; + }; + }; +}; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + ad7291@2f { + compatible = "adi,ad7291"; + label = "housekeeping_adc"; + clock-frequency = <400000>; + reg = <0x2a>; + }; + + eeprom@50 { + compatible = "at24,24c32"; + clock-frequency = <400000>; + reg = <0x57>; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-dc1962c-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dc1962c-overlay.dts index e6f1efd1253547..54a278418c44fe 100644 --- a/arch/arm/boot/dts/overlays/rpi-dc1962c-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-dc1962c-overlay.dts @@ -4,121 +4,125 @@ / { compatible = "brcm, bcm2835"; +}; + +&i2c_arm { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - fragment@0 { - target = <&i2c_arm>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - reg0: ltc3880@30 { - compatible = "lltc,ltc3880"; - reg = <0x30>; - regulators { - vout0 { - regulator-name = "VOUT 0"; - regulator-boot-on; - regulator-always-on; - }; - vout1 { - regulator-name = "VOUT 1"; - regulator-boot-on; - regulator-always-on; - }; - }; + reg0: ltc3880@30 { + compatible = "lltc,ltc3880"; + reg = <0x30>; + + regulators { + vout0 { + regulator-name = "VOUT 0"; + regulator-boot-on; + regulator-always-on; + }; + vout1 { + regulator-name = "VOUT 1"; + regulator-boot-on; + regulator-always-on; }; }; }; +}; + +&i2c_arm { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; - fragment@1 { - target = <&i2c_arm>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - reg1: ltc2974@32 { - compatible = "lltc,ltc2974"; - reg = <0x32>; - regulators { - vout0 { - regulator-name = "VOUT 2"; - regulator-boot-on; - regulator-always-on; - }; - vout1 { - regulator-name = "VOUT 3"; - regulator-boot-on; - regulator-always-on; - }; - vout2 { - regulator-name = "VOUT 4"; - regulator-boot-on; - regulator-always-on; - }; - vout3 { - regulator-name = "VOUT 5"; - regulator-boot-on; - regulator-always-on; - }; - }; + reg1: ltc2974@32 { + compatible = "lltc,ltc2974"; + reg = <0x32>; + + regulators { + vout0 { + regulator-name = "VOUT 2"; + regulator-boot-on; + regulator-always-on; + }; + + vout1 { + regulator-name = "VOUT 3"; + regulator-boot-on; + regulator-always-on; + }; + + vout2 { + regulator-name = "VOUT 4"; + regulator-boot-on; + regulator-always-on; + }; + + vout3 { + regulator-name = "VOUT 5"; + regulator-boot-on; + regulator-always-on; }; }; }; +}; + +&i2c_arm { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + reg2: ltc2977@33 { + compatible = "lltc,ltc2977"; + reg = <0x33>; + + regulators { + vout0 { + regulator-name = "VOUT 6"; + regulator-boot-on; + regulator-always-on; + }; + + vout1 { + regulator-name = "VOUT 7"; + regulator-boot-on; + regulator-always-on; + }; + + vout2 { + regulator-name = "VOUT 8"; + regulator-boot-on; + regulator-always-on; + }; + + vout3 { + regulator-name = "VOUT 9"; + regulator-boot-on; + regulator-always-on; + }; + + vout4 { + regulator-name = "VOUT 10"; + regulator-boot-on; + regulator-always-on; + }; + + vout5 { + regulator-name = "VOUT 11"; + regulator-boot-on; + regulator-always-on; + }; + + vout6 { + regulator-name = "VOUT 12"; + regulator-boot-on; + regulator-always-on; + }; - fragment@2 { - target = <&i2c_arm>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - reg2: ltc2977@33 { - compatible = "lltc,ltc2977"; - reg = <0x33>; - regulators { - vout0 { - regulator-name = "VOUT 6"; - regulator-boot-on; - regulator-always-on; - }; - vout1 { - regulator-name = "VOUT 7"; - regulator-boot-on; - regulator-always-on; - }; - vout2 { - regulator-name = "VOUT 8"; - regulator-boot-on; - regulator-always-on; - }; - vout3 { - regulator-name = "VOUT 9"; - regulator-boot-on; - regulator-always-on; - }; - vout4 { - regulator-name = "VOUT 10"; - regulator-boot-on; - regulator-always-on; - }; - vout5 { - regulator-name = "VOUT 11"; - regulator-boot-on; - regulator-always-on; - }; - vout6 { - regulator-name = "VOUT 12"; - regulator-boot-on; - regulator-always-on; - }; - vout7 { - regulator-name = "VOUT 13"; - regulator-boot-on; - regulator-always-on; - }; - }; + vout7 { + regulator-name = "VOUT 13"; + regulator-boot-on; + regulator-always-on; }; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-lm75-overlay.dts b/arch/arm/boot/dts/overlays/rpi-lm75-overlay.dts index be2867fd90690b..c0cfa87e962451 100644 --- a/arch/arm/boot/dts/overlays/rpi-lm75-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-lm75-overlay.dts @@ -5,23 +5,19 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target = <&i2c1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - lm75: lm75@4c{ - compatible = "lm75"; - reg = <0x4c>; - label = "my_lm75"; - }; - - }; - }; - __overrides__ { addr = <&lm75>,"reg:0"; }; }; + +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + lm75: lm75@4c { + compatible = "lm75"; + reg = <0x4c>; + label = "my_lm75"; + }; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ltc2497-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ltc2497-overlay.dts index ca8bfeb4b939a0..6e52d88e9189fc 100644 --- a/arch/arm/boot/dts/overlays/rpi-ltc2497-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ltc2497-overlay.dts @@ -5,39 +5,31 @@ / { compatible = "brcm,bcm2835"; - fragment@0 { - target-path = "/"; - - __overlay__ { - - vref: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "vref"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - phandle = <0x1>; - }; - }; + __overrides__ { + addr = <<c2497>,"reg:0"; }; +}; - fragment@1 { - target = <&i2c1>; - __overlay__ { - #address-cells = <0x1>; - #size-cells = <0x0>; - status = "okay"; - ltc2497: ltc2497@76 { - compatible = "lltc,ltc2497"; - reg = <0x76>; - label = "my_ltc2497"; - vref-supply = <&vref>; - clock-frequency = <400000>; - status = "okay"; - }; - }; +&{/} { + vref: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vref"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; }; +}; - __overrides__ { - addr = <<c2497>,"reg:0"; +&i2c1 { + #address-cells = <0x1>; + #size-cells = <0x0>; + status = "okay"; + + ltc2497: ltc2497@76 { + compatible = "lltc,ltc2497"; + reg = <0x76>; + label = "my_ltc2497"; + vref-supply = <&vref>; + clock-frequency = <400000>; + status = "okay"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-ltc6952-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ltc6952-overlay.dts index 901a9b47ab87dc..3fbb7445930f89 100644 --- a/arch/arm/boot/dts/overlays/rpi-ltc6952-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-ltc6952-overlay.dts @@ -4,55 +4,49 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; +}; + +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + clk0_ltc6952: ltc6952@0 { + compatible = "adi,ltc6952"; + reg = <0>; + + #address-cells = <1>; + #size-cells = <0>; + + spi-max-frequency = <10000000>; - fragment@0 { - target = <&spi0>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - clk0_ltc6952: ltc6952@0 { - compatible = "adi,ltc6952"; - reg = <0>; - - #address-cells = <1>; - #size-cells = <0>; - - spi-max-frequency = <10000000>; - - clock-output-names = "ltc6952_out0", "ltc6952_out1", "ltc6952_out2", - "ltc6952_out3", "ltc6952_out4", "ltc6952_out5", "ltc6952_out6", - "ltc6952_out7", "ltc6952_out8", "ltc6952_out9", "ltc6952_out10", - "ltc6952_out11"; - #clock-cells = <1>; - - adi,vco-frequency-hz = <4000000000>; - adi,ref-frequency-hz = <100000000>; - - ltc6952_0_c0: channel@0 { - reg = <0>; - adi,extended-name = "REF_CLK"; - adi,divider = <10>; - adi,digital-delay = <0>; - adi,analog-delay = <0>; - }; - - ltc6952_0_c1: channel@1 { - reg = <1>; - adi,extended-name = "TEST_CLK"; - adi,divider = <10>; - adi,digital-delay = <0>; - adi,analog-delay = <0>; - }; - }; + clock-output-names = "ltc6952_out0", "ltc6952_out1", "ltc6952_out2", + "ltc6952_out3", "ltc6952_out4", "ltc6952_out5", "ltc6952_out6", + "ltc6952_out7", "ltc6952_out8", "ltc6952_out9", "ltc6952_out10", + "ltc6952_out11"; + #clock-cells = <1>; + + adi,vco-frequency-hz = <4000000000>; + adi,ref-frequency-hz = <100000000>; + + ltc6952_0_c0: channel@0 { + reg = <0>; + adi,extended-name = "REF_CLK"; + adi,divider = <10>; + adi,digital-delay = <0>; + adi,analog-delay = <0>; }; - }; - fragment@1 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; + ltc6952_0_c1: channel@1 { + reg = <1>; + adi,extended-name = "TEST_CLK"; + adi,divider = <10>; + adi,digital-delay = <0>; + adi,analog-delay = <0>; }; }; }; + +&spidev0 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/overlays/rpi-max14830-i2c-overlay.dts b/arch/arm/boot/dts/overlays/rpi-max14830-i2c-overlay.dts index df114af984ae6b..858851d3351ab5 100644 --- a/arch/arm/boot/dts/overlays/rpi-max14830-i2c-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-max14830-i2c-overlay.dts @@ -8,45 +8,36 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2711"; +}; - fragment@0 { - target-path = "/clocks"; - - __overlay__ { - max14830_xtal: max14830_xtal { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <3686400>; - }; - }; - +&{/clocks} { + max14830_xtal: max14830_xtal { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <3686400>; }; +}; - fragment@1 { - target = <&i2c1>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; - status = "okay"; + status = "okay"; - max14830@6c { - compatible = "maxim,max14830"; - reg = <0x6c>; + max14830@6c { + compatible = "maxim,max14830"; + reg = <0x6c>; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; + gpio-controller; + #gpio-cells = <2>; - interrupts = <27 IRQ_TYPE_EDGE_FALLING>; - interrupt-parent = <&gpio>; + interrupts = <27 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpio>; - clocks = <&max14830_xtal>; - clock-names = "xtal"; - }; - }; + clocks = <&max14830_xtal>; + clock-names = "xtal"; }; }; diff --git a/arch/arm/boot/dts/overlays/rpi-max14830-spi-overlay.dts b/arch/arm/boot/dts/overlays/rpi-max14830-spi-overlay.dts index af076eee29b359..7573efb0890e70 100644 --- a/arch/arm/boot/dts/overlays/rpi-max14830-spi-overlay.dts +++ b/arch/arm/boot/dts/overlays/rpi-max14830-spi-overlay.dts @@ -8,61 +8,46 @@ / { compatible = "brcm,bcm2835", "brcm,bcm2711"; +}; - fragment@0 { - target-path = "/clocks"; - - __overlay__ { - max14830_xtal: max14830_xtal { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <3686400>; - }; - }; - +&{/clocks} { + max14830_xtal: max14830_xtal { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <3686400>; }; +}; - fragment@1 { - target = <&spi0>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; +&spi0 { + #address-cells = <1>; + #size-cells = <0>; - cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - status = "okay"; + cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + status = "okay"; - max14830@0 { - compatible = "maxim,max14830"; - reg = <0>; + max14830@0 { + compatible = "maxim,max14830"; + reg = <0>; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; + gpio-controller; + #gpio-cells = <2>; - spi-max-frequency = <5000000>; - interrupts = <27 IRQ_TYPE_EDGE_FALLING>; - interrupt-parent = <&gpio>; + spi-max-frequency = <5000000>; + interrupts = <27 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpio>; - clocks = <&max14830_xtal>; - clock-names = "xtal"; - }; - }; + clocks = <&max14830_xtal>; + clock-names = "xtal"; }; +}; - fragment@2 { - target = <&spidev0>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev0 { + status = "disabled"; +}; - fragment@3 { - target = <&spidev1>; - __overlay__ { - status = "disabled"; - }; - }; +&spidev1 { + status = "disabled"; };