ARM64: DT: HiSilicon ARM64 DT updates for v6.8

- Merge the hi3620-clock binding into hisilicon,sysctrl
 - Clean up the hikey970 PMIC dtsi
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEQeMYD8qOQTc1R/snC8hXbtmJZlwFAmVytn8VHHh1d2VpNUBo
 aXNpbGljb24uY29tAAoJEAvIV27ZiWZcKZ8P/0O10orvCtvDJ+NTzQ2jE9HvjozW
 eCfdaoMfuKWilwQ3ZxQS853zov+RmHWmWs4B22LvdxMwLMevbRhkxgVNY/+3Px8n
 BX0Tn2rdzkXHMkUE7Wieo+gpaIOiS80DgBO/OY3mRNQ4FD+Gk5xGm3PDj6txjRCZ
 WXfg5M8fpUUhtweFlorUuKYWKOM1uqbNlU9XYMgJ/2ZtopmT7PHpmDrzmBpCRpZt
 0ilcl8vqc2oyYwtIWMUXyLI7WUNYegpN1XobSHsQx5AOSCdj69CwgDw1vVk66wDO
 UgyEeIe0ykkMMkiTCNUJOLqQOZFPAowpD4Yy2RvM28RfMNEskVOthLx2HSxkjxXE
 TzmhH4V0FdFQZBXFwlrmAy6MGuouppcGz1XLUcqf1C6VzPvOMPVthv1/4o/nIazF
 2UUHVkNLHsbDiCqXRV6ejbWaDbxTbPyL7vZDDidRr/tdgFh8gY3XDCXrq0mIOOGc
 drkP/4RQ1gVrUK24cIjVw4W71HQbhyR7aWtsdu47a7rNVxquu25aI75ndVjix1+a
 oaCeaZtVoMeHv1kWkXyP51lhuXvZN8rVddGIgc7A6NFgnsDsDXMcnNpjreIa4Wlo
 vc1So80iRoBajDPHH3j4uUVq4y/T0WnZZp972V6aT+KD4dN0ENuNxho9U27L0yoN
 C7aqnnUzMZ8dMqbE
 =o+u3
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWEW8AACgkQYKtH/8kJ
 UicFtA/9HX93kSH6FNISI5NAk7+vfEARgvkPyns7tA5as2ouWm75fqr0j+rLXOOD
 5xVtoLBtkoQcXqUMPunV9toe/+r/P69YveX3J6pkTPlciMZKTzH9BAcAOBJcZZ2w
 X6qs2WXefK0Ri69nEVsXg6dmZu1hK9JMkF6Tt+oQt9kmbYR16I2bAe7YOX+2BP5L
 50asmgVuLenE5c90roWmiRymImFNdHfAuw28Xtg3z7YQBcVqo8oScW2Qv66+SK6a
 ThnvyWjvNOADJPGHD4YC/6hou3tLbgZbVp28hbCfobNKqnkF33wmNsnpPvBPmvWI
 dWRnUfiEC0aeqN+uSkkeOZkZlMryL7RYqS+MD9dgOSzWHp15yWlprXBZcybIwkmZ
 B3D9JcoOUGrPhY+O3Yc665hY//uT/Mdil/eDv0m52nfnk/oN4Xx1SsszmM2yBqB4
 DltpQNYS/AV/tYkSLsZn45meUKeEpHUyY+N9iT3HMrrY7nd+gvDKdJ0xtbYKxlXt
 Jr+CBQWMX0MAML30RDLSqaWR1FBCD5VAi6itV0skBgNHveQnIIewhkbOgUJQMRuI
 AyvBBzwD8IxfnGv7Vf3CoeRVFyyeqPpyAmC3rFiXnDhY/pXoXFZTi9fRwFMvNw97
 rHftpnBujA8UMfg7z4K9hMrmm09jWpzoCHrFz2IcEmFeZwFEFCw=
 =6QyO
 -----END PGP SIGNATURE-----

Merge tag 'hisi-arm64-dt-for-6.8' of https://github.com/hisilicon/linux-hisi into soc/dt

ARM64: DT: HiSilicon ARM64 DT updates for v6.8

- Merge the hi3620-clock binding into hisilicon,sysctrl
- Clean up the hikey970 PMIC dtsi

* tag 'hisi-arm64-dt-for-6.8' of https://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: hikey970-pmic: clean up SPMI node
  arm64: dts: hisilicon: hikey970-pmic: fix regulator cells properties
  dt-bindings: hisilicon: Merge hi3620-clock into hisilicon,sysctrl binding

Link: https://lore.kernel.org/r/6572C4C8.6050401@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-21 15:37:23 +00:00
commit 6fab7e69de
3 changed files with 18 additions and 25 deletions

View File

@ -82,6 +82,23 @@ properties:
ranges: true
patternProperties:
'^clock@':
type: object
additionalProperties: false
properties:
compatible:
enum:
- hisilicon,hi3620-clock
- hisilicon,hi3620-mmc-clock
reg:
maxItems: 1
'#clock-cells':
const: 1
required:
- compatible
- reg

View File

@ -1,20 +0,0 @@
* Hisilicon Hi3620 Clock Controller
The Hi3620 clock controller generates and supplies clock to various
controllers within the Hi3620 SoC.
Required Properties:
- compatible: should be one of the following.
- "hisilicon,hi3620-clock" - controller compatible with Hi3620 SoC.
- "hisilicon,hi3620-mmc-clock" - controller specific for Hi3620 mmc.
- reg: physical base address of the controller and length of memory mapped
region.
- #clock-cells: should be 1.
Each clock is assigned an identifier and client nodes use this identifier
to specify the clock which they consume.
All these identifier could be found in <dt-bindings/clock/hi3620-clock.h>.

View File

@ -10,10 +10,9 @@
/ {
spmi: spmi@fff24000 {
compatible = "hisilicon,kirin970-spmi-controller";
reg = <0x0 0xfff24000 0x0 0x1000>;
#address-cells = <2>;
#size-cells = <0>;
status = "okay";
reg = <0x0 0xfff24000 0x0 0x1000>;
hisilicon,spmi-channel = <2>;
pmic: pmic@0 {
@ -25,9 +24,6 @@
gpios = <&gpio28 0 0>;
regulators {
#address-cells = <1>;
#size-cells = <0>;
ldo3: ldo3 { /* HDMI */
regulator-name = "ldo3";
regulator-min-microvolt = <1500000>;