Major changes from v10:
1) Change WiFi sdio from SDMMC0 to SDIO_M0.
2) RK803 Flood&PRO GPIO pin changes due to 1).
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: If264d2ec1ff7421a5089244b116cd3bac9bcbf70
diff rv1103g_bat_ipc_demo_v11 with rv1103g_bat_ipc_demo_v10
1. camera sensor use SC3338
2. remove WiFi's PA
3. control lux_en(GPIO3_A2) inversely
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I57b9dd35a7cddc5869d385412d47112c3b9a6222
[ Upstream commit 935327a73553001f8d81375c76985d05f604507f ]
Meraki MR26 is an EOL wireless access point featuring a
PoE ethernet port and two dual-band 3x3 MIMO 802.11n
radios and 1x1 dual-band WIFI dedicated to scanning.
Thank you Amir for the unit and PSU.
Hardware info:
SOC : Broadcom BCM53015A1KFEBG (dual-core Cortex-A9 CPU at 800 MHz)
RAM : SK Hynix Inc. H5TQ1G63EFR, 1 GBit DDR3 SDRAM = 128 MiB
NAND : Spansion S34ML01G100TF100, 1 GBit SLC NAND Flash = 128 MiB
ETH : 1 GBit Ethernet Port - PoE (TPS23754 PoE Interface)
WIFI0 : Broadcom BCM43431KMLG, BCM43431 802.11 abgn (3x3:3)
WIFI1 : Broadcom BCM43431KMLG, BCM43431 802.11 abgn (3x3:3)
WIFI2 : Broadcom BCM43428 "Air Marshal" 802.11 abgn (1x1:1)
BUTTON: One reset key behind a small hole next to the Ethernet Port
LEDS : One amber (fault), one white (indicator) LED, separate RGB-LED
MISC : Atmel AT24C64 8KiB EEPROM i2c
: Ti INA219 26V, 12-bit, i2c output current/voltage/power monitor
SERIAL:
WARNING: The serial port needs a TTL/RS-232 3V3 level converter!
The Serial setting is 115200-8-N-1. The board has a populated
right angle 1x4 0.1" pinheader.
The pinout is: VCC (next to J3, has the pin 1 indicator), RX, TX, GND.
Odd stuff:
- uboot does not support lzma compression, but gzip'd uImage/DTB work.
- uboot claims to support FIT, but fails to pass the DTB to the kernel.
Appending the dtb after the kernel image works.
- RGB-controller is supported through an external userspace program.
- The ubi partition contains a "board-config" volume. It stores the
MAC Address (0x66 in binary) and Serial No. (0x7c alpha-numerical).
- SoC's temperature sensor always reports that it is on fire.
This causes the system to immediately shutdown! Looking at reported
"418 degree Celsius" suggests that this sensor is not working.
WIFI:
b43 is able to initialize all three WIFIs @ 802.11bg.
| b43-phy0: Broadcom 43431 WLAN found (core revision 29)
| bcma-pci-bridge 0000:01:00.0: bus1: Switched to core: 0x812
| b43-phy0: Found PHY: Analog 9, Type 7 (HT), Revision 1
| b43-phy0: Found Radio: Manuf 0x17F, ID 0x2059, Revision 0, Version 1
| b43-phy0 warning: 5 GHz band is unsupported on this PHY
| b43-phy1: Broadcom 43431 WLAN found (core revision 29)
| bcma-pci-bridge 0001:01:00.0: bus2: Switched to core: 0x812
| b43-phy1: Found PHY: Analog 9, Type 7 (HT), Revision 1
| b43-phy1: Found Radio: Manuf 0x17F, ID 0x2059, Revision 0, Version 1
| b43-phy1 warning: 5 GHz band is unsupported on this PHY
| b43-phy2: Broadcom 43228 WLAN found (core revision 30)
| bcma-pci-bridge 0002:01:00.0: bus3: Switched to core: 0x812
| b43-phy2: Found PHY: Analog 9, Type 4 (N), Revision 16
| b43-phy2: Found Radio: Manuf 0x17F, ID 0x2057, Revision 9, Version 1
| Broadcom 43xx driver loaded [ Features: NL ]
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
https://source.android.com/security/bulletin/2022-04-01
CVE-2021-0707
CVE-2021-39800
CVE-2021-39801 (4.9 only)
CVE-2021-39802
* tag 'ASB-2022-04-05_12-5.10': (3832 commits)
ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus
ANDROID: vendor_hooks: Reduce pointless modversions CRC churn
UPSTREAM: locking/lockdep: Avoid potential access of invalid memory in lock_class
ANDROID: mm: Fix implicit declaration of function 'isolate_lru_page'
ANDROID: GKI: Update symbols to symbol list
ANDROID: GKI: Update symbols to symbol list
ANDROID: GKI: Add hook symbol to symbol list
Revert "ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree"
ANDROID: vendor_hooks: Add hooks to for free_unref_page_commit
ANDROID: vendor_hooks: Add hooks to for alloc_contig_range
ANDROID: GKI: Update symbols to symbol list
ANDROID: vendor_hooks: Add hook in shrink_node_memcgs
ANDROID: GKI: Add symbols to symbol list
FROMGIT: iommu/iova: Improve 32-bit free space estimate
ANDROID: export walk_page_range and swp_swap_info
ANDROID: vendor_hooks: export shrink_slab
ANDROID: usb: gadget: f_accessory: add compat_ioctl support
UPSTREAM: sr9700: sanity check for packet length
UPSTREAM: io_uring: return back safer resurrect
UPSTREAM: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
...
Change-Id: Ic61ead530b99b10ffd535a358a48fe9bb8c33fd4
Conflicts:
drivers/android/Kconfig
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/i2c/busses/i2c-rk3x.c
drivers/media/i2c/imx258.c
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/function/uvc.h
lib/Kconfig.debug
RV1103G - QFN88
RV1106G - QFN128
RV1106 - BGA
Currently, the HW PCB is renamed with suffix 'G'
for QFN package. So, we do the same change.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id71e271f04f34f7cfb66ee338154f37236835763
[ Upstream commit 23885389dbbbbc698986e77a45c1fc44a6e3632e ]
Commit e428e250fd ("ARM: dts: Configure system timers for omap3")
caused a timer regression for beagleboard revision c where the system
clockevent stops working if omap3isp module is unloaded.
Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks
applied that limit the usable timers for no good reason. This also affects
the power management as we use the system clock instead of the 32k clock
source.
Let's fix the issue by adding a new omap3-beagle-ab4.dts for the old timer
quirks. This allows us to remove the timer quirks for later beagleboard
revisions. We also need to update the related timer quirk check for the
correct compatible property.
Fixes: e428e250fd ("ARM: dts: Configure system timers for omap3")
Cc: linux-kernel@vger.kernel.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rob Herring <robh+dt@kernel.org>
Reported-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
- Fix the system controller compatible for the hi3620 and hip04 SoCs
- Add the basic device tree for the hisilicon SD5203 SoC
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJfdCMMAAoJEAvIV27ZiWZcUxIP/1S7eF+l39oud7SPzX7cvY62
CoYkixPDTm8TvryE7iJD5adSz3ioLQhW5A/lCvglr2nWUOuDOGe06+Oqs5szggHr
QzUc5mQ90c0uHTzHegr0Gjry6M+paMaLnLaPw6xl6y8I77szPrsebmxLzjXMLqIk
78XEo+DogxnDZWDfdALKTcTJYP5mhwCDi7HnT4OvIjXMlmGtbmTc7zXOhBQtKk6P
IEe4h9Qhpjs5MA/kkf9QVWKpwoVP1bVIIaocCNcuqx+2ScGiCb/MibZ4gkRJV5B1
Wre3tN/kDh0Uq10jrjruH2krpy28dUFhx3pma1Yyn9SLhx8LZzB2L66wndLp4cXf
nzMuvwW57Lk3Q9y5ZFy97fGE8hO3mWb1xrkFFvuvxormkq1c07iQJ3LGf3NG8SeH
E/6mq6XQcnO/5UU8sXky3BSWIcxgFO67MT6qaJbTziTRWCDLRZCULR1IufxXCQ5O
ZLfVobjm+okA0Hz6c3jfShziv957qDClVqUn6wUfThlQaP05ekIdNxn7jNQOd/ju
Z2WGLDbh1a0GvheAjDPguxyhmFwDzWl4VgwuOSzvxyJ8O6LcjEeOBMEDVDAWLUFK
3Bs2fqZhVLD8yyJfPPDBfdmn4rBcpmUCP0yaoi0N5YnFDXtOtUJhngnrHVEJY3Ui
W6xY7lrnVF3znkyOaJET
=qsbd
-----END PGP SIGNATURE-----
Merge tag 'hisi-arm32-dt-for-5.10-tag2' of git://github.com/hisilicon/linux-hisi into arm/dt
ARM: DT: Hisilicon ARM32 SoCs DT updates for 5.10 (take two)
- Fix the system controller compatible for the hi3620 and hip04 SoCs
- Add the basic device tree for the hisilicon SD5203 SoC
* tag 'hisi-arm32-dt-for-5.10-tag2' of git://github.com/hisilicon/linux-hisi:
ARM: dts: hisilicon: add SD5203 dts
ARM: dts: hisilicon: fix the system controller compatible nodes
Link: https://lore.kernel.org/r/5F742717.5080405@hisilicon.com
Signed-off-by: Olof Johansson <olof@lixom.net>
and the pinecube board
-----BEGIN PGP SIGNATURE-----
iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX3HKAwAKCRDj7w1vZxhR
xc3bAQCcnys+hZ4XtwA/GIT10zcvpBVkUrjU56zZPG9WiEA9AgD/S9PN5m6J0R7O
F8dU+0Xx8O+3KNwIhuqEw2Mj7WHpcwE=
=6hIV
-----END PGP SIGNATURE-----
Merge tag 'sunxi-dt-for-5.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt
A few more DT patches for 5.10, to support simple-framebuffer on the v3s
and the pinecube board
* tag 'sunxi-dt-for-5.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun8i: v3s: Add simple-framebuffer
ARM: dts: sun8i: s3l: add support for Pine64 PineCube IP camera
dt-bindings: arm: sunxi: add Pine64 PineCube binding
ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for I2C1 at PE bank
ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for 8-bit parallel CSI
ARM: dts: sun8i: V3/V3s/S3/S3L: add CSI1 device node
ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for UART2 RX/TX
ARM: dts: sun8i: V3/V3s/S3/S3L: add Ethernet support
Link: https://lore.kernel.org/r/e7c12b59-8603-438d-908b-5f0bde2c8697.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>
- Add devicetree support for Caninos Loucos Labrador SBC manufactured
by Laboratory of Integrated Technological Systems (LSI-TEC), Brazil.
This board is based on Actions Semi S500 SoC. More information about
this board can be found in their website: https://caninosloucos.org/en/
- Fix PPI interrupt specifiers for peripherals attached to Cortex-A9 CPU
- Add devicetree support for RoseapplePi SBC manufactured by Roseapple Pi
team in Taiwan. This board is based on Actions Semi S500 SoC.
More information about this board can be found in their website:
http://roseapplepi.org/
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEZ6VDKoFIy9ikWCeXVZ8R5v6RzvUFAl9prhwACgkQVZ8R5v6R
zvVUKwgAp09Kdu17PUNmoqjujUmkAlANgzW30Z12ear1hSJNEoXV8ZgswAYyeerk
exPQWXEvueDYXXgXiLCjaOI8p/Ukae4wc8eaTyYN7i0JMxGQ1wnpdEI8su1VC+ph
+RuL/mH/dc/pibWMBVIf+YP4mfQz+RCX1+VRHbINKHeMuQ3rCecQ6352GZxkt/EU
3BEr2QpNBvIwMLxllUf51k/ng9w2mtEk+7uDEPJmBtUCbRUWxhq5UexAoUJbPvLU
2f8OpYh4Tbnxl/FLuRYCl0Yhk2bB9600HNhx1enK/P2u3wuJkK1tDlmLZoYOuirc
imx3OrzSnqOtAJBg2chcaY2tq+SUtA==
=PNl0
-----END PGP SIGNATURE-----
Merge tag 'actions-arm-dt-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions into arm/dt
Actions Semi ARM DT for v5.10:
- Add devicetree support for Caninos Loucos Labrador SBC manufactured
by Laboratory of Integrated Technological Systems (LSI-TEC), Brazil.
This board is based on Actions Semi S500 SoC. More information about
this board can be found in their website: https://caninosloucos.org/en/
- Fix PPI interrupt specifiers for peripherals attached to Cortex-A9 CPU
- Add devicetree support for RoseapplePi SBC manufactured by Roseapple Pi
team in Taiwan. This board is based on Actions Semi S500 SoC.
More information about this board can be found in their website:
http://roseapplepi.org/
* tag 'actions-arm-dt-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions:
ARM: dts: owl-s500: Add RoseapplePi
ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers
ARM: dts: Add Caninos Loucos Labrador v2
Link: https://lore.kernel.org/r/20200922113712.GB11251@Mani-XPS-13-9360
Signed-off-by: Olof Johansson <olof@lixom.net>
The Pine64 PineCube IP camera is an IP camera with SoChip S3 SoC.
It comes with a main board, an expansion board and a camera.
The main board features a Micro-USB power-only jack, a USB Type-A port,
an Ethernet port connected to the internal PHY of the SoC and a Realtek
RTL8189ES SDIO Wi-Fi module. A RGB LCD connector is reserved on the
board.
The expansion board features a TF slot, a microphone, a speaker
connector with on-board amplifier and a few IR LEDs.
Add support for the kit, with features on the main board and the
expansion board now.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20200923010215.148819-2-icenowy@aosc.io
- New board/device support: Tolino Shine 2 HD, TQMa6 SoM, Y Soft IOTA
Orion board.
- update GPMI NAND node name to nand-controller for aligning with DT
schema.
- Remove the legacy fsl,spi-num-chipselects property from a few board.
- A series to update imx6q-logicpd support, using GPIO chipselect,
adding board compatible string, and enabling DTB build for the board.
- Complete RNG device node in i.MX6SL device tree, and add RNG node for
i.MX6SLL and i.MX6ULL.
- Correct interrupt flags for imx6qdl-gw5xxx boards.
- Add missing enet_out clock for i.MX6Q/DL Ethernet device.
- Enable PCIe support for imx6qp-sabreauto board.
- A series from Shengjiu Wang to add audio sound card for imx7d-sdb and
imx6sll-evk board, add headphone detection for sound card on a few NXP
development boards.
- A couple of minor fix-ups on i.MX25 pin functions.
- Some random update on various boards.
-----BEGIN PGP SIGNATURE-----
iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl9qrwoUHHNoYXduZ3Vv
QGtlcm5lbC5vcmcACgkQUFdYWoewfM7Fqgf/Y+6XGsUY+QHRK6CTglOsDgC43Ixw
mhJkvG7AWcu+2Oz+WLFVbncbcBBy1swrAAss0DlwAB3BXijWiytSz6flPCBHrFiN
pyM1CLhgQChI2JfWRRc1ij/WOHkztnxR7CHLOycdhn8WQLFLQeC6Axox+d22IW4L
NgbR08eq2g2+QjMjHPyGpxnCw7AoGzexCwCLC8ajKTFe16k61bkz5Q2SxXogdlkO
cusfGpdFDme04Fl/T9sWOyIO/+l1qOzDx5JIQHRVnTB8hY7Dl7r7NQYdcvcdYrIj
AR31fXEjioR5C+AYr25ZILowZlS8VyvfTi1ZFHMFG3yD+856AYqCDB40Jw==
=w/3X
-----END PGP SIGNATURE-----
Merge tag 'imx-dt-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX arm32 device tree change for 5.10:
- New board/device support: Tolino Shine 2 HD, TQMa6 SoM, Y Soft IOTA
Orion board.
- update GPMI NAND node name to nand-controller for aligning with DT
schema.
- Remove the legacy fsl,spi-num-chipselects property from a few board.
- A series to update imx6q-logicpd support, using GPIO chipselect,
adding board compatible string, and enabling DTB build for the board.
- Complete RNG device node in i.MX6SL device tree, and add RNG node for
i.MX6SLL and i.MX6ULL.
- Correct interrupt flags for imx6qdl-gw5xxx boards.
- Add missing enet_out clock for i.MX6Q/DL Ethernet device.
- Enable PCIe support for imx6qp-sabreauto board.
- A series from Shengjiu Wang to add audio sound card for imx7d-sdb and
imx6sll-evk board, add headphone detection for sound card on a few NXP
development boards.
- A couple of minor fix-ups on i.MX25 pin functions.
- Some random update on various boards.
* tag 'imx-dt-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (37 commits)
ARM: dts: imx6qdl-gw5xxx: correct interrupt flags
ARM: dts: imx6q-logicpd: Use GPIO chipselect
ARM: dts: imx: Add an entry for imx6q-logicpd.dtb
ARM: dts: imx6q-logicpd: Add a specific board compatible string
ARM: dts: imx6q: align GPIO hog names with dtschema
ARM: dts: imx6qdl-tqma6: fix LM75 compatible string
ARM: dts: imx6qdl-tqma6: remove obsolete fsl,spi-num-chipselects
ARM: dts: imx6qdl-tqma6: fix indentation
ARM: dts: imx28-m28: Align GPMI NAND node name with schema
ARM: dts: imx6qdl: add enet_out clk support
ARM: dts: imx6qdl: move iomuxc compatible assignment out of root node
ARM: dts: vf: Fix PCA95xx GPIO expander properties on ZII CFU1
ARM: dts: imx: add devicetree for Tolino Shine 2 HD
ARM: dts: imx6qdl-gw553x: Remove unneeded #address-cells/#size-cells
ARM: dts: imx6sll-evk: Add audio sound card node
ARM: dts: imx6sl-evk: Add headphone detection for sound card
ARM: dts: imx6sx-sdb: Add headphone detection for sound card
ARM: dts: imx6q-kontron-samx6i: Remove old fsl,spi-num-chipselects
ARM: dts: imx: Fix the SPI chipselect polarity
ARM: dts: imx25-pinfunc: Fix GPT function names
...
Link: https://lore.kernel.org/r/20200923073009.23678-4-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>