Latest RPi3+ patches, RPi fixes, further lan78xx patches (some from 4.17, some under review), fixes for Marvell a37xx EspressoBin
This commit is contained in:
parent
d16f67c2d9
commit
0edfe4f286
|
@ -1,19 +1,7 @@
|
|||
From patchwork Tue Feb 20 12:19:31 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v5,1/5] ARM: bcm2835: sync firmware properties with downstream
|
||||
From 08af112e79cab22f318ca0ad1a48187eee5ac2f0 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
X-Patchwork-Id: 10229963
|
||||
Message-Id: <e7d1f1d0789f11d37957a8998bee23d035115aeb.1519128054.git.baruch@tkos.co.il>
|
||||
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
|
||||
linux-gpio@vger.kernel.org, Michael Zoran <mzoran@crowfest.net>,
|
||||
Rob Herring <robh+dt@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
||||
Frank Rowand <frowand.list@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Tue, 20 Feb 2018 14:19:31 +0200
|
||||
Subject: soc: bcm2835: sync firmware properties with downstream
|
||||
|
||||
Add latest firmware property tags from the latest Raspberry Pi downstream
|
||||
kernel. This is needed for the GPIO tags, so we can control the GPIO
|
||||
|
@ -21,18 +9,13 @@ multiplexor lines.
|
|||
|
||||
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
v4: No change
|
||||
|
||||
v3: Add Stefan's ack
|
||||
|
||||
v2: No change
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
include/soc/bcm2835/raspberrypi-firmware.h | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
|
||||
index cb979ad90401..50df5b28d2c9 100644
|
||||
index cb979ad..50df5b2 100644
|
||||
--- a/include/soc/bcm2835/raspberrypi-firmware.h
|
||||
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
|
||||
@@ -63,6 +63,7 @@ enum rpi_firmware_property_tag {
|
||||
|
@ -94,22 +77,12 @@ index cb979ad90401..50df5b28d2c9 100644
|
|||
|
||||
RPI_FIRMWARE_VCHIQ_INIT = 0x00048010,
|
||||
|
||||
From patchwork Tue Feb 20 12:19:32 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v5,2/5] dt-bindings: gpio: add raspberry pi GPIO expander binding
|
||||
--
|
||||
cgit v1.1
|
||||
From 9777d8099a4a9df1625b4caaee1388c0158478c5 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
X-Patchwork-Id: 10229965
|
||||
Message-Id: <f400b48cbcd8a138c39d4e8f63d6c1f569090dcc.1519128054.git.baruch@tkos.co.il>
|
||||
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
|
||||
linux-gpio@vger.kernel.org, Michael Zoran <mzoran@crowfest.net>,
|
||||
Rob Herring <robh+dt@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
||||
Frank Rowand <frowand.list@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Tue, 20 Feb 2018 14:19:32 +0200
|
||||
Subject: dt-bindings: gpio: add raspberry pi GPIO expander binding
|
||||
|
||||
The Raspberry Pi 3 GPIO expander is controlled by the VC4 firmware over
|
||||
I2C. The firmware mailbox interface allows the ARM core to control the
|
||||
|
@ -117,20 +90,7 @@ GPIO lines.
|
|||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Reviewed-by: Rob Herring <robh@kernel.org>
|
||||
---
|
||||
v5:
|
||||
* Remove the 'firmware' property
|
||||
* Note that the gpio node is a child of the firmware node
|
||||
|
||||
v4:
|
||||
* Move the example gpio node under the firmware node
|
||||
* Rename gpio node name to plain 'gpio'
|
||||
|
||||
v3:
|
||||
* Rename node name.
|
||||
|
||||
v2:
|
||||
* Rename compatible string to raspberrypi,firmware-gpio
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
.../bindings/gpio/raspberrypi,firmware-gpio.txt | 30 ++++++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
@ -138,7 +98,7 @@ v2:
|
|||
|
||||
diff --git a/Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt b/Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt
|
||||
new file mode 100644
|
||||
index 000000000000..ce97265e23ba
|
||||
index 0000000..ce97265
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt
|
||||
@@ -0,0 +1,30 @@
|
||||
|
@ -172,26 +132,13 @@ index 000000000000..ce97265e23ba
|
|||
+ #gpio-cells = <2>;
|
||||
+ };
|
||||
+};
|
||||
From patchwork Tue Feb 20 12:19:33 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v5,
|
||||
3/5] gpio: raspberrypi-exp: Driver for RPi3 GPIO expander via mailbox
|
||||
service
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
X-Patchwork-Id: 10229967
|
||||
Message-Id: <8c34f287ee72b340fa9d693aa0e304b25541c74c.1519128054.git.baruch@tkos.co.il>
|
||||
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
|
||||
linux-gpio@vger.kernel.org, Michael Zoran <mzoran@crowfest.net>,
|
||||
Rob Herring <robh+dt@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
||||
Frank Rowand <frowand.list@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Tue, 20 Feb 2018 14:19:33 +0200
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
From a98d90e7d588045716c3c85d63f93dc3f15a079b Mon Sep 17 00:00:00 2001
|
||||
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
Date: Tue, 20 Feb 2018 14:19:33 +0200
|
||||
Subject: gpio: raspberrypi-exp: Driver for RPi3 GPIO expander via mailbox
|
||||
service
|
||||
|
||||
Pi3 and Compute Module 3 have a GPIO expander that the
|
||||
VPU communicates with.
|
||||
|
@ -201,31 +148,7 @@ expander, so add a kernel driver that can make use of it.
|
|||
Reviewed-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
v5:
|
||||
* Use the parent node to find the firmware
|
||||
|
||||
v4:
|
||||
* Don't set the .owner driver field
|
||||
* Add Stefan's review tag
|
||||
|
||||
v3:
|
||||
* Tweak Kconfig driver prompt
|
||||
* Make GPIO_RASPBERRYPI_EXP tristate
|
||||
* Make COMPILE_TEST independent of RASPBERRYPI_FIRMWARE
|
||||
* Remove redundant DMA header
|
||||
* Use less code lines for dev_err()
|
||||
* Check rpi_exp_gpio_get_polarity() return value
|
||||
* Remove redundant platform_set_drvdata() call
|
||||
|
||||
v2:
|
||||
* Rename driver to gpio-raspberrypi-exp
|
||||
* Populate the gpiochip parent device pointer
|
||||
* Use macro for the mailbox base GPIO number
|
||||
* Drop linux/gpio.h and GPIOF_DIR_*
|
||||
* Check and print firmware error value
|
||||
* Use devm_gpiochip_add_data(); drop .remove
|
||||
* A few more minor tweaks
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/gpio/Kconfig | 9 ++
|
||||
drivers/gpio/Makefile | 1 +
|
||||
|
@ -234,7 +157,7 @@ v2:
|
|||
create mode 100644 drivers/gpio/gpio-raspberrypi-exp.c
|
||||
|
||||
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
|
||||
index 8dbb2280538d..fd0562a37f68 100644
|
||||
index 8dbb228..fd0562a 100644
|
||||
--- a/drivers/gpio/Kconfig
|
||||
+++ b/drivers/gpio/Kconfig
|
||||
@@ -122,6 +122,15 @@ config GPIO_ATH79
|
||||
|
@ -254,7 +177,7 @@ index 8dbb2280538d..fd0562a37f68 100644
|
|||
bool "Broadcom Kona GPIO"
|
||||
depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)
|
||||
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
|
||||
index cccb0d40846c..76dc0a02bd56 100644
|
||||
index cccb0d4..76dc0a0 100644
|
||||
--- a/drivers/gpio/Makefile
|
||||
+++ b/drivers/gpio/Makefile
|
||||
@@ -32,6 +32,7 @@ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
|
||||
|
@ -267,7 +190,7 @@ index cccb0d40846c..76dc0a02bd56 100644
|
|||
obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
|
||||
diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
|
||||
new file mode 100644
|
||||
index 000000000000..d6d36d537e37
|
||||
index 0000000..d6d36d5
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
|
||||
@@ -0,0 +1,252 @@
|
||||
|
@ -523,36 +446,26 @@ index 000000000000..d6d36d537e37
|
|||
+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.org>");
|
||||
+MODULE_DESCRIPTION("Raspberry Pi 3 expander GPIO driver");
|
||||
+MODULE_ALIAS("platform:rpi-exp-gpio");
|
||||
From patchwork Tue Feb 20 12:19:34 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v5,4/5] ARM: dts: bcm2835: make the firmware node into a bus
|
||||
--
|
||||
cgit v1.1
|
||||
From b0c07c5af6d286f3d3b907743998e9d41f6ab042 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
X-Patchwork-Id: 10229961
|
||||
Message-Id: <43f9082a6835df6d7bcd3e16d79db687c52826d2.1519128054.git.baruch@tkos.co.il>
|
||||
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
|
||||
linux-gpio@vger.kernel.org, Michael Zoran <mzoran@crowfest.net>,
|
||||
Rob Herring <robh+dt@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
||||
Frank Rowand <frowand.list@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Tue, 20 Feb 2018 14:19:34 +0200
|
||||
Subject: ARM: dts: bcm2835: make the firmware node into a bus
|
||||
|
||||
This allows adding devices for which the firmware exposes control interface
|
||||
via the mailbox. An example of such device is the GPIO expander.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
v4: New patch in this series
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
index e36c392a2b8f..0198bd46ef7c 100644
|
||||
index e36c392..0198bd4 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
@@ -18,7 +18,9 @@
|
||||
|
@ -566,50 +479,26 @@ index e36c392a2b8f..0198bd46ef7c 100644
|
|||
mboxes = <&mailbox>;
|
||||
};
|
||||
|
||||
From patchwork Tue Feb 20 12:19:35 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v5,5/5] ARM: dts: bcm2837-rpi-3-b: add GPIO expander
|
||||
--
|
||||
cgit v1.1
|
||||
From 4d5b2eaf3ca80c56a59f230208c4ff11e3f68d55 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
X-Patchwork-Id: 10229995
|
||||
Message-Id: <a6d59692dc4847e0b1639a26542e28c95ad5240f.1519128054.git.baruch@tkos.co.il>
|
||||
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
|
||||
linux-gpio@vger.kernel.org, Michael Zoran <mzoran@crowfest.net>,
|
||||
Rob Herring <robh+dt@kernel.org>, linux-rpi-kernel@lists.infradead.org,
|
||||
Frank Rowand <frowand.list@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Tue, 20 Feb 2018 14:19:35 +0200
|
||||
Subject: ARM: dts: bcm2837-rpi-3-b: add GPIO expander
|
||||
|
||||
Add a description of the RPi3 GPIO expander that the VC4 firmware controls.
|
||||
|
||||
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
v5:
|
||||
* Drop the 'firmware' property
|
||||
|
||||
v4:
|
||||
* Move the gpio node under the firmware node
|
||||
* Rename the gpio node to plain 'gpio'
|
||||
* Add Stefan's ack
|
||||
|
||||
v3:
|
||||
* List GPIO names one per line.
|
||||
|
||||
v2:
|
||||
* Move GPIO expander node out of the soc container
|
||||
* Rename compatible string
|
||||
* Add gpio-line-names property
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
index 3e4ed7c5b0b3..0b31d995a066 100644
|
||||
index 3e4ed7c..0b31d99 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
@@ -25,6 +25,23 @@
|
||||
|
@ -636,72 +525,5 @@ index 3e4ed7c5b0b3..0b31d995a066 100644
|
|||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
From 257f497bb3e58f88500971145761ed55428618eb Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Date: Wed, 7 Mar 2018 15:56:20 +0100
|
||||
Subject: [PATCH] ARM: dts: bcm2837: Add missing GPIOs of Expander
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 20 +++++++++++++++++++-
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
index 0b31d995a066..3e87ed05918e 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
@@ -20,9 +20,14 @@
|
||||
|
||||
leds {
|
||||
act {
|
||||
- gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
|
||||
+ gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ wifi_pwrseq: wifi-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&firmware {
|
||||
@@ -42,6 +47,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&hdmi {
|
||||
+ hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
@@ -51,6 +60,7 @@
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm43438-bt";
|
||||
max-speed = <2000000>;
|
||||
+ shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -63,11 +73,19 @@
|
||||
|
||||
/* SDHCI is used to control the SDIO for wireless */
|
||||
&sdhci {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&emmc_gpio34>;
|
||||
status = "okay";
|
||||
bus-width = <4>;
|
||||
non-removable;
|
||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ };
|
||||
};
|
||||
|
||||
/* SDHOST is used to drive the SD card */
|
||||
--
|
||||
cgit v1.1
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,560 @@
|
|||
From patchwork Sat Apr 21 11:28:34 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [V2,1/9] ARM: dts: bcm283x: Fix PWM pin assignment
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
X-Patchwork-Id: 10354085
|
||||
Message-Id: <1524310122-9439-2-git-send-email-stefan.wahren@i2se.com>
|
||||
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
||||
Eric Anholt <eric@anholt.net>, Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>
|
||||
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
||||
Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
|
||||
Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Phil Elwell <phil@raspberrypi.org>, Alexander Graf <agraf@suse.de>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 13:28:34 +0200
|
||||
|
||||
All RPi 1 and 2 boards used the PWM (audio out) on pin 40 and 45.
|
||||
So it was easy to define them in bcm2835-rpi.dtsi. Starting with RPi 3
|
||||
this wont work anymore, because it uses pin 40 and 41. Furthermore the
|
||||
Zero variants doesn't have audio out.
|
||||
|
||||
This patch fixes this pin conflict by moving the PWM node to the board-level.
|
||||
|
||||
Change summary:
|
||||
RPi 3 B: PWM1 45 -> 41
|
||||
Zero, Zero W: PWM disabled
|
||||
all other: no functional change
|
||||
|
||||
Reported-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 ------
|
||||
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 ++++++
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 6 ++++++
|
||||
8 files changed, 42 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
||||
index aa1fc7b..2cd9c5e 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
||||
@@ -101,6 +101,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
||||
index 425f6b0..067d1f0 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
||||
@@ -96,6 +96,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
||||
index effa195..cfbdaac 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
||||
@@ -103,6 +103,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
index 772ec3b..5641d16 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
@@ -96,6 +96,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
||||
index 434483d..31ff602 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
||||
@@ -91,6 +91,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
index 6c3cfaa..cb2d6d7 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
@@ -83,12 +83,6 @@
|
||||
bus-width = <4>;
|
||||
};
|
||||
|
||||
-&pwm {
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
- status = "okay";
|
||||
-};
|
||||
-
|
||||
&usb {
|
||||
power-domains = <&power RPI_POWER_DOMAIN_USB>;
|
||||
};
|
||||
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
||||
index 5c339ad..2fef70a 100644
|
||||
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
||||
@@ -41,6 +41,12 @@
|
||||
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_gpio14>;
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
index 0b31d99..cc39b6f 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
@@ -42,6 +42,12 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
From patchwork Sat Apr 21 11:28:35 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [V2,2/9] ARM: dts: bcm2837: Add missing GPIOs of Expander
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
X-Patchwork-Id: 10354079
|
||||
Message-Id: <1524310122-9439-3-git-send-email-stefan.wahren@i2se.com>
|
||||
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
||||
Eric Anholt <eric@anholt.net>, Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>
|
||||
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
||||
Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
|
||||
Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Phil Elwell <phil@raspberrypi.org>, Alexander Graf <agraf@suse.de>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 13:28:35 +0200
|
||||
|
||||
After commit a98d90e7d588 ("gpio: raspberrypi-exp: Driver for RPi3 GPIO
|
||||
expander via mailbox service") we are able to control the rest of the
|
||||
GPIOs of the RPi 3. So add all the missing parts (ACT LED,
|
||||
Wifi & BT control, HDMI detect) to the DT.
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 20 +++++++++++++++++++-
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
index cc39b6f..c318bcb 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||||
@@ -20,9 +20,14 @@
|
||||
|
||||
leds {
|
||||
act {
|
||||
- gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
|
||||
+ gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ wifi_pwrseq: wifi-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&firmware {
|
||||
@@ -48,6 +53,10 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&hdmi {
|
||||
+ hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
|
||||
+};
|
||||
+
|
||||
/* uart0 communicates with the BT module */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
@@ -57,6 +66,7 @@
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm43438-bt";
|
||||
max-speed = <2000000>;
|
||||
+ shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -69,11 +79,19 @@
|
||||
|
||||
/* SDHCI is used to control the SDIO for wireless */
|
||||
&sdhci {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&emmc_gpio34>;
|
||||
status = "okay";
|
||||
bus-width = <4>;
|
||||
non-removable;
|
||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ };
|
||||
};
|
||||
|
||||
/* SDHOST is used to drive the SD card */
|
||||
From patchwork Sat Apr 21 11:28:36 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [V2,3/9] dt-bindings: bcm: Add Raspberry Pi 3 B+
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
X-Patchwork-Id: 10354081
|
||||
Message-Id: <1524310122-9439-4-git-send-email-stefan.wahren@i2se.com>
|
||||
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
||||
Eric Anholt <eric@anholt.net>, Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>
|
||||
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
||||
Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
|
||||
Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Phil Elwell <phil@raspberrypi.org>, Alexander Graf <agraf@suse.de>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 13:28:36 +0200
|
||||
|
||||
This adds the root properties for the Raspberry Pi 3 B+
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
Reviewed-by: Rob Herring <robh@kernel.org>
|
||||
---
|
||||
Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
|
||||
index 3e3efa0..1e3e29a 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
|
||||
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
|
||||
@@ -34,6 +34,10 @@ Raspberry Pi 3 Model B
|
||||
Required root node properties:
|
||||
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
|
||||
|
||||
+Raspberry Pi 3 Model B+
|
||||
+Required root node properties:
|
||||
+compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
|
||||
+
|
||||
Raspberry Pi Compute Module
|
||||
Required root node properties:
|
||||
compatible = "raspberrypi,compute-module", "brcm,bcm2835";
|
||||
From patchwork Sat Apr 21 11:28:37 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [V2,4/9] ARM: dts: bcm2837: Add Raspberry Pi 3 B+
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
X-Patchwork-Id: 10354075
|
||||
Message-Id: <1524310122-9439-5-git-send-email-stefan.wahren@i2se.com>
|
||||
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
||||
Eric Anholt <eric@anholt.net>, Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>
|
||||
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
||||
Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
|
||||
Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Phil Elwell <phil@raspberrypi.org>, Alexander Graf <agraf@suse.de>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 13:28:37 +0200
|
||||
|
||||
The Raspberry Pi 3 B+ has the following major differences compared
|
||||
to the model 3 B:
|
||||
* Microchip LAN7515 (Gigabit Ethernet with integrated USB 2.0 HUB)
|
||||
* Cypress CYW43455 (802.11n/ac and BT 4.2)
|
||||
|
||||
We need to add the USB LAN chip so the bootloader can add the MAC address.
|
||||
This is necessary because there ain't an EEPROM or a valid OTP.
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm/boot/dts/Makefile | 1 +
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++
|
||||
arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++
|
||||
3 files changed, 136 insertions(+)
|
||||
create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
|
||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
||||
index 7e24249..a300a35 100644
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
|
||||
bcm2835-rpi-a-plus.dtb \
|
||||
bcm2836-rpi-2-b.dtb \
|
||||
bcm2837-rpi-3-b.dtb \
|
||||
+ bcm2837-rpi-3-b-plus.dtb \
|
||||
bcm2835-rpi-zero.dtb \
|
||||
bcm2835-rpi-zero-w.dtb
|
||||
dtb-$(CONFIG_ARCH_BCM_5301X) += \
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
new file mode 100644
|
||||
index 0000000..4adb85e
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
@@ -0,0 +1,108 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/dts-v1/;
|
||||
+#include "bcm2837.dtsi"
|
||||
+#include "bcm2835-rpi.dtsi"
|
||||
+#include "bcm283x-rpi-lan7515.dtsi"
|
||||
+#include "bcm283x-rpi-usb-host.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
|
||||
+ model = "Raspberry Pi 3 Model B+";
|
||||
+
|
||||
+ chosen {
|
||||
+ /* 8250 auxiliary UART instead of pl011 */
|
||||
+ stdout-path = "serial1:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ memory {
|
||||
+ reg = <0 0x40000000>;
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ act {
|
||||
+ gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+
|
||||
+ pwr {
|
||||
+ label = "PWR";
|
||||
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ wifi_pwrseq: wifi-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&firmware {
|
||||
+ expgpio: gpio {
|
||||
+ compatible = "raspberrypi,firmware-gpio";
|
||||
+ gpio-controller;
|
||||
+ #gpio-cells = <2>;
|
||||
+ gpio-line-names = "BT_ON",
|
||||
+ "WL_ON",
|
||||
+ "STATUS_LED",
|
||||
+ "LAN_RUN",
|
||||
+ "",
|
||||
+ "CAM_GPIO0",
|
||||
+ "CAM_GPIO1",
|
||||
+ "";
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&hdmi {
|
||||
+ hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
|
||||
+};
|
||||
+
|
||||
+&pwm {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+/* SDHCI is used to control the SDIO for wireless */
|
||||
+&sdhci {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&emmc_gpio34>;
|
||||
+ status = "okay";
|
||||
+ bus-width = <4>;
|
||||
+ non-removable;
|
||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* SDHOST is used to drive the SD card */
|
||||
+&sdhost {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&sdhost_gpio48>;
|
||||
+ status = "okay";
|
||||
+ bus-width = <4>;
|
||||
+};
|
||||
+
|
||||
+/* uart0 communicates with the BT module */
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm43438-bt";
|
||||
+ max-speed = <2000000>;
|
||||
+ shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* uart1 is mapped to the pin header */
|
||||
+&uart1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart1_gpio14>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
new file mode 100644
|
||||
index 0000000..9403da0
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
@@ -0,0 +1,27 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/ {
|
||||
+ aliases {
|
||||
+ ethernet0 = ðernet;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb {
|
||||
+ usb-port@1 {
|
||||
+ compatible = "usb424,2514";
|
||||
+ reg = <1>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ usb-port@1 {
|
||||
+ compatible = "usb424,2514";
|
||||
+ reg = <1>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ ethernet: ethernet@1 {
|
||||
+ compatible = "usb424,7800";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
From patchwork Sat Apr 21 11:28:42 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [V2,9/9] arm64: dts: broadcom: Add reference to Raspberry Pi 3 B+
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
X-Patchwork-Id: 10354077
|
||||
Message-Id: <1524310122-9439-10-git-send-email-stefan.wahren@i2se.com>
|
||||
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
||||
Eric Anholt <eric@anholt.net>, Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>
|
||||
Cc: Stefan Wahren <stefan.wahren@i2se.com>, devicetree@vger.kernel.org,
|
||||
Florian Fainelli <f.fainelli@gmail.com>, Arnd Bergmann <arnd@arndb.de>,
|
||||
Scott Branden <sbranden@broadcom.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Phil Elwell <phil@raspberrypi.org>, Alexander Graf <agraf@suse.de>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 13:28:42 +0200
|
||||
|
||||
This adds a reference to the dts of the Raspberry Pi 3 B+
|
||||
in arm, so don't need to maintain the content in arm64.
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/Makefile | 3 ++-
|
||||
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 ++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
index 2a2591e..1193a9e 100644
|
||||
--- a/arch/arm64/boot/dts/broadcom/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
|
||||
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \
|
||||
+ bcm2837-rpi-3-b-plus.dtb
|
||||
|
||||
subdir-y += northstar2
|
||||
subdir-y += stingray
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
new file mode 100644
|
||||
index 0000000..46ad202
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
@@ -0,0 +1,2 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+#include "arm/bcm2837-rpi-3-b-plus.dts"
|
|
@ -1,209 +0,0 @@
|
|||
From defa4876ece55751c691d17ffc928d9bfe049585 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Date: Fri, 16 Mar 2018 22:56:59 +0100
|
||||
Subject: [PATCH] arm64: dts: broadcom: Add reference to Raspberry Pi 3 B+
|
||||
|
||||
This adds a reference to the dts file of the Raspberry Pi 3 B+
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/Makefile | 3 ++-
|
||||
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 ++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
index 2a2591ef1fee..1193a9e34bbb 100644
|
||||
--- a/arch/arm64/boot/dts/broadcom/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
|
||||
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \
|
||||
+ bcm2837-rpi-3-b-plus.dtb
|
||||
|
||||
subdir-y += northstar2
|
||||
subdir-y += stingray
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
new file mode 100644
|
||||
index 000000000000..46ad2023cccf
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
|
||||
@@ -0,0 +1,2 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+#include "arm/bcm2837-rpi-3-b-plus.dts"
|
||||
|
||||
From c7c06c54087dfadd065abcba0b7f614f7a88d549 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Fri, 16 Mar 2018 22:42:28 +0100
|
||||
Subject: [PATCH] ARM: dts: bcm2837: Add Raspberry Pi 3 B+
|
||||
|
||||
The Raspberry Pi 3 B+ has the following major differences compared
|
||||
to the model 3 B:
|
||||
* Microchip LAN7515 (Gigabit Ethernet)
|
||||
* Cypress CYW43455 (802.11ac and BT 4.2)
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
---
|
||||
arch/arm/boot/dts/Makefile | 1 +
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 102 +++++++++++++++++++++++++++++
|
||||
arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++
|
||||
3 files changed, 130 insertions(+)
|
||||
create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
|
||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
||||
index 3b471e6787ff..dee85f848de9 100644
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
|
||||
bcm2835-rpi-a-plus.dtb \
|
||||
bcm2836-rpi-2-b.dtb \
|
||||
bcm2837-rpi-3-b.dtb \
|
||||
+ bcm2837-rpi-3-b-plus.dtb \
|
||||
bcm2835-rpi-zero.dtb \
|
||||
bcm2835-rpi-zero-w.dtb
|
||||
dtb-$(CONFIG_ARCH_BCM_5301X) += \
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
new file mode 100644
|
||||
index 000000000000..fb9f6f7e965c
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
@@ -0,0 +1,102 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/dts-v1/;
|
||||
+#include "bcm2837.dtsi"
|
||||
+#include "bcm2835-rpi.dtsi"
|
||||
+#include "bcm283x-rpi-lan7515.dtsi"
|
||||
+#include "bcm283x-rpi-usb-host.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
|
||||
+ model = "Raspberry Pi 3 Model B+";
|
||||
+
|
||||
+ chosen {
|
||||
+ /* 8250 auxiliary UART instead of pl011 */
|
||||
+ stdout-path = "serial1:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ memory {
|
||||
+ reg = <0 0x40000000>;
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ act {
|
||||
+ gpios = <&gpio 29 0>;
|
||||
+ };
|
||||
+
|
||||
+ pwr {
|
||||
+ label = "PWR";
|
||||
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ wifi_pwrseq: wifi-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&firmware {
|
||||
+ expgpio: gpio {
|
||||
+ compatible = "raspberrypi,firmware-gpio";
|
||||
+ gpio-controller;
|
||||
+ #gpio-cells = <2>;
|
||||
+ gpio-line-names = "BT_ON",
|
||||
+ "WL_ON",
|
||||
+ "STATUS_LED",
|
||||
+ "LAN_RUN",
|
||||
+ "",
|
||||
+ "CAM_GPIO0",
|
||||
+ "CAM_GPIO1",
|
||||
+ "";
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&hdmi {
|
||||
+ hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
|
||||
+};
|
||||
+
|
||||
+/* uart0 communicates with the BT module */
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm43438-bt";
|
||||
+ max-speed = <2000000>;
|
||||
+ shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* uart1 is mapped to the pin header */
|
||||
+&uart1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart1_gpio14>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+/* SDHCI is used to control the SDIO for wireless */
|
||||
+&sdhci {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&emmc_gpio34>;
|
||||
+ status = "okay";
|
||||
+ bus-width = <4>;
|
||||
+ non-removable;
|
||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* SDHOST is used to drive the SD card */
|
||||
+&sdhost {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&sdhost_gpio48>;
|
||||
+ status = "okay";
|
||||
+ bus-width = <4>;
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
new file mode 100644
|
||||
index 000000000000..169203c5ce8b
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
|
||||
@@ -0,0 +1,27 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/ {
|
||||
+ aliases {
|
||||
+ ethernet0 = ðernet;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb {
|
||||
+ usb1@1 {
|
||||
+ compatible = "usb424,2514";
|
||||
+ reg = <1>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ usb1_1@1 {
|
||||
+ compatible = "usb424,2514";
|
||||
+ reg = <1>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ ethernet: usbether@1 {
|
||||
+ compatible = "usb424,7800";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
From c0db1b677e1d584fab5d7ac76a32e1c0157542e0 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel J Blueman <daniel@quora.org>
|
||||
Date: Mon, 2 Apr 2018 15:10:35 +0800
|
||||
Subject: drm/vc4: Fix memory leak during BO teardown
|
||||
|
||||
During BO teardown, an indirect list 'uniform_addr_offsets' wasn't being
|
||||
freed leading to leaking many 128B allocations. Fix the memory leak by
|
||||
releasing it at teardown time.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Fixes: 6d45c81d229d ("drm/vc4: Add support for branching in shader validation.")
|
||||
Signed-off-by: Daniel J Blueman <daniel@quora.org>
|
||||
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
Link: https://patchwork.freedesktop.org/patch/msgid/20180402071035.25356-1-daniel@quora.org
|
||||
---
|
||||
drivers/gpu/drm/vc4/vc4_bo.c | 2 ++
|
||||
drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 +
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
|
||||
index 2decc8e..add9cc9 100644
|
||||
--- a/drivers/gpu/drm/vc4/vc4_bo.c
|
||||
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
|
||||
@@ -195,6 +195,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo)
|
||||
vc4_bo_set_label(obj, -1);
|
||||
|
||||
if (bo->validated_shader) {
|
||||
+ kfree(bo->validated_shader->uniform_addr_offsets);
|
||||
kfree(bo->validated_shader->texture_samples);
|
||||
kfree(bo->validated_shader);
|
||||
bo->validated_shader = NULL;
|
||||
@@ -591,6 +592,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
|
||||
}
|
||||
|
||||
if (bo->validated_shader) {
|
||||
+ kfree(bo->validated_shader->uniform_addr_offsets);
|
||||
kfree(bo->validated_shader->texture_samples);
|
||||
kfree(bo->validated_shader);
|
||||
bo->validated_shader = NULL;
|
||||
diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
|
||||
index d3f15bf..7cf82b0 100644
|
||||
--- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c
|
||||
+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
|
||||
@@ -942,6 +942,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj)
|
||||
fail:
|
||||
kfree(validation_state.branch_targets);
|
||||
if (validated_shader) {
|
||||
+ kfree(validated_shader->uniform_addr_offsets);
|
||||
kfree(validated_shader->texture_samples);
|
||||
kfree(validated_shader);
|
||||
}
|
||||
--
|
||||
cgit v1.1
|
17
kernel.spec
17
kernel.spec
|
@ -627,9 +627,19 @@ Patch319: clk-ti-fix-flag-space-conflict-with-clkctrl-clocks.patch
|
|||
|
||||
Patch320: arm-dts-Add-am335x-pocketbeagle.patch
|
||||
|
||||
# https://patchwork.kernel.org/patch/10354521/
|
||||
# https://patchwork.kernel.org/patch/10354187/
|
||||
# https://patchwork.kernel.org/patch/10306793/
|
||||
# https://patchwork.kernel.org/patch/10133165/
|
||||
Patch321: mvebu-a37xx-fixes.patch
|
||||
|
||||
# in 4.17, headed to stable
|
||||
Patch329: bcm283x-drm-vc4-fix-mem-leak.patch
|
||||
|
||||
# Enabling Patches for the RPi3+
|
||||
Patch330: bcm2837-rpi-initial-support-for-the-3.patch
|
||||
Patch331: bcm2837-gpio-expander.patch
|
||||
Patch330: bcm2837-gpio-expander.patch
|
||||
# http://www.spinics.net/lists/arm-kernel/msg647617.html
|
||||
Patch331: bcm2837-rpi-initial-3plus-support.patch
|
||||
Patch332: bcm2837-enable-pmu.patch
|
||||
Patch333: bcm2837-lan78xx-fixes.patch
|
||||
|
||||
|
@ -1907,6 +1917,9 @@ fi
|
|||
%changelog
|
||||
* Sun Apr 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Add quirk patch to fix X-Gene 1 console on HP m400/Mustang (RHBZ 1531140)
|
||||
- Add fixes for Marvell a37xx EspressoBin
|
||||
- Update to latest Raspberry Pi 3+ fixes
|
||||
- More fixes for lan78xx on the Raspberry Pi 3+
|
||||
|
||||
* Thu Apr 19 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.3-200
|
||||
- Linux v4.16.3
|
||||
|
|
|
@ -0,0 +1,245 @@
|
|||
From patchwork Sun Apr 22 12:33:46 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: serial: mvebu-uart: Fix local flags handling on termios update
|
||||
From: Marc Zyngier <Marc.Zyngier@arm.com>
|
||||
X-Patchwork-Id: 10354521
|
||||
Message-Id: <20180422123346.15538-1-marc.zyngier@arm.com>
|
||||
To: linux-arm-kernel@lists.infradead.org,
|
||||
linux-kernel@vger.kernel.org
|
||||
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>,
|
||||
Allen Yan <yanwei@marvell.com>,
|
||||
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
|
||||
Miquel Raynal <miquel.raynal@free-electrons.com>
|
||||
Date: Sun, 22 Apr 2018 13:33:46 +0100
|
||||
|
||||
Commit 68a0db1d7da2 reworked the baud rate selection, but also added
|
||||
a (not so) subtle change in the way the local flags (c_lflag in the
|
||||
termios structure) are handled, forcing the new flags to always be the
|
||||
same as the old ones.
|
||||
|
||||
The reason for that particular change is both obscure and undocumented.
|
||||
It also completely breaks userspace. Something as trivial as getty is
|
||||
unusable:
|
||||
|
||||
<example>
|
||||
Debian GNU/Linux 9 sy-borg ttyMV0
|
||||
|
||||
sy-borg login: root
|
||||
root
|
||||
[timeout]
|
||||
|
||||
Debian GNU/Linux 9 sy-borg ttyMV0
|
||||
</example>
|
||||
|
||||
which is quite obvious in retrospect: getty cannot get in control of
|
||||
the echo mode, is stuck in canonical mode, and times out without ever
|
||||
seeing anything valid. It also begs the question of how this change was
|
||||
ever tested.
|
||||
|
||||
The fix is pretty obvious: stop messing with c_lflag, and the world
|
||||
will be a happier place.
|
||||
|
||||
Cc: stable@vger.kernel.org # 4.15+
|
||||
Fixes: 68a0db1d7da2 ("serial: mvebu-uart: add function to change baudrate")
|
||||
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
|
||||
---
|
||||
drivers/tty/serial/mvebu-uart.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
|
||||
index 750e5645dc85..f503fab1e268 100644
|
||||
--- a/drivers/tty/serial/mvebu-uart.c
|
||||
+++ b/drivers/tty/serial/mvebu-uart.c
|
||||
@@ -495,7 +495,6 @@ static void mvebu_uart_set_termios(struct uart_port *port,
|
||||
termios->c_iflag |= old->c_iflag & ~(INPCK | IGNPAR);
|
||||
termios->c_cflag &= CREAD | CBAUD;
|
||||
termios->c_cflag |= old->c_cflag & ~(CREAD | CBAUD);
|
||||
- termios->c_lflag = old->c_lflag;
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&port->lock, flags);
|
||||
From patchwork Wed Apr 4 14:44:44 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: cpufreq: armada-37xx: Fix clock leak
|
||||
From: Gregory CLEMENT <gregory.clement@bootlin.com>
|
||||
X-Patchwork-Id: 10322649
|
||||
Message-Id: <20180404144444.4142-1-gregory.clement@bootlin.com>
|
||||
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
|
||||
Viresh Kumar <viresh.kumar@linaro.org>, linux-pm@vger.kernel.org
|
||||
Cc: Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>,
|
||||
Hua Jing <jinghua@marvell.com>,
|
||||
Antoine Tenart <antoine.tenart@bootlin.com>,
|
||||
Gregory CLEMENT <gregory.clement@bootlin.com>, stable@vger.kernel.org,
|
||||
Maxime Chevallier <maxime.chevallier@bootlin.com>,
|
||||
Nadav Haklai <nadavh@marvell.com>, Victor Gu <xigu@marvell.com>,
|
||||
Neta Zur Hershkovits <neta@marvell.com>,
|
||||
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
|
||||
=?UTF-8?q?Miqu=C3=A8l=20Raynal?= <miquel.raynal@bootlin.com>,
|
||||
Marcin Wojtas <mw@semihalf.com>, Wilson Ding <dingwei@marvell.com>,
|
||||
linux-arm-kernel@lists.infradead.org,
|
||||
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||
Date: Wed, 4 Apr 2018 16:44:44 +0200
|
||||
|
||||
There was no clk_put() balancing the clk_get(). This commit fixes it.
|
||||
|
||||
Fixes: 92ce45fb875d ("cpufreq: Add DVFS support for Armada 37xx")
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
||||
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
||||
---
|
||||
drivers/cpufreq/armada-37xx-cpufreq.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
|
||||
index c6ebc88a7d8d..72a2975499db 100644
|
||||
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
|
||||
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
|
||||
@@ -202,6 +202,7 @@ static int __init armada37xx_cpufreq_driver_init(void)
|
||||
cur_frequency = clk_get_rate(clk);
|
||||
if (!cur_frequency) {
|
||||
dev_err(cpu_dev, "Failed to get clock rate for CPU\n");
|
||||
+ clk_put(clk);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -210,6 +211,7 @@ static int __init armada37xx_cpufreq_driver_init(void)
|
||||
return -EINVAL;
|
||||
|
||||
armada37xx_cpufreq_dvfs_setup(nb_pm_base, clk, dvfs->divider);
|
||||
+ clk_put(clk);
|
||||
|
||||
for (load_lvl = ARMADA_37XX_DVFS_LOAD_0; load_lvl < LOAD_LEVEL_NR;
|
||||
load_lvl++) {
|
||||
From patchwork Sun Mar 25 19:57:36 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Subject: arm64: dts: armada-3720-espressobin: wire up spi flash
|
||||
From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
||||
X-Patchwork-Id: 10306793
|
||||
Message-Id: <20180325195736.19782-1-u.kleine-koenig@pengutronix.de>
|
||||
To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
|
||||
Gregory Clement <gregory.clement@bootlin.com>,
|
||||
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||
Cc: Ellie Reeves <ellierevves@gmail.com>,
|
||||
linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de
|
||||
Date: Sun, 25 Mar 2018 21:57:36 +0200
|
||||
|
||||
From: Ellie Reeves <ellierevves@gmail.com>
|
||||
|
||||
This is the storage the machine boots from by default. The partitioning
|
||||
is taken from the U-Boot that is shipped with the board. There is some
|
||||
more space on the flash that isn't used.
|
||||
|
||||
Signed-off-by: Ellie Reeves <ellierevves@gmail.com>
|
||||
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
||||
---
|
||||
.../boot/dts/marvell/armada-3720-espressobin.dts | 27 ++++++++++++++++++++++
|
||||
1 file changed, 27 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
||||
index 882d6e4a04e4..5f98c2fecca4 100644
|
||||
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
||||
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
||||
@@ -108,6 +108,33 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&spi0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ flash@0 {
|
||||
+ reg = <0>;
|
||||
+ compatible = "winbond,w25q32dw", "jedec,spi-flash";
|
||||
+ spi-max-frequency = <104000000>;
|
||||
+ m25p,fast-read;
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "uboot";
|
||||
+ reg = <0 0x180000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@180000 {
|
||||
+ label = "ubootenv";
|
||||
+ reg = <0x180000 0x10000>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
/* Exported on the micro USB connector J5 through an FTDI */
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
From patchwork Sat Apr 21 14:03:42 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: arm64: dts: marvell: armada-37xx: reserve memory for ATF
|
||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||
X-Patchwork-Id: 10354187
|
||||
Message-Id: <20180421140342.25082-1-miquel.raynal@bootlin.com>
|
||||
To: Gregory Clement <gregory.clement@bootlin.com>,
|
||||
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
|
||||
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||
Cc: Mark Rutland <mark.rutland@arm.com>, devicetree@vger.kernel.org,
|
||||
Antoine Tenart <antoine.tenart@bootlin.com>,
|
||||
Catalin Marinas <catalin.marinas@arm.com>,
|
||||
Will Deacon <will.deacon@arm.com>,
|
||||
Maxime Chevallier <maxime.chevallier@bootlin.com>,
|
||||
Nadav Haklai <nadavh@marvell.com>, Rob Herring <robh+dt@kernel.org>,
|
||||
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
|
||||
Miquel Raynal <miquel.raynal@bootlin.com>, Victor Gu <xigu@marvell.com>,
|
||||
linux-arm-kernel@lists.infradead.org
|
||||
Date: Sat, 21 Apr 2018 16:03:42 +0200
|
||||
|
||||
From: Victor Gu <xigu@marvell.com>
|
||||
|
||||
The PSCI area should be reserved in Linux for PSCI operations such as
|
||||
suspend/resume.
|
||||
|
||||
Reserve 2MiB of memory which matches the area used by ATF (BL1, BL2,
|
||||
BL3x, see [1] in ATF source code). This covers all PSCI code and data
|
||||
area and is 2MiB aligned, which is required by Linux for huge pages
|
||||
handling.
|
||||
|
||||
[1] plat/marvell/a3700/common/include/platform_def.h
|
||||
|
||||
Signed-off-by: Victor Gu <xigu@marvell.com>
|
||||
[miquel.raynal@bootlin.com: reword of commit message]
|
||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||
---
|
||||
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
||||
index 97207a61bc79..429ce91bfc39 100644
|
||||
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
||||
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
||||
@@ -22,6 +22,17 @@
|
||||
serial1 = &uart1;
|
||||
};
|
||||
|
||||
+ reserved-memory {
|
||||
+ #address-cells = <2>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges;
|
||||
+
|
||||
+ psci-area@4000000 {
|
||||
+ reg = <0 0x4000000 0 0x200000>;
|
||||
+ no-map;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
Loading…
Reference in New Issue