Message ID | 20200106135142.1.I3f99ac8399a564c88ff48ae6290cc691b47c16ae@changeid (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1f5e928340061bc9729c82591ec4379909e708d6 |
Headers | show |
Series | ARM: dts: rockchip: Use ABI name for write protect pin on veyron fievel/tiger | expand |
Hi, On Mon, Jan 6, 2020 at 1:52 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > The flash write protect pin is currently named 'FW_WP_AP', which is > how the signal is called in the schematics. The Chrome OS ABI > requires the pin to be named 'AP_FLASH_WP_L', which is also how > it is called on all other veyron devices. Rename the pin to match > the ABI. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > arch/arm/boot/dts/rk3288-veyron-fievel.dts | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Douglas Anderson <dianders@chromium.org>
Am Montag, 6. Januar 2020, 22:52:13 CET schrieb Matthias Kaehlcke: > The flash write protect pin is currently named 'FW_WP_AP', which is > how the signal is called in the schematics. The Chrome OS ABI > requires the pin to be named 'AP_FLASH_WP_L', which is also how > it is called on all other veyron devices. Rename the pin to match > the ABI. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> applied for 5.6 Thanks Heiko
diff --git a/arch/arm/boot/dts/rk3288-veyron-fievel.dts b/arch/arm/boot/dts/rk3288-veyron-fievel.dts index 9a0f55085839d9..d66e720390121d 100644 --- a/arch/arm/boot/dts/rk3288-veyron-fievel.dts +++ b/arch/arm/boot/dts/rk3288-veyron-fievel.dts @@ -382,7 +382,11 @@ &gpio7 { "PWR_LED1", "TPM_INT_H", "SPK_ON", - "FW_WP_AP", + /* + * AP_FLASH_WP_L is Chrome OS ABI. Schematics call + * it FW_WP_AP. + */ + "AP_FLASH_WP_L", "", "CPU_NMI",
The flash write protect pin is currently named 'FW_WP_AP', which is how the signal is called in the schematics. The Chrome OS ABI requires the pin to be named 'AP_FLASH_WP_L', which is also how it is called on all other veyron devices. Rename the pin to match the ABI. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- arch/arm/boot/dts/rk3288-veyron-fievel.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)