Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1df44814f59ed487849bebc5dec0ad605ff226db

Authored by Hans de Goede
1 parent 70ac9295e3
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

sunxi: Kconfig-ify CONFIG_AXP152_POWER and _AXP209_POWER 

Kconfig-ify CONFIG_AXP152_POWER and _AXP209_POWER settings, removing
them from CONFIG_SYS_EXTRA_OPTIONS.

Note that sun5i boards can have either an AXP209 or an AXP152 pmic, the
Kconfig default is AXP209, boards with an AXP152 must explicitly select
this. Likewise boards without a pmic must explicitly select SUNXI_NO_PMIC
in their defconfig.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 52 changed files with 62 additions and 52 deletions Side-by-side Diff

configs/A10-OLinuXino-Lime_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
  11 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
12 12 # CONFIG_CMD_IMLS is not set
13 13 # CONFIG_CMD_FLASH is not set
14 14 # CONFIG_CMD_FPGA is not set
configs/A10s-OLinuXino-M_defconfig
Diff comments   View file @ 1df4481
... ... @@ -9,9 +9,10 @@
9 9 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
10 10 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
11 11 CONFIG_SPL=y
12   -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC"
  12 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
13 13 # CONFIG_CMD_IMLS is not set
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
16 16 CONFIG_USB_EHCI_HCD=y
  17 +CONFIG_AXP152_POWER=y
configs/A13-OLinuXinoM_defconfig
Diff comments   View file @ 1df4481
... ... @@ -18,4 +18,5 @@
18 18 # CONFIG_CMD_FLASH is not set
19 19 # CONFIG_CMD_FPGA is not set
20 20 CONFIG_USB_EHCI_HCD=y
  21 +CONFIG_SUNXI_NO_PMIC=y
configs/A13-OLinuXino_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,7 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
  17 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
18 18 # CONFIG_CMD_IMLS is not set
19 19 # CONFIG_CMD_FLASH is not set
20 20 # CONFIG_CMD_FPGA is not set
configs/A20-OLinuXino-Lime2_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
  11 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
12 12 # CONFIG_CMD_IMLS is not set
13 13 # CONFIG_CMD_FLASH is not set
14 14 # CONFIG_CMD_FPGA is not set
configs/A20-OLinuXino-Lime_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/A20-OLinuXino_MICRO_defconfig
Diff comments   View file @ 1df4481
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
10 10 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
11 11 CONFIG_SPL=y
12   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
  12 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
13 13 # CONFIG_CMD_IMLS is not set
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
configs/A20-Olimex-SOM-EVB_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
  11 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
12 12 # CONFIG_CMD_IMLS is not set
13 13 # CONFIG_CMD_FLASH is not set
14 14 # CONFIG_CMD_FPGA is not set
configs/Ainol_AW1_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/Ampe_A76_defconfig
Diff comments   View file @ 1df4481
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
18   -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
  18 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
19 19 # CONFIG_CMD_IMLS is not set
20 20 # CONFIG_CMD_FLASH is not set
21 21 # CONFIG_CMD_FPGA is not set
configs/Auxtek-T003_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,9 +8,9 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t003"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
12 11 # CONFIG_CMD_IMLS is not set
13 12 # CONFIG_CMD_FLASH is not set
14 13 # CONFIG_CMD_FPGA is not set
15 14 CONFIG_USB_EHCI_HCD=y
  15 +CONFIG_AXP152_POWER=y
configs/Auxtek-T004_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,9 +6,9 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
10 9 # CONFIG_CMD_IMLS is not set
11 10 # CONFIG_CMD_FLASH is not set
12 11 # CONFIG_CMD_FPGA is not set
13 12 CONFIG_USB_EHCI_HCD=y
  13 +CONFIG_AXP152_POWER=y
configs/Bananapi_defconfig
Diff comments   View file @ 1df4481
... ... @@ -7,7 +7,7 @@
7 7 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
8 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 9 CONFIG_SPL=y
10   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
  10 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
11 11 # CONFIG_CMD_IMLS is not set
12 12 # CONFIG_CMD_FLASH is not set
13 13 # CONFIG_CMD_FPGA is not set
configs/Bananapro_defconfig
Diff comments   View file @ 1df4481
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
10 10 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
11 11 CONFIG_SPL=y
12   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
  12 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
13 13 # CONFIG_CMD_IMLS is not set
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
configs/Chuwi_V7_CW0825_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/Cubieboard2_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/Cubieboard_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/Cubietruck_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12)"
  11 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12)"
12 12 # CONFIG_CMD_IMLS is not set
13 13 # CONFIG_CMD_FLASH is not set
14 14 # CONFIG_CMD_FPGA is not set
configs/Hyundai_A7HD_defconfig
Diff comments   View file @ 1df4481
... ... @@ -15,7 +15,6 @@
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
18   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
19 18 # CONFIG_CMD_IMLS is not set
20 19 # CONFIG_CMD_FLASH is not set
21 20 # CONFIG_CMD_FPGA is not set
configs/Linksprite_pcDuino3_Nano_defconfig
Diff comments   View file @ 1df4481
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
9 9 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
10 10 CONFIG_SPL=y
11   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2)"
  11 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2)"
12 12 # CONFIG_CMD_IMLS is not set
13 13 # CONFIG_CMD_FLASH is not set
14 14 # CONFIG_CMD_FPGA is not set
configs/Linksprite_pcDuino3_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2)"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2)"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/Linksprite_pcDuino_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/MK808C_defconfig
Diff comments   View file @ 1df4481
... ... @@ -5,7 +5,6 @@
5 5 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
6 6 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
7 7 CONFIG_SPL=y
8   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
9 8 # CONFIG_CMD_IMLS is not set
10 9 # CONFIG_CMD_FLASH is not set
11 10 # CONFIG_CMD_FPGA is not set
configs/MSI_Primo73_defconfig
Diff comments   View file @ 1df4481
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
11 11 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
12 12 CONFIG_SPL=y
13   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
14 13 # CONFIG_CMD_IMLS is not set
15 14 # CONFIG_CMD_FLASH is not set
16 15 # CONFIG_CMD_FPGA is not set
configs/Mele_A1000_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/Mele_M3_defconfig
Diff comments   View file @ 1df4481
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
10 10 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
11 11 CONFIG_SPL=y
12   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC"
  12 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
13 13 # CONFIG_CMD_IMLS is not set
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
configs/Mini-X_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,6 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
10 9 # CONFIG_CMD_IMLS is not set
11 10 # CONFIG_CMD_FLASH is not set
12 11 # CONFIG_CMD_FPGA is not set
configs/Orangepi_defconfig
Diff comments   View file @ 1df4481
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
11 11 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
12 12 CONFIG_SPL=y
13   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
  13 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
14 14 # CONFIG_CMD_IMLS is not set
15 15 # CONFIG_CMD_FLASH is not set
16 16 # CONFIG_CMD_FPGA is not set
configs/Orangepi_mini_defconfig
Diff comments   View file @ 1df4481
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
13 13 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
14 14 CONFIG_SPL=y
15   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
  15 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
16 16 # CONFIG_CMD_IMLS is not set
17 17 # CONFIG_CMD_FLASH is not set
18 18 # CONFIG_CMD_FPGA is not set
configs/UTOO_P66_defconfig
Diff comments   View file @ 1df4481
... ... @@ -20,7 +20,6 @@
20 20 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
21 21 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
22 22 CONFIG_SPL=y
23   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
24 23 # CONFIG_CMD_IMLS is not set
25 24 # CONFIG_CMD_FLASH is not set
26 25 # CONFIG_CMD_FPGA is not set
configs/Wexler_TAB7200_defconfig
Diff comments   View file @ 1df4481
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
16   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
17 16 # CONFIG_CMD_IMLS is not set
18 17 # CONFIG_CMD_FLASH is not set
19 18 # CONFIG_CMD_FPGA is not set
configs/Wits_Pro_A20_DKT_defconfig
Diff comments   View file @ 1df4481
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
12 12 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
13 13 CONFIG_SPL=y
14   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI"
  14 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI"
15 15 # CONFIG_CMD_IMLS is not set
16 16 # CONFIG_CMD_FLASH is not set
17 17 # CONFIG_CMD_FPGA is not set
configs/Wobo_i5_defconfig
Diff comments   View file @ 1df4481
... ... @@ -7,7 +7,6 @@
7 7 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-wobo-i5"
8 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 9 CONFIG_SPL=y
10   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
11 10 # CONFIG_CMD_IMLS is not set
12 11 # CONFIG_CMD_FLASH is not set
13 12 # CONFIG_CMD_FPGA is not set
configs/Yones_Toptech_BD1078_defconfig
Diff comments   View file @ 1df4481
... ... @@ -19,7 +19,6 @@
19 19 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
20 20 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
21 21 CONFIG_SPL=y
22   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
23 22 # CONFIG_CMD_IMLS is not set
24 23 # CONFIG_CMD_FLASH is not set
25 24 # CONFIG_CMD_FPGA is not set
configs/ba10_tv_box_defconfig
Diff comments   View file @ 1df4481
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
10 10 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
11 11 CONFIG_SPL=y
12   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
  12 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
13 13 # CONFIG_CMD_IMLS is not set
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
configs/i12-tvbox_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21)"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,MACPWR=SUNXI_GPH(21)"
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_FLASH is not set
12 12 # CONFIG_CMD_FPGA is not set
configs/iNet_3F_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/iNet_3W_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/iNet_86VS_defconfig
Diff comments   View file @ 1df4481
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
16   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
17 16 # CONFIG_CMD_IMLS is not set
18 17 # CONFIG_CMD_FLASH is not set
19 18 # CONFIG_CMD_FPGA is not set
configs/inet1_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet1"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/inet97fv2_defconfig
Diff comments   View file @ 1df4481
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet97fv2"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
16   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
17 16 # CONFIG_CMD_IMLS is not set
18 17 # CONFIG_CMD_FLASH is not set
19 18 # CONFIG_CMD_FPGA is not set
configs/inet98v_rev2_defconfig
Diff comments   View file @ 1df4481
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-98v-rev2"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
18   -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
  18 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
19 19 # CONFIG_CMD_IMLS is not set
20 20 # CONFIG_CMD_FLASH is not set
21 21 # CONFIG_CMD_FPGA is not set
configs/inet9f_rev03_defconfig
Diff comments   View file @ 1df4481
... ... @@ -13,7 +13,6 @@
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet9f-rev03"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
16   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
17 16 # CONFIG_CMD_IMLS is not set
18 17 # CONFIG_CMD_FLASH is not set
19 18 # CONFIG_CMD_FPGA is not set
configs/jesurun_q5_defconfig
Diff comments   View file @ 1df4481
... ... @@ -7,7 +7,7 @@
7 7 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
8 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 9 CONFIG_SPL=y
10   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(19)"
  10 +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(19)"
11 11 # CONFIG_CMD_IMLS is not set
12 12 # CONFIG_CMD_FLASH is not set
13 13 # CONFIG_CMD_FPGA is not set
configs/mk802_a10s_defconfig
Diff comments   View file @ 1df4481
... ... @@ -7,9 +7,9 @@
7 7 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
8 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 9 CONFIG_SPL=y
10   -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
11 10 # CONFIG_CMD_IMLS is not set
12 11 # CONFIG_CMD_FLASH is not set
13 12 # CONFIG_CMD_FPGA is not set
14 13 CONFIG_USB_EHCI_HCD=y
  14 +CONFIG_AXP152_POWER=y
configs/mk802_defconfig
Diff comments   View file @ 1df4481
... ... @@ -10,4 +10,5 @@
10 10 # CONFIG_CMD_FLASH is not set
11 11 # CONFIG_CMD_FPGA is not set
12 12 CONFIG_USB_EHCI_HCD=y
  13 +CONFIG_SUNXI_NO_PMIC=y
configs/mk802ii_defconfig
Diff comments   View file @ 1df4481
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
5 5 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
6 6 CONFIG_SPL=y
7   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
8 7 # CONFIG_CMD_IMLS is not set
9 8 # CONFIG_CMD_FLASH is not set
10 9 # CONFIG_CMD_FPGA is not set
configs/pov_protab2_ips9_defconfig
Diff comments   View file @ 1df4481
... ... @@ -14,7 +14,6 @@
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pov-protab2-ips9"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
17   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
18 17 # CONFIG_CMD_IMLS is not set
19 18 # CONFIG_CMD_FLASH is not set
20 19 # CONFIG_CMD_FPGA is not set
configs/q8_a13_tablet_defconfig
Diff comments   View file @ 1df4481
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-q8-tablet"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
18   -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
  18 +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
19 19 # CONFIG_CMD_IMLS is not set
20 20 # CONFIG_CMD_FLASH is not set
21 21 # CONFIG_CMD_FPGA is not set
configs/r7-tv-dongle_defconfig
Diff comments   View file @ 1df4481
... ... @@ -6,9 +6,9 @@
6 6 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
7 7 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
8 8 CONFIG_SPL=y
9   -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
10 9 # CONFIG_CMD_IMLS is not set
11 10 # CONFIG_CMD_FLASH is not set
12 11 # CONFIG_CMD_FPGA is not set
13 12 CONFIG_USB_EHCI_HCD=y
  13 +CONFIG_AXP152_POWER=y
configs/sunxi_Gemei_G9_defconfig
Diff comments   View file @ 1df4481
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
12 12 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
13 13 CONFIG_SPL=y
14   -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
15 14 # CONFIG_CMD_IMLS is not set
16 15 # CONFIG_CMD_FLASH is not set
17 16 # CONFIG_CMD_FPGA is not set
drivers/power/Kconfig
Diff comments   View file @ 1df4481
... ... @@ -4,13 +4,39 @@
4 4  
5 5 source "drivers/power/regulator/Kconfig"
6 6  
  7 +choice
  8 + prompt "Select Sunxi PMIC Variant"
  9 + depends on ARCH_SUNXI
  10 + default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
  11 + default AXP221_POWER if MACH_SUN6I || MACH_SUN8I
  12 +
  13 +config SUNXI_NO_PMIC
  14 + boolean "board without a pmic"
  15 + ---help---
  16 + Select this for boards which do not use a PMIC.
  17 +
  18 +config AXP152_POWER
  19 + boolean "axp152 pmic support"
  20 + depends on MACH_SUN5I
  21 + ---help---
  22 + Select this to enable support for the axp152 pmic found on most
  23 + A10s boards.
  24 +
  25 +config AXP209_POWER
  26 + boolean "axp209 pmic support"
  27 + depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
  28 + ---help---
  29 + Select this to enable support for the axp209 pmic found on most
  30 + A10, A13 and A20 boards.
  31 +
7 32 config AXP221_POWER
8 33 boolean "axp221 / axp223 pmic support"
9 34 depends on MACH_SUN6I || MACH_SUN8I
10   - default y
11 35 ---help---
12   - Say y here to enable support for the axp221 / axp223 pmic found on most
13   - sun6i (A31) / sun8i (A23) boards.
  36 + Select this to enable support for the axp221/axp223 pmic found on most
  37 + A23 and A31 boards.
  38 +
  39 +endchoice
14 40  
15 41 config AXP221_DCDC1_VOLT
16 42 int "axp221 dcdc1 voltage"