| Message ID | 2362486.gYoCZEsBuK@phil (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | fc702ed49a8668a17343811ee28214d845bfc5e6 |
| Headers | show |
| Series | [GIT,PULL,1/2] Rockchip DT32 changes for 5.4 - round1 | expand |
On Sat, Aug 17, 2019 at 3:46 PM Heiko Stuebner <heiko@sntech.de> wrote: > > The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: > > Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.4-rockchip-dts64-1 > > for you to fetch changes up to fc702ed49a8668a17343811ee28214d845bfc5e6: > > arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC (2019-08-16 14:39:20 +0200) > > ---------------------------------------------------------------- > PWM-Fan and nor-flash for the RockPro64, a better display mode for > the Kevin Chromebook and a new board the Leez P710 SBC. > Pulled into arm/dt, with this small conflict resolved: diff --cc Documentation/devicetree/bindings/arm/rockchip.yaml index 4a1a28e7a812,da9cd947abfa..474f961bf746 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@@ -359,11 -329,11 +359,16 @@@ properties - khadas,edge-v - const: rockchip,rk3399 + - description: Mecer Xtreme Mini S6 + items: + - const: mecer,xms6 + - const: rockchip,rk3229 + + - description: Leez RK3399 P710 + items: + - const: leez,p710 + - const: rockchip,rk3399 + - description: mqmaker MiQi items: - const: mqmaker,miqi Arnd -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#456): https://linux.kernel.org/g/patchwork-soc/message/456 Mute This Topic: https://linux.kernel.org/mt/32922695/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
Am Dienstag, 3. September 2019, 15:06:48 CEST schrieb Arnd Bergmann: > On Sat, Aug 17, 2019 at 3:46 PM Heiko Stuebner <heiko@sntech.de> wrote: > > > > The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: > > > > Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.4-rockchip-dts64-1 > > > > for you to fetch changes up to fc702ed49a8668a17343811ee28214d845bfc5e6: > > > > arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC (2019-08-16 14:39:20 +0200) > > > > ---------------------------------------------------------------- > > PWM-Fan and nor-flash for the RockPro64, a better display mode for > > the Kevin Chromebook and a new board the Leez P710 SBC. > > > > > Pulled into arm/dt, with this small conflict resolved: Thanks for resolving the conflict. I should've just moved the binding addition to the other branch in the first place to not create conflicts. Hopefully will remember that for later boards :-) . Thanks Heiko > > diff --cc Documentation/devicetree/bindings/arm/rockchip.yaml > index 4a1a28e7a812,da9cd947abfa..474f961bf746 > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml > @@@ -359,11 -329,11 +359,16 @@@ properties > - khadas,edge-v > - const: rockchip,rk3399 > > + - description: Mecer Xtreme Mini S6 > + items: > + - const: mecer,xms6 > + - const: rockchip,rk3229 > + > + - description: Leez RK3399 P710 > + items: > + - const: leez,p710 > + - const: rockchip,rk3399 > + > - description: mqmaker MiQi > items: > - const: mqmaker,miqi > > Arnd > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#536): https://linux.kernel.org/g/patchwork-soc/message/536 Mute This Topic: https://linux.kernel.org/mt/32922695/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
On Thu, Sep 5, 2019 at 2:21 PM Heiko Stuebner <heiko@sntech.de> wrote: > > Am Dienstag, 3. September 2019, 15:06:48 CEST schrieb Arnd Bergmann: > > On Sat, Aug 17, 2019 at 3:46 PM Heiko Stuebner <heiko@sntech.de> wrote: > > Pulled into arm/dt, with this small conflict resolved: > > Thanks for resolving the conflict. I should've just moved the binding > addition to the other branch in the first place to not create conflicts. > Hopefully will remember that for later boards :-) . Don't waste too much time on that, resolving trivial conflicts like this one is much easier than avoiding them. Arnd -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#537): https://linux.kernel.org/g/patchwork-soc/message/537 Mute This Topic: https://linux.kernel.org/mt/32922695/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.4-rockchip-dts64-1 for you to fetch changes up to fc702ed49a8668a17343811ee28214d845bfc5e6: arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC (2019-08-16 14:39:20 +0200) ---------------------------------------------------------------- PWM-Fan and nor-flash for the RockPro64, a better display mode for the Kevin Chromebook and a new board the Leez P710 SBC. ---------------------------------------------------------------- Andrius Štikonas (2): arm64: dts: rockchip: Add PWM fan for RockPro64 arm64: dts: rockchip: enable internal SPI flash for RockPro64. Andy Yan (1): arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC Sean Paul (1): arm64: dts: rockchip: Specify override mode for kevin panel .../devicetree/bindings/arm/rockchip.yaml | 5 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + arch/arm64/boot/dts/rockchip/Makefile | 1 + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 645 +++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 21 + 6 files changed, 688 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#368): https://linux.kernel.org/g/patchwork-soc/message/368 Mute This Topic: https://linux.kernel.org/mt/32922695/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-