diff options
| author | John Klug <john.klug@multitech.com> | 2019-02-05 10:12:50 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2019-02-05 10:12:50 -0600 |
| commit | bca2f99f12a5fe6d69e62ab2ad7fd09a31fca55e (patch) | |
| tree | 5ea22fa0f5aeae96cf595d6e9a7cecf3dee55a47 | |
| parent | a9de1e630ad6a8fb0d4aa876f9b7a5eaf5018168 (diff) | |
| download | meta-multitech-atmel-bca2f99f12a5fe6d69e62ab2ad7fd09a31fca55e.tar.gz meta-multitech-atmel-bca2f99f12a5fe6d69e62ab2ad7fd09a31fca55e.tar.bz2 meta-multitech-atmel-bca2f99f12a5fe6d69e62ab2ad7fd09a31fca55e.zip | |
Pull down for radio monitor on mtrv1
| -rw-r--r-- | recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch index 70df542..67046b7 100644 --- a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch +++ b/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch @@ -1,7 +1,7 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/boot/dts/mtrv1.dts --- linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts 2019-01-24 01:33:27.883326147 -0600 -@@ -0,0 +1,250 @@ ++++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts 2019-02-05 10:02:39.107727466 -0600 +@@ -0,0 +1,259 @@ +/* + * DTS file for Multi-Tech Systems MTRv1 Hardware + * @@ -42,6 +42,7 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b + + ahb { + apb { ++ /delete-node/ spi@f0004000; + macb0: ethernet@f802c000 { + phy-mode = "rmii"; + status = "okay"; @@ -75,17 +76,26 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b + AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD13 periph A Data bit 7 */ + }; + -+ pinctrl_nand_16bits: nand_16bits-0 { ++ /delete-node/ nand_16bits-0; ++ }; ++ ++ /delete-node/ spi1; ++ ++ /* ++ * Pin A23 will be left floating when the power goes off on the radio. ++ * We need to pull it down to ensure it is low during radio power-off. ++ * pinctrl is loaded during the call to platform_device_register() in mts-io. ++ * If we need to customize this for various hardware revisions, these can ++ * be loaded as overlays prior to loading the mts-io module, overwriting the ++ * atmel,pins section. ++ */ ++ mts_io { ++ pinctrl_mts_io: mts_io-0 { + atmel,pins = -+ <AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD14 periph A Data bit 8 */ -+ AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD15 periph A Data bit 9 */ -+ AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD16 periph A Data bit 10 */ -+ AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD17 periph A Data bit 11 */ -+ AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD18 periph A Data bit 12 */ -+ AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD19 periph A Data bit 13 */ -+ AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD20 periph A Data bit 14 */ -+ AT91_PIOD 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD21 periph A Data bit 15 */ -+ }; ++ <AT91_PIOA 21 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PA21 GPIO pull-up radio-power */ ++ AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PA22 GPIO pull-up radio-reset */ ++ AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_DOWN>; /* PA23 GPIO pull-down radio-monitor */ ++ }; + }; + + 1wire_cm { @@ -93,14 +103,6 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b + atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */ + }; + }; -+ -+ radio_control { -+ pinctrl_radio_control: radio_control-0 { -+ atmel,pins = -+ <AT91_PIOA 21 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PA22 GPIO pull-up radio-power */ -+ AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PA22 GPIO pull-up radio-reset */ -+ }; -+ }; + }; + + rtc@fffffeb0 { @@ -251,6 +253,13 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b + pinctrl-0 = <&pinctrl_1wire_cm>; + status = "okay"; + }; ++ ++ mts-io-0 { ++ status = "okay"; ++ compatible = "mts,mts-io"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_mts_io>; ++ }; +}; diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9.87/arch/arm/boot/dts/at91sam9x5cm.dtsi --- linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi 2019-01-03 15:21:25.339570341 -0600 |