Various NanoPi fixes

This commit is contained in:
ThomasKaiser 2016-08-13 10:42:12 +02:00
parent d76d3f41fc
commit 95fa82256f
7 changed files with 105 additions and 18 deletions

View file

@ -1,9 +1,9 @@
# H3 quad core 1Gb SoC Wifi
# H3 quad core 1Gb SoC
BOARD_NAME="NanoPi M1"
LINUXFAMILY=sun8i
BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig
MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir"
MODULES_NEXT="brcmfmac"
MODULES_NEXT=""
CPUMIN=240000
CPUMAX=1200000
CLI_TARGET="jessie:default"

View file

@ -1,11 +1,11 @@
# H3 quad core 256/512MB SoC Headless
BOARD_NAME="NanoPi Neo"
LINUXFAMILY=sun8i
BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig
BOOTCONFIG=FriendlyARM_NanoPi_NEO_defconfig
MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir"
MODULES_NEXT="brcmfmac"
MODULES_NEXT=""
CPUMIN=240000
CPUMAX=1200000
CLI_TARGET="jessie:default"
DESKTOP_TARGET="jessie:default"
CPUMAX=912000
CLI_TARGET="jessie,xenial:default"
DESKTOP_TARGET=""
KERNEL_TARGET="default,dev"

View file

@ -730,8 +730,8 @@ pmu_gpio0 = port:PL06<1><1><2><1>
pmu_level0 = 11300
pmu_level1 = 1100
max_freq = 1200000000
min_freq = 480000000
LV_count = 5
min_freq = 240000000
LV_count = 6
LV1_freq = 1200000000
LV1_volt = 1300
LV2_freq = 1008000000
@ -742,6 +742,8 @@ LV4_freq = 648000000
LV4_volt = 1100
LV5_freq = 480000000
LV5_volt = 1100
LV6_freq = 240000000
LV6_volt = 1100
[gpu_dvfs_table]
G_LV_count = 3

View file

@ -106,7 +106,7 @@ pll_periph1 = 600
pll_de = 864
[dram_para]
dram_clk = 432
dram_clk = 408
dram_type = 3
dram_zq = 0x3b3bfb
dram_odt_en = 1
@ -327,7 +327,7 @@ output_full = 1
hdmi_mode_check = 1
[disp_init]
disp_init_enable = 1
disp_init_enable = 0
disp_mode = 0
screen0_output_type = 3
screen0_output_mode = 5
@ -521,7 +521,7 @@ usb_regulator_vol = 0
usb_not_suspend = 0
[usbc1]
usb_used = 1
usb_used = 0
usb_drv_vbus_gpio =
usb_restrict_gpio =
usb_host_init_state = 1
@ -531,7 +531,7 @@ usb_regulator_vol = 0
usb_not_suspend = 0
[usbc2]
usb_used = 1
usb_used = 0
usb_drv_vbus_gpio =
usb_restrict_gpio =
usb_host_init_state = 1
@ -666,7 +666,7 @@ spdif_used = 1
hdmi_used = 0
[s_cir0]
ir_used = 1
ir_used = 0
ir_rx = port:PL11<2><1><default><default>
ir_power_key_code0 = 0x00
ir_addr_code0 = 0xC43B
@ -760,6 +760,12 @@ G_LV1_volt = 1200000
G_LV2_freq = 456000000
G_LV2_volt = 1200000
[board_vendor]
vid_used = 0
vid_count = 2
vid_bit_0 = port:PC04<0><1><default><default>
vid_bit_1 = port:PC07<0><1><default><default>
[Vdevice]
Vdevice_used = 0
Vdevice_0 = port:PH10<5><1><2><default>
@ -803,7 +809,7 @@ tsc_d6 = port:PE10<3><default><default><default>
tsc_d7 = port:PE11<3><default><default><default>
[gpio_power_key]
key_used = 1
key_used = 0
key_io = port:PL03<6><default><default><0>
[key_para]
@ -834,7 +840,7 @@ mali_extreme_vol = 1400
;1wire parameters (default - PA20)
;----------------------------------------------------------------------------------
[w1_para]
w1_used = 1
w1_used = 0
gpio = 20
[corekeeper]

View file

@ -0,0 +1,13 @@
diff --git a/drivers/devfreq/dramfreq/sunxi-ddrfreq.c b/drivers/devfreq/dramfreq/sunxi-ddrfreq.c
index c7c20b7..7581087 100755
--- a/drivers/devfreq/dramfreq/sunxi-ddrfreq.c
+++ b/drivers/devfreq/dramfreq/sunxi-ddrfreq.c
@@ -1666,7 +1666,7 @@ static __devinit int sunxi_ddrfreq_probe(struct platform_device *pdev)
if (sunxi_ddrfreq_min < SUNXI_DDRFREQ_MINFREQ_MIN)
sunxi_ddrfreq_min = sunxi_ddrfreq_max / 3;
#elif defined(CONFIG_ARCH_SUN8IW7P1)
- sunxi_ddrfreq_min = 408000;
+ sunxi_ddrfreq_min = 132000;
#else
type = script_get_item("dram_para", "dram_tpr12", &val);
if (SCIRPT_ITEM_VALUE_TYPE_INT != type) {

View file

@ -27,7 +27,7 @@ index 0000000..83fae20
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_SY8106A_POWER=y
+# CONFIG_SY8106A_POWER=y
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_GPIO=y
+CONFIG_SYS_CLK_FREQ=816000000
@ -108,3 +108,36 @@ index 7bade8f..d149431 100644
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_SY8106A_VOUT1_VOLT=1100
+CONFIG_SYS_CLK_FREQ=1008000000
diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_NEO_defconfig
new file mode 100644
index 0000000..83fae20
--- /dev/null
+++ b/configs/FriendlyARM_NanoPi_NEO_defconfig
@@ -0,0 +1,27 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+# CONFIG_VIDEO is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+#CONFIG_SY8106A_POWER=y
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_GPIO=y
+CONFIG_SYS_CLK_FREQ=480000000

View file

@ -27,7 +27,7 @@ index 0000000..83fae20
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_SY8106A_POWER=y
+# CONFIG_SY8106A_POWER=y
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_GPIO=y
+CONFIG_SYS_CLK_FREQ=816000000
@ -108,3 +108,36 @@ index 7bade8f..d149431 100644
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_SY8106A_VOUT1_VOLT=1320
+CONFIG_SYS_CLK_FREQ=1296000000
diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_NEO_defconfig
new file mode 100644
index 0000000..83fae20
--- /dev/null
+++ b/configs/FriendlyARM_NanoPi_NEO_defconfig
@@ -0,0 +1,27 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+# CONFIG_VIDEO is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+#CONFIG_SY8106A_POWER=y
+# CONFIG_USB_EHCI_HCD is not set
+CONFIG_GPIO=y
+CONFIG_SYS_CLK_FREQ=816000000