Unverified Commit 3b2db85f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v6.20' of... 

Merge tag 'amlogic-arm64-dt-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt

Amlogic ARM64 DT for v6.20:
- Cleanups:
  - Use lowercase hex
  - Use hyphen in node names
  - move CPU OPP table and clock assignment to SoC.dtsi
  - drop useless assigned-clock-parents
- MMC clock fixup across multiple families
- Add type-c controller on Radxa Zero 2 and enable NPU
- New board:
  - Khadas VIM1s based on Amlogic S4

* tag 'amlogic-arm64-dt-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux

:
  arm64: dts: amlogic: meson-s4-s905y4-khadas-vim1s: enable SDIO interface
  arm64: dts: amlogic: add the type-c controller on Radxa Zero 2
  arm64: dts: amlogic: meson-sm1-odroid: Eliminate Odroid HC4 power glitches during boot.
  arm64: dts: amlogic: meson-s4-s905y4-khadas-vim1s: enable eMMC storage
  arm64: dts: meson-s4-s905y4-khadas-vim1s: add initial device tree
  arm64: dts: meson-s4-aq222: update compatible string with s805x2
  dt-bindings: arm: amlogic: introduce specific compatibles for S4 family
  arm64: dts: amlogic: Enable the npu node on Radxa Zero 2
  arm64: dts: amlogic: g12: assign the MMC A signal clock
  arm64: dts: amlogic: g12: assign the MMC B and C signal clocks
  arm64: dts: amlogic: gx: assign the MMC signal clocks
  arm64: dts: amlogic: axg: assign the MMC signal clocks
  arm64: dts: amlogic: a1: align the mmc clock setup
  arm64: dts: amlogic: c3: assign the MMC signal clocks
  arm64: dts: amlogic: s4: fix mmc clock assignment
  arm64: dts: amlogic: s4: assign mmc b clock to 24MHz
  arm64: dts: amlogic: drop useless assigned-clock-parents
  arm64: dts: amlogic: move CPU OPP table and clock assignment to SoC.dtsi
  arm64: dts: amlogic: Use lowercase hex
  arm64: dts: amlogic: Use hyphen in node names

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 332a1ff4 854583f9

Documentation/devicetree/bindings/arm/amlogic.yaml

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,14 @@ properties: 
        items:

          - enum:

              - amlogic,aq222

          - const: amlogic,s805x2

          - const: amlogic,s4



      - description: Boards with the Amlogic Meson S4 S905Y4 SoC

        items:

          - enum:

              - khadas,vim1s

          - const: amlogic,s905y4

          - const: amlogic,s4



      - description: Boards with the Amlogic S6 S905X5 SoC

arch/arm64/boot/dts/amlogic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-ugoos-am3.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-s4-s905y4-khadas-vim1s.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m2-pro.dtb

arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ scmi_shmem: sram@0 { 
	firmware {

		scmi: scmi {

			compatible = "arm,scmi-smc";

			arm,smc-id = <0x820000C1>;

			arm,smc-id = <0x820000c1>;

			shmem = <&scmi_shmem>;

			#address-cells = <1>;

			#size-cells = <0>;
@@ -780,7 +780,7 @@ int_mdio: mdio@1 { 
					#address-cells = <1>;

					#size-cells = <0>;



					internal_ephy: ethernet_phy@8 {

					internal_ephy: ethernet-phy@8 {

						compatible = "ethernet-phy-id0180.3301",

							     "ethernet-phy-ieee802.3-c22";

						interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -969,6 +969,10 @@ sdio: mmc@88000 { 
				no-sd;

				resets = <&reset RESET_SD_EMMC_A>;

				status = "disabled";



				assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_A>;

				assigned-clock-rates = <24000000>;



			};



			sd: mmc@8a000 {
@@ -984,12 +988,15 @@ sd: mmc@8a000 { 
				no-sdio;

				resets = <&reset RESET_SD_EMMC_B>;

				status = "disabled";



				assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_B>;

				assigned-clock-rates = <24000000>;

			};



			nand: nand-controller@8d000 {

				compatible = "amlogic,meson-axg-nfc";

				reg = <0x0 0x8d000 0x0 0x200>,

					<0x0 0x8C000 0x0 0x4>;

					<0x0 0x8c000 0x0 0x4>;

				reg-names = "nfc", "emmc";

				interrupts = <GIC_SPI 87 IRQ_TYPE_EDGE_RISING>;

				clocks = <&clkc_periphs CLKID_SYS_SD_EMMC_C>,

arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-an400.dts

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ aliases { 


	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0xE0000000

		reg = <0x00000000 0x00000000 0x00000000 0xe0000000

			0x00000001 0x00000000 0x00000000 0x20000000>;

	};

arch/arm64/boot/dts/amlogic/meson-a1.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -674,11 +674,12 @@ sd_emmc: mmc@10000 { 
				clock-names = "core",

					      "clkin0",

					      "clkin1";

				assigned-clocks = <&clkc_periphs CLKID_SD_EMMC_SEL2>;

				assigned-clock-parents = <&xtal>;

				resets = <&reset RESET_SD_EMMC_A>;

				power-domains = <&pwrc PWRC_SD_EMMC_ID>;

				status = "disabled";



				assigned-clocks = <&clkc_periphs CLKID_SD_EMMC>;

				assigned-clock-rates = <24000000>;

			};

		};